Before adding constant volume subrutines

Samo Penic

2014-04-28 2b14da2e8f012d7b1bf669af085ab75d87f378f1

 src/vertexmove.c

@@ -9,6 +9,7 @@
#include "timestep.h"
#include "cell.h"
//#include "io.h"
#include "io.h"
#include<stdio.h>
#include "vertexmove.h"
#include <string.h>
@@ -90,7 +91,7 @@
   memcpy((void *)&backupvtx[i+1],(void *)vtx->neigh[i],sizeof(ts_vertex));
   }

   if(vesicle->pswitch == 1){
   if(vesicle->pswitch == 1 || vesicle->tape->constvolswitch == 1){
      for(i=0;i<vtx->tristar_no;i++) dvol-=vtx->tristar[i]->volume;
   };

@@ -107,9 +108,9 @@
        delta_energy+=vtx->neigh[i]->xk*(vtx->neigh[i]->energy-oenergy);
    }

   if(vesicle->pswitch == 1){
   if(vesicle->pswitch == 1 || vesicle->tape->constvolswitch == 1){
      for(i=0;i<vtx->tristar_no;i++) dvol+=vtx->tristar[i]->volume;
      delta_energy-=vesicle->pressure*dvol;
        if(vesicle->pswitch == 1) delta_energy-=vesicle->pressure*dvol;
   };

/* No poly-bond energy for now!
@@ -144,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);
@@ -152,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;
@@ -310,7 +313,6 @@
   cellidx=vertex_self_avoidance(vesicle, vtx);
   //check occupation number
   retval=cell_occupation_number_and_internal_proximity(vesicle->clist,cellidx,vtx);
	
   if(retval==TS_FAIL){
      vtx=memcpy((void *)vtx,(void *)&backupvtx,sizeof(ts_vertex));
        return TS_FAIL;