From 04694fe065b8cab52fa878a5fc23e7159f2e548c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 16 May 2018 12:12:06 +0000
Subject: [PATCH] Fixed the equation for energy and area a0
---
src/energy.c | 2 +-
src/initial_distribution.c | 2 +-
src/restore.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/energy.c b/src/energy.c
index 77d61ab..1dae415 100644
--- a/src/energy.c
+++ b/src/energy.c
@@ -240,5 +240,5 @@
}
void stretchenergy(ts_vesicle *vesicle, ts_triangle *triangle){
- triangle->energy=vesicle->tape->xkA0/vesicle->tlist->n/2*pow((triangle->area/vesicle->tlist->a0-1),2);
+ triangle->energy=vesicle->tape->xkA0/2.0*pow((triangle->area/vesicle->tlist->a0-1.0),2);
}
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 59bf808..93c7338 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -112,7 +112,7 @@
vesicle->sphHarmonics=NULL;
}
- vesicle->tlist->a0=sqrt(3)/2*pow((vesicle->tape->dmax+1.0),2);
+ vesicle->tlist->a0=sqrt(3)/2*pow((vesicle->tape->dmax+1.0)/2.0,2);
return TS_SUCCESS;
}
diff --git a/src/restore.c b/src/restore.c
index 6267377..111d89b 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -88,7 +88,7 @@
mean_curvature_and_energy(vesicle);
sweep_attraction_bond_energy(vesicle);
if(vesicle->tape->stretchswitch==1){
- vesicle->tlist->a0=sqrt(3)/2*pow((vesicle->tape->dmax+1.0),2);
+ vesicle->tlist->a0=sqrt(3)/2.0*pow((vesicle->tape->dmax+1.0)/2.0,2);
for(i=0;i<vesicle->tlist->n;i++){
stretchenergy(vesicle, vesicle->tlist->tria[i]);
}
--
Gitblit v1.9.3