From f4d6ca0fa0915bd12f42fd79c57f3d0aabff50f0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 18 May 2016 13:09:45 +0000
Subject: [PATCH] Starting with tsmeasure... Prototype done
---
src/initial_distribution.c | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 7d5647c..4c82b35 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdlib.h>
#include<math.h>
#include<stdio.h>
@@ -12,6 +13,7 @@
#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);
@@ -38,10 +40,17 @@
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:
+ 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;
@@ -84,7 +93,7 @@
vesicle->dmax=tape->dmax*tape->dmax; /* dmax^2 in the vesicle dmax variable */
vesicle->bending_rigidity=tape->xk0;
vtx_set_global_values(vesicle); /* make xk0 default value for every vertex */
- ts_fprintf(stdout, "Tape setting: xk0=%e\n",tape->xk0);
+// ts_fprintf(stdout, "Tape setting: xk0=%e\n",tape->xk0);
vesicle->stepsize=tape->stepsize;
vesicle->clist->ncmax[0]=tape->ncxmax;
vesicle->clist->ncmax[1]=tape->ncymax;
@@ -93,8 +102,13 @@
vesicle->pressure= tape->pressure;
vesicle->pswitch=tape->pswitch;
- vesicle->sphHarmonics=sph_init(vesicle->vlist,tape->shc);
- 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