From a26a909b45161c46d018322b82263ce6764b64fa Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 08 Mar 2019 20:14:36 +0000
Subject: [PATCH] Constant area plugin done -- fix
---
src/main.c | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main.c b/src/main.c
index b972854..bf58e53 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,13 +28,26 @@
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));
strcpy(plugin0,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/demoplugin.so");
strcpy(plugin1,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/vmdefaulthardconstraints.so");
- ts_char **plugins=(ts_char **)calloc(2,sizeof(ts_char *));
- *plugins=plugin0;
+ 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");
+ ts_char **plugins=(ts_char **)calloc(6,sizeof(ts_char *));
+ plugins[0]=plugin0;
plugins[1]=plugin1;
- ts_plugin_list *plist=init_plugin_list(plugins,2);
- ts_fprintf(stdout, "TRISURF in PRVI PLUGIN %s\n", plist->plugin[0]->details->name);
+ plugins[2]=plugin2;
+ plugins[3]=plugin3;
+ plugins[4]=plugin4;
+ plugins[5]=plugin5;
+ ts_plugin_list *plist=init_plugin_list(plugins,6);
+ //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;
@@ -51,9 +64,10 @@
ts_fprintf(stdout,"Starting program...\n\n");
/* Entry point for plugin function at_start() */
- int i;
- for(i=0; i<plist->n; i++){
- plist->plugin[i]->function->at_start(argv, argc);
+ 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){
@@ -138,13 +152,23 @@
vesicle->plist=plist;
/* Entry point for plugin after_vesicle_init() function */
- for(i=0; i<plist->n; i++){
- vesicle = plist->plugin[i]->function->after_vesicle_init(vesicle);
+ 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