From 5e08f27fac51e8f7261cd4484ab8878befac8fe1 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Fri, 08 Mar 2019 20:08:54 +0000 Subject: [PATCH] Constant area plugin done --- src/main.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main.c b/src/main.c index 6d19213..bf58e53 100644 --- a/src/main.c +++ b/src/main.c @@ -30,16 +30,22 @@ 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"); 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"); - ts_char **plugins=(ts_char **)calloc(4,sizeof(ts_char *)); - *plugins=plugin0; + 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; plugins[2]=plugin2; plugins[3]=plugin3; - ts_plugin_list *plist=init_plugin_list(plugins,4); + 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; @@ -146,10 +152,10 @@ vesicle->plist=plist; /* Entry point for plugin after_vesicle_init() function */ - ptr=plist->chain->after_vesicle_init; - while(ptr!=NULL){ - ptr->plugin->function->after_vesicle_init(vesicle); - ptr=ptr->next; + 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); -- Gitblit v1.9.3