From 86f5e72cbecb70197e77fb5e411874d6b015ebdd Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:45:36 +0000
Subject: [PATCH] Dump and restore complete and debugged. Still, use with caution
---
src/main.c | 13 +++----------
src/io.c | 6 ++++--
src/tape | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/io.c b/src/io.c
index d022d89..547c51c 100644
--- a/src/io.c
+++ b/src/io.c
@@ -22,7 +22,7 @@
FILE *fh=fopen("dump.bin","wb");
/* dump vesicle */
- fwrite(vesicle, sizeof(vesicle),1,fh);
+ fwrite(vesicle, sizeof(ts_vesicle),1,fh);
/* dump vertex list */
fwrite(vesicle->vlist, sizeof(ts_vertex_list),1,fh);
/* dump bond list */
@@ -144,7 +144,9 @@
/* we restore all the data from the dump */
/* restore vesicle */
ts_vesicle *vesicle=(ts_vesicle *)calloc(1,sizeof(ts_vesicle));
- retval=fread(vesicle, sizeof(vesicle),1,fh);
+ retval=fread(vesicle, sizeof(ts_vesicle),1,fh);
+// fprintf(stderr,"was here! %e\n",vesicle->dmax);
+
/* restore vertex list */
vesicle->vlist=(ts_vertex_list *)malloc(sizeof(ts_vertex_list));
retval=fread(vesicle->vlist, sizeof(ts_vertex_list),1,fh);
diff --git a/src/main.c b/src/main.c
index e758de5..705d8de 100644
--- a/src/main.c
+++ b/src/main.c
@@ -72,18 +72,11 @@
//poly_list_free(vesicle->poly_list);
/*End testing*/
-//write_vertex_xml_file(vesicle,0);
-//vesicle_free(vesicle);
dump_state(vesicle1);
-vesicle=restore_state();
-//write_vertex_xml_file(vesicle,1);
-//write_master_xml_file("test.pvd");
-//vesicle_free(vesicle1);
-//vesicle_free(vesicle);
-vesicle_free(vesicle1);
-fprintf(stderr,"Starting simulation...");
-run_simulation(vesicle, mcsweeps, inititer, iterations);
+vesicle=restore_state();
+//vesicle_free(vesicle1);
+run_simulation(vesicle1, mcsweeps, inititer, iterations);
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
diff --git a/src/tape b/src/tape
index d30d1d6..f3c8bad 100644
--- a/src/tape
+++ b/src/tape
@@ -28,7 +28,7 @@
#how many initial mcsweeps*inititer MC sweeps before recording to disk?
inititer=1
#how many records do you want on the disk iteration are there in a run?
-iterations=10
+iterations=10000
#shut up if we are using cluster!!!
--
Gitblit v1.9.3