From ab798b28b9f3b836db6c9eb9e4a25d57981022ae Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 01 Mar 2016 08:51:46 +0000
Subject: [PATCH] Added resotration from vtu files by using --restore-from-vtk flag. Requires filename
---
src/initial_distribution.c | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 3c27e55..3af821d 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -11,6 +11,8 @@
#include "energy.h"
#include "poly.h"
#include "io.h"
+#include "sh.h"
+#include "shcomplex.h"
ts_vesicle *initial_distribution_dipyramid(ts_uint nshell, ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize){
ts_fprintf(stdout,"Starting initial_distribution on vesicle with %u shells!...\n",nshell);
@@ -37,11 +39,20 @@
ts_vesicle *create_vesicle_from_tape(ts_tape *tape){
ts_vesicle *vesicle;
- ts_vertex *vtx;
vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
+ vesicle->tape=tape;
+ set_vesicle_values_from_tape(vesicle);
+ return vesicle;
+}
+
+ts_bool set_vesicle_values_from_tape(ts_vesicle *vesicle){
// Nucleus:
- vesicle->R_nucleus=tape->R_nucleus;
+ ts_vertex *vtx;
+ ts_tape *tape=vesicle->tape;
+ vesicle->R_nucleus=tape->R_nucleus*tape->R_nucleus;
+
+ vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
//Initialize grafted polymers (brush):
vesicle->poly_list=init_poly_list(tape->npoly,tape->nmono, vesicle->vlist, vesicle);
@@ -69,6 +80,9 @@
}
}
+ for(i=0;i<vesicle->filament_list->n;i++){
+ vertex_list_assign_id(vesicle->filament_list->poly[i]->vlist,TS_ID_FILAMENT);
+ }
// vesicle->spring_constant=tape->kspring;
// poly_assign_spring_const(vesicle);
@@ -87,8 +101,13 @@
vesicle->pressure= tape->pressure;
vesicle->pswitch=tape->pswitch;
-
- return vesicle;
+ if(tape->shc>0){
+ vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);
+ }
+ else {
+ vesicle->sphHarmonics=NULL;
+ }
+ return TS_SUCCESS;
}
--
Gitblit v1.9.3