From 201659654a328f84c229d16fe85d8709a4183957 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 19 Oct 2019 15:53:42 +0000
Subject: [PATCH] Fixed most problems, some still persists.
---
src/main.c | 72 +++++------------------------------
1 files changed, 11 insertions(+), 61 deletions(-)
diff --git a/src/main.c b/src/main.c
index 72e2b74..92df3d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,6 @@
#include "poly.h"
#include "sh.h"
#include "shcomplex.h"
-#include "dumpstate.h"
#include "restore.h"
#include <fcntl.h>
@@ -26,10 +25,13 @@
*/
int main(int argv, char *argc[]){
- ts_vesicle *vesicle;
- ts_tape *tape;
+ ts_vesicle *vesicle=NULL;
+ ts_tape *tape=NULL;
ts_uint start_iteration=0;
force_from_tape=0;
+ /* Area and volume for constant area and constant volume are initialized to be zero */
+ A0=0;
+ V0=0;
/* create lock file */
createPidFile("ts_trisurf",".lock",0);
parse_args(argv,argc); // sets global variable command_line_args (defined in io.h)
@@ -45,22 +47,20 @@
ts_fprintf(stdout,"**** Restoring vesicle from VTK points list ****\n");
ts_fprintf(stdout,"************************************************\n\n");
vesicle = parseDump(command_line_args.dump_from_vtk);
+// write_vertex_xml_file(vesicle,9999); // here you can test if restoration and rewritting results in the same dump file. Only the date od creation of dump file must differ.
tape = vesicle->tape;
int arguments_no;
FILE *fd=fopen(".status","r");
if(fd!=NULL){
arguments_no=fscanf(fd,"%u", &start_iteration);
if(arguments_no==0){
- ts_fprintf(stdout,"No information of start iteration in .status file");
+ ts_fprintf(stdout,"No information of start iteration in .status file\n");
}
fclose(fd);
- start_iteration++;
+ start_iteration++;
}
else
- ts_fprintf(stdout,"No .status file. The iteration count will start from 0");
-/* Here you should read new tape file, reassign some values in vertex from the tape and assign read tape to vesicle->tape */
-// tape=parsetape(command_line_args.tape_fullfilename);
- // vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape);
+ ts_fprintf(stdout,"No .status file. The iteration count will start from 0\n");
}
else if(command_line_args.force_from_tape){
ts_fprintf(stdout,"************************************************\n");
@@ -73,60 +73,10 @@
ts_fprintf(stdout,"**********************************************************************\n");
ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
ts_fprintf(stdout,"**********************************************************************\n\n");
- tape=parsetape(command_line_args.tape_fullfilename);
- vesicle=restore_state(&start_iteration);
- if(vesicle==NULL){
- ts_fprintf(stderr, "Dump file does not exist or is not a regular file! Did you mean to invoke trisurf with --force-from-tape option?\n\n");
- return 1;
- }
- // nove vrednosti iz tapea...
- vesicle->bending_rigidity=tape->xk0;
- vtx_set_global_values(vesicle);
- vesicle->pswitch =tape->pswitch;
- vesicle->pressure=tape->pressure;
- vesicle->dmax=tape->dmax*tape->dmax;
- poly_assign_filament_xi(vesicle,tape);
- free(vesicle->tape);
- vesicle->tape=tape;
- vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
-
-
-
- /* spherical harmonics */
- if(tape->shc>0){
- vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);
- }
- else {
- vesicle->sphHarmonics=NULL;
- }
-
- if(command_line_args.reset_iteration_count) start_iteration=tape->inititer;
- else start_iteration++;
-
- if(start_iteration>=tape->iterations){
- ts_fprintf(stdout, "Simulation already completed. if you want to rerun it try with --force-from-tape or --reset-iteration-count\n\n");
- return 0;
- }
-
- /* if requested in tape, we can have smaller number of polymeres attached to membrane than the number of polymeres in dump file */
- if(vesicle->tape->npoly != vesicle->poly_list->n){
-
- ts_fprintf(stdout,"(INFO) the number of polymeres attached to membrane in tape is different than a number of polymeres in dump file!\n");
- if(vesicle->tape->npoly > vesicle->poly_list->n){
- ts_fprintf(stdout,"(INFO) It is possible to decrease the number of polymeres on the membrane, but it is not allowed to increase its number. The maximal allowed number in tape is %d The execution of program will terminate!\n",vesicle->poly_list->n);
- fatal("Terminating due to increase of number of polymeres",1);
- } else {
- remove_random_polymeres(vesicle->poly_list, vesicle->poly_list->n - vesicle->tape->npoly);
- ts_fprintf(stdout,"(INFO)\n(INFO) The new number of polymeres from tape is %d.\n\n",vesicle->poly_list->n);
-
- }
- }
+ ts_fprintf(stderr, "Dump file does not exist or is not a regular file! Did you mean to invoke trisurf with --force-from-tape or --restore-from-vtk option?\n\n");
+ fatal("Recreating vesicle from binary dump file not supported anymore. Sorry.",254);
}
- //printf("nucleus coords: %.17e %.17e %.17e\n",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]);
-
run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration);
- write_master_xml_file(command_line_args.output_fullfilename);
- write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
tape_free(tape);
return 0; //program finished perfectly ok. We return 0.
--
Gitblit v1.9.3