Implemented startconfig.

[phys/latlib.git] / o815 / o815.cpp

diff --git a/o815/o815.cpp b/o815/o815.cpp
index c55928192bfb2586075323d029ab04316863f6e6..648dbb3ce59d10827bee4baa7fc52a10bf78d8bf 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -27,7 +27,8 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[],
   comargs.outdir="";
   comargs.idonly = false;
   comargs.showjobnum = false;
-
+  comargs.startconfig = "";
+  
 #ifndef MPI_DISABLED
   MPI_Init(&argc, &argv);
   MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
@@ -37,16 +38,17 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[],
   rank = 0;
 #endif
 
-  addComOption("lsize",  required_argument, NULL,                'L', "define lattice size",                     "xsize:tsize");
-  addComOption("nmeas",  required_argument, NULL,                'N', "set number of measurements",              "nmeas");
-  addComOption("skip",   required_argument, NULL,                'S', "set number of skips between configs",     "nskip");
-  addComOption("nequi",  required_argument, NULL,                'E', "set number of equilibrations",            "nequi");
-  addComOption("ocache", required_argument, NULL,                'O', "set observable cache (mode=oo|ro|wo|rw)", "dir:mode");
-  addComOption("ccache", required_argument, NULL,                'C', "set config cache (mode=oo|ro|wo|rw)",     "dir:mode");
-  addComOption("write",  required_argument, NULL,                'W', "data writeout directory",                 "dir");
-  addComOption("idonly", no_argument,       &comargs.idonly,     'I', "show output-id only",                     "");
-  addComOption("jobnum", no_argument,       &comargs.showjobnum, 'J', "show jobnumber only",                     "");
-
+  addComOption("lsize",       required_argument, NULL,                'L', "define lattice size",                     "xsize:tsize");
+  addComOption("nmeas",       required_argument, NULL,                'N', "set number of measurements",              "nmeas");
+  addComOption("skip",        required_argument, NULL,                'S', "set number of skips between configs",     "nskip");
+  addComOption("nequi",       required_argument, NULL,                'E', "set number of equilibrations",            "nequi");
+  addComOption("ocache",      required_argument, NULL,                'O', "set observable cache (mode=oo|ro|wo|rw)", "dir:mode");
+  addComOption("ccache",      required_argument, NULL,                'C', "set config cache (mode=oo|ro|wo|rw)",     "dir:mode");
+  addComOption("write",       required_argument, NULL,                'W', "data writeout directory",                 "dir");
+  addComOption("idonly",      no_argument,       &comargs.idonly,     'I', "show output-id only",                     "");
+  addComOption("jobnum",      no_argument,       &comargs.showjobnum, 'J', "show jobnumber only",                     "");
+  addComOption("startconfig", required_argument, NULL,                'X', "read start config from file",             "startconfigfile");
+  
   vector<comoption>::iterator lastO815Opt = comOptions.end()-1;
 
   if (specOps != NULL)
@@ -142,6 +144,8 @@ void o815::mainLoop() {
     *out->log << ">" << endl << flush;
 
     Sim->_newParas();
+
+    Sim->resetConfig();
     
     progress measProg(comargs.nmeas);
 
@@ -236,6 +240,9 @@ void o815::parseArgs(int argc, char **argv, comoption specOps[]) {
     case 'W':
       comargs.outdir = optarg;
       break;
+    case 'X':
+      comargs.startconfig = optarg;
+      break;
     default:
       if ( opt != 0) {
        comoption* thisop = getOptionByVal(opt);