continuation s working. now reset counter is needed

Samo Penic

2014-03-08 62681163a4c47fc6dbd6b2b96f84171b20cba3ed

continuation s working. now reset counter is needed

 src/main.c

@@ -21,7 +21,7 @@
int main(int argv, char *argc[]){
    ts_vesicle *vesicle;
    ts_tape *tape;
    ts_uint start_iteration=0;
    ts_uint start_iteration=-1;
    parse_args(argv,argc);
    ts_fprintf(stdout,"\nStarting program...\n\n");
if(force_from_tape){
@@ -37,9 +37,14 @@
ts_fprintf(stdout,"**********************************************************************\n\n");
tape=parsetape("tape");
vesicle=restore_state(&start_iteration);

if(start_iteration>=tape->iterations){
    ts_fprintf(stdout, "Simulation already completed. if you want to rerun it try with --force-from-tape or --reset-iteration-count\n\n");
    return 0;
}
}

run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations);
run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration+1);
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);

 src/timestep.c

@@ -9,13 +9,13 @@
#include "frame.h"
#include "io.h"

ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations){
ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations, ts_uint start_iteration){
    ts_uint i, j;

    centermass(vesicle);
    cell_occupation(vesicle);
    ts_fprintf(stdout, "Starting simulation (first %d x %d MC sweeps will not be recorded on disk)\n", inititer, mcsweeps);
    for(i=0;i<inititer+iterations;i++){
    if(start_iteration<inititer) ts_fprintf(stdout, "Starting simulation (first %d x %d MC sweeps will not be recorded on disk)\n", inititer, mcsweeps);
    for(i=start_iteration;i<inititer+iterations;i++){
        for(j=0;j<mcsweeps;j++){
            single_timestep(vesicle);
        }

 src/timestep.h

@@ -1,5 +1,5 @@
#ifndef _TIMESTEP_H
#define _TIMESTEP_H
ts_bool single_timestep(ts_vesicle *vesicle);
ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations);
ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations, ts_uint start_simulation);
#endif