From 60c2b879f26c5f008af0df7d7f159d33077225ac Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 09 Mar 2019 19:47:16 +0000
Subject: [PATCH] Cleanup of stretching energy plugin
---
src/main.c | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/src/main.c b/src/main.c
index 8ef8904..ecf9678 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,15 +17,43 @@
#include "shcomplex.h"
#include "dumpstate.h"
#include "restore.h"
-
+#include "plugins.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
* @returns returns 0 on success, any other number on fail.
*/
-
+#include <string.h>
int main(int argv, char *argc[]){
+ ts_char *plugin0 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin1 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin2 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin3 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin4 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin5 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin6 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin7 = (ts_char *)calloc(255,sizeof(ts_char));
+ strcpy(plugin0,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/demoplugin.so");
+ strcpy(plugin1,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/vmdefaulthardconstraints.so");
+ strcpy(plugin2,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/plane_confinement.so");
+ strcpy(plugin3,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/pressure.so");
+ strcpy(plugin4,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/constant_volume.so");
+ strcpy(plugin5,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/constant_area.so");
+ strcpy(plugin6,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/stretching_energy.so");
+ strcpy(plugin7,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/direct_force_on_c0.so");
+ ts_char **plugins=(ts_char **)calloc(8,sizeof(ts_char *));
+ plugins[0]=plugin0;
+ plugins[1]=plugin1;
+ plugins[2]=plugin2;
+ plugins[3]=plugin3;
+ plugins[4]=plugin4;
+ plugins[5]=plugin5;
+ plugins[6]=plugin6;
+ plugins[7]=plugin7;
+ ts_plugin_list *plist=init_plugin_list(plugins,8);
+ //printf("%s", plist->chain->at_start->next->plugin->filename);
+ //ts_fprintf(stdout, "TRISURF in PRVI PLUGIN %s\n", plist->plugin[0]->details->name);
ts_vesicle *vesicle;
ts_tape *tape;
ts_uint start_iteration=0;
@@ -40,8 +68,13 @@
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);
+
+/* Entry point for plugin function at_start() */
+ ts_plugin_chain *ptr=plist->chain->at_start;
+ while(ptr!=NULL){
+ ptr->plugin->function->at_start(argv,argc);
+ ptr=ptr->next;
+ }
if(command_line_args.dump_from_vtk[0]!=0){
ts_fprintf(stdout,"************************************************\n");
@@ -54,17 +87,13 @@
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++;
- write_vertex_xml_file(vesicle,1000);
+ 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");
@@ -126,11 +155,26 @@
}
}
}
- //printf("nucleus coords: %.17e %.17e %.17e\n",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]);
+
+ vesicle->plist=plist;
+/* Entry point for plugin after_vesicle_init() function */
+ vesicle->plist->pointer=vesicle->plist->chain->after_vesicle_init;
+ while(vesicle->plist->pointer!=NULL){
+ vesicle=vesicle->plist->pointer->plugin->function->after_vesicle_init(vesicle);
+ vesicle->plist->pointer=vesicle->plist->pointer->next;
+ }
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");
+/* Entry point for plugin cleanup() function */
+ ptr=plist->chain->cleanup;
+ while(ptr!=NULL){
+ ptr->plugin->function->cleanup();
+ ptr=ptr->next;
+ }
+
+
vesicle_free(vesicle);
tape_free(tape);
return 0; //program finished perfectly ok. We return 0.
--
Gitblit v1.9.3