From bd826de2f539f2e48c8c01d2d7f9f34c7e97104a Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 13 May 2016 07:43:27 +0000
Subject: [PATCH] Fix in trisurf output, inhibiting print of successful reconstruction. Multiple fixes and improvements in python module. Added symlinking of tapes into the running directories and dumping tapes from snapshots into tape files.
---
src/spherical_trisurf_ff.c | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/src/spherical_trisurf_ff.c b/src/spherical_trisurf_ff.c
index 867f37d..8a0902f 100644
--- a/src/spherical_trisurf_ff.c
+++ b/src/spherical_trisurf_ff.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdio.h>
#include<math.h>
#include "general.h"
@@ -44,10 +45,11 @@
preparationSh(vesicle,r0);
calculateYlmi(vesicle);
calculateUlm(vesicle);
+ts_double vmsr,bfsr;
for(i=0;i<500;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);
@@ -62,7 +64,7 @@
for(i=0;i<10000;i++){
cell_occupation(vesicle);
for(j=0;j<1000;j++){
- single_timestep(vesicle);
+ single_timestep(vesicle,&vmsr,&bfsr);
}
centermass(vesicle);
vesicle_volume(vesicle);
@@ -86,27 +88,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