From 055dd7840f6926f3b4b41a04a86b7fac0a8fec26 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 08 Jul 2014 14:13:54 +0000
Subject: [PATCH] Fixed cell from dump with new tape. Take 2.
---
src/io.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/io.c b/src/io.c
index d001b7e..76737ee 100644
--- a/src/io.c
+++ b/src/io.c
@@ -10,7 +10,7 @@
#include <dirent.h>
#include "initial_distribution.h"
#include "poly.h"
-
+#include "cell.h"
#include <getopt.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -170,7 +170,8 @@
*/
fwrite(vesicle->clist, sizeof(ts_cell_list),1, fh);
-
+/* write tape information on vesicle */
+ fwrite(vesicle->tape,sizeof(ts_tape),1,fh);
fwrite(&iteration, sizeof(ts_uint),1,fh);
fclose(fh);
return TS_SUCCESS;
@@ -418,16 +419,12 @@
vesicle->filament_list->poly[i]->blist->bond[j]->vtx2=vesicle->filament_list->poly[i]->vlist->vtx[idx];
}
}
-
+ vesicle->tape=parsetape("tape");
// recreating space for cells //
- vesicle->clist=(ts_cell_list *)malloc(sizeof(ts_cell_list));
- retval=fread(vesicle->clist, sizeof(ts_cell_list), 1,fh);
- vesicle->clist->cell=(ts_cell **)malloc(sizeof(ts_cell *)*vesicle->clist->ncmax[0]*vesicle->clist->ncmax[1]*vesicle->clist->ncmax[2]);
- for(i=0;i<vesicle->clist->ncmax[0]*vesicle->clist->ncmax[1]*vesicle->clist->ncmax[2];i++){
- vesicle->clist->cell[i]=(ts_cell *)calloc(1,sizeof(ts_cell));
- vesicle->clist->cell[i]->idx=i+1; // We enumerate cells! Probably never required!
- }
+ vesicle->clist=init_cell_list(vesicle->tape->ncxmax, vesicle->tape->ncymax, vesicle->tape->nczmax, vesicle->tape->stepsize);
+// vesicle->tape=(ts_tape *)malloc(sizeof(ts_tape));
+// retval=fread(vesicle->tape, sizeof(ts_tape),1,fh);
retval=fread(iteration,sizeof(ts_uint),1,fh);
if(retval);
fclose(fh);
@@ -973,6 +970,8 @@
CFG_SIMPLE_FLOAT("dmin_interspecies", &tape->dmin_interspecies),
CFG_SIMPLE_FLOAT("xk0",&tape->xk0),
CFG_SIMPLE_INT("pswitch",&tape->pswitch),
+ CFG_SIMPLE_INT("constvolswitch",&tape->constvolswitch),
+ CFG_SIMPLE_FLOAT("constvolprecision",&tape->constvolprecision),
CFG_SIMPLE_FLOAT("pressure",&tape->pressure),
CFG_SIMPLE_FLOAT("k_spring",&tape->kspring),
CFG_SIMPLE_FLOAT("xi",&tape->xi),
--
Gitblit v1.9.3