From def8b5262e183297ccee42ebbf9ebdb89c10f44c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 03 Jul 2016 18:21:13 +0000
Subject: [PATCH] restoring vertices with spontaneous curvatures seems to work, however, the dumped energy differs on last few decimal places
---
src/spherical_trisurf.c | 29 ++++-------------------------
1 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/src/spherical_trisurf.c b/src/spherical_trisurf.c
index 7fa40f9..06a84f4 100644
--- a/src/spherical_trisurf.c
+++ b/src/spherical_trisurf.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdio.h>
#include<math.h>
#include "general.h"
@@ -61,10 +62,11 @@
calculateUlm(vesicle);
//preloop:
+ts_double vmsr, bfsr;
for(i=0;i<1000;i++){
cell_occupation(vesicle);
for(j=0;j<1000;j++){
- single_timestep(vesicle);
+ single_timestep(vesicle, &vmsr, &bfsr);
}
centermass(vesicle);
fprintf(stderr, "Preloop %d completed.\n",i+1);
@@ -75,7 +77,7 @@
for(j=0;j<200;j++){
cell_occupation(vesicle);
for(k=0;k<5;k++){
- single_timestep(vesicle);
+ single_timestep(vesicle, &vmsr, &bfsr);
}
centermass(vesicle);
}
@@ -103,26 +105,3 @@
-ts_bool saveAvgUlm2(ts_vesicle *vesicle){
-
- FILE *fh;
-
- fh=fopen("sph2out.dat", "w");
- if(fh==NULL){
- err("Cannot open file %s for writing");
- return TS_FAIL;
- }
-
- ts_spharm *sph=vesicle->sphHarmonics;
- ts_int i,j;
- fprintf(fh,"l,\tm,\tulm^2avg\n");
- for(i=0;i<sph->l;i++){
- for(j=0;j<2*i+1;j++){
- fprintf(fh,"%d,\t%d,\t%e\n", i, j-i, sph->sumUlm2[i][j]/(ts_double)sph->N);
-
- }
- fprintf(fh,"\n");
- }
- fclose(fh);
- return TS_SUCCESS;
-}
--
Gitblit v1.9.3