Changeset 666f70 for src/bin

Timestamp:

Jul 10, 2012, 1:15:50 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

dca43b

Parents:

09bc09

git-author:

Frederik Heber <heber@…> (07/06/12 19:24:35)

git-committer:

Frederik Heber <heber@…> (07/10/12 13:15:50)

Message:

Extracted parsing restart file into own function.

File:

• src/bin/mpqc/mpqc.cc (modified) (3 diffs)

src/bin/mpqc/mpqc.cc

@@ -795 +795 @@
 }
 
+void performRestart(
+    Ref<KeyVal> &keyval,
+    Ref<MessageGrp> &grp,
+    Ref<Optimize> &opt,
+    Ref<MolecularEnergy> &mole,
+    char *&restartfile
+    )
+{
+  int restart = keyval->booleanvalue("restart",truevalue);
+  struct stat sb;
+  int statresult, statsize;
+  if (restart) {
+    if (grp->me() == 0) {
+      statresult = stat(restartfile,&sb);
+      statsize = (statresult==0) ? sb.st_size : 0;
+    }
+    grp->bcast(statresult);
+    grp->bcast(statsize);
+  }
+  if (restart && statresult==0 && statsize) {
+    BcastStateInBin si(grp,restartfile);
+    if (keyval->exists("override")) {
+      si.set_override(new PrefixKeyVal(keyval,"override"));
+    }
+    char *suf = strrchr(restartfile,'.');
+    if (!strcmp(suf,".wfn")) {
+      mole << SavableState::key_restore_state(si,"mole");
+      ExEnv::out0() << endl
+                   << indent << "Restored <" << mole->class_name()
+                   << "> from " << restartfile << endl;
+
+      opt << keyval->describedclassvalue("opt");
+      if (opt.nonnull())
+        opt->set_function(mole.pointer());
+    }
+    else {
+      opt << SavableState::key_restore_state(si,"opt");
+      if (opt.nonnull()) {
+        mole << opt->function();
+        ExEnv::out0() << endl << indent
+             << "Restored <Optimize> from " << restartfile << endl;
+      }
+    }
+  } else {
+    mole << keyval->describedclassvalue("mole");
+    opt << keyval->describedclassvalue("opt");
+  }
+}
+
+
 int
 try_main(int argc, char *argv[])
@@ -894 +944 @@
        << "Total number of processors = " << grp->n() * thread->nthread() << endl;
 
-  // prepapre CCA if available
+  // prepare CCA if available
   prepareCCA(keyval, options);
 
@@ -942 +992 @@
   int savestate = keyval->booleanvalue("savestate",truevalue);
 
-  struct stat sb;
   Ref<MolecularEnergy> mole;
   Ref<Optimize> opt;
 
-  int statresult, statsize;
-  if (restart) {
-    if (grp->me() == 0) {
-      statresult = stat(restartfile,&sb);
-      statsize = (statresult==0) ? sb.st_size : 0;
-    }
-    grp->bcast(statresult);
-    grp->bcast(statsize);
-  }
-  if (restart && statresult==0 && statsize) {
-    BcastStateInBin si(grp,restartfile);
-    if (keyval->exists("override")) {
-      si.set_override(new PrefixKeyVal(keyval,"override"));
-    }
-    char *suf = strrchr(restartfile,'.');
-    if (!strcmp(suf,".wfn")) {
-      mole << SavableState::key_restore_state(si,"mole");
-      ExEnv::out0() << endl
-                   << indent << "Restored <" << mole->class_name()
-                   << "> from " << restartfile << endl;
-
-      opt << keyval->describedclassvalue("opt");
-      if (opt.nonnull())
-        opt->set_function(mole.pointer());
-    }
-    else {
-      opt << SavableState::key_restore_state(si,"opt");
-      if (opt.nonnull()) {
-        mole << opt->function();
-        ExEnv::out0() << endl << indent
-             << "Restored <Optimize> from " << restartfile << endl;
-      }
-    }
-  } else {
-    mole << keyval->describedclassvalue("mole");
-    opt << keyval->describedclassvalue("opt");
-  }
+  performRestart(keyval, grp, opt, mole, restartfile);
 
   if (mole.nonnull()) {