From b8fc1a87ddbf138e1a710fbc3c164219f30799fd Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 16 Oct 2019 09:24:19 +0000
Subject: [PATCH] Removed obsolete files
---
src/main.c | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/src/main.c b/src/main.c
index 44d90e2..92df3d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,7 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdio.h>
#include<math.h>
+#include<stdlib.h>
#include "general.h"
#include "vertex.h"
#include "bond.h"
@@ -11,7 +13,11 @@
#include "frame.h"
#include "timestep.h"
#include "poly.h"
+#include "sh.h"
+#include "shcomplex.h"
+#include "restore.h"
+#include <fcntl.h>
/** Entrance function to the program
* @param argv is a number of parameters used in program call (including the program name
* @param argc is a pointer to strings (character arrays) which holds the arguments
@@ -19,30 +25,59 @@
*/
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;
- parse_args(argv,argc);
- ts_fprintf(stdout,"\nStarting program...\n\n");
-if(force_from_tape){
-ts_fprintf(stdout,"****************************************************\n");
-ts_fprintf(stdout,"**** Reinitializing initial geometry from tape *****\n");
-ts_fprintf(stdout,"****************************************************\n\n");
-tape=parsetape("tape");
-vesicle=create_vesicle_from_tape(tape);
-} else {
+ 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)
+ ts_fprintf(stdout,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__);
+ ts_fprintf(stdout,"Programming done by: Samo Penic and Miha Fosnaric\n");
+ ts_fprintf(stdout,"Released under terms of GPLv3\n");
+ ts_fprintf(stdout,"Starting program...\n\n");
+// vesicle = parseDump("timestep_000000.vtu");
+// run_simulation(vesicle, vesicle->tape->mcsweeps, vesicle->tape->inititer, vesicle->tape->iterations, 1);
-ts_fprintf(stdout,"**********************************************************************\n");
-ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
-ts_fprintf(stdout,"**********************************************************************\n\n");
-tape=parsetape("tape");
-vesicle=restore_state(&start_iteration);
-}
+ if(command_line_args.dump_from_vtk[0]!=0){
+ ts_fprintf(stdout,"************************************************\n");
+ 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\n");
+ }
+ fclose(fd);
+ start_iteration++;
+ }
+ else
+ 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");
+ ts_fprintf(stdout,"**** Generating initial geometry from tape *****\n");
+ ts_fprintf(stdout,"************************************************\n\n");
+ tape=parsetape(command_line_args.tape_fullfilename);
+ vesicle=create_vesicle_from_tape(tape);
+ } else {
-run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations);
-write_master_xml_file("test.pvd");
-write_dout_fcompat_file(vesicle,"dout");
-vesicle_free(vesicle);
-tape_free(tape);
-return 0; //program finished perfectly ok. We return 0.
+ ts_fprintf(stdout,"**********************************************************************\n");
+ ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
+ ts_fprintf(stdout,"**********************************************************************\n\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);
+ }
+ run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration);
+ vesicle_free(vesicle);
+ tape_free(tape);
+ return 0; //program finished perfectly ok. We return 0.
}
--
Gitblit v1.9.3