From 2b14da2e8f012d7b1bf669af085ab75d87f378f1 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 28 Apr 2014 11:43:16 +0000
Subject: [PATCH] Before adding constant volume subrutines
---
src/main.c | 3 ++-
src/vertexmove.c | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main.c b/src/main.c
index e67764d..f300719 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
#include<stdio.h>
#include<math.h>
+#include<stdlib.h>
#include "general.h"
#include "vertex.h"
#include "bond.h"
@@ -51,7 +52,7 @@
vesicle->pressure=tape->pressure;
vesicle->dmax=tape->dmax*tape->dmax;
poly_assign_filament_xi(vesicle,tape);
- tape_free(vesicle->tape);
+ free(vesicle->tape);
vesicle->tape=tape;
vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
/* spherical harmonics */
diff --git a/src/vertexmove.c b/src/vertexmove.c
index 7b099e4..d496a4e 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -145,7 +145,7 @@
return TS_FAIL;
}
}
-
+ //accepted
// oldcellidx=vertex_self_avoidance(vesicle, &backupvtx[0]);
if(vtx->cell!=vesicle->clist->cell[cellidx]){
retval=cell_add_vertex(vesicle->clist->cell[cellidx],vtx);
@@ -153,6 +153,8 @@
if(retval==TS_SUCCESS) cell_remove_vertex(backupvtx[0].cell,vtx);
}
+
+ if(vesicle->tape->constvolswitch == 1);
// if(oldcellidx);
//END MONTE CARLOOOOOOO
return TS_SUCCESS;
--
Gitblit v1.9.3