Changeset 09bc09

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

666f70

Parents:

f5403d

git-author:

Frederik Heber <heber@…> (07/06/12 19:17:15)

git-committer:

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

Message:

Extracted getting integral factory into own function.

File:

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

src/bin/mpqc/mpqc.cc

@@ -698 +698 @@
 }
 
+/** Prepares CCA component if available.
+ *
+ * \param keyval keyvalue container
+ * \param options parsed command line options
+ */
+void prepareCCA(
+    Ref<KeyVal> &keyval,
+    GetLongOpt &options
+    )
+{
+#ifdef HAVE_CHEMISTRY_CCA
+  // initialize cca framework
+  KeyValValuestring emptystring("");
+  bool do_cca = keyval->booleanvalue("do_cca",falsevalue);
+
+  string cca_path(options.retrieve("cca-path"));
+  string cca_load(options.retrieve("cca-load"));
+  if(cca_path.size()==0)
+    cca_path = keyval->stringvalue("cca_path",emptystring);
+  if(cca_load.size()==0)
+    cca_load = keyval->stringvalue("cca_load",emptystring);
+
+  if( !do_cca && (cca_load.size() > 0 || cca_path.size() > 0) )
+    do_cca = true;
+
+  if(cca_path.size()==0) {
+    #ifdef CCA_PATH
+      cca_path = CCA_PATH;
+    #endif
+  }
+  if(cca_load.size()==0) {
+    cca_load += "MPQC.IntegralEvaluatorFactory";
+  }
+
+  if( cca_load.size() > 0 && cca_path.size() > 0 && do_cca ) {
+    string cca_args = "--path " + cca_path + " --load " + cca_load;
+    ExEnv::out0() << endl << indent << "Initializing CCA framework with args: "
+                  << endl << indent << cca_args << endl;
+    CCAEnv::init( cca_args );
+  }
+#endif
+}
+
 /** Setup debugger.
  *
@@ -721 +764 @@
       debugger->debug("Starting debugger because -d given on command line.");
   }
+}
+
+/** Get integral factory.
+ *
+ * \param keyval keyvalue container
+ * \param integral integral group on return
+ * \param argc argument count
+ * \param argv argument array
+ */
+void getIntegralFactory(
+    Ref<KeyVal> &keyval,
+    Ref<Integral> &integral,
+    int argc,
+    char **argv)
+{
+  // first try commandline and environment
+  integral = Integral::initial_integral(argc, argv);
+
+  // if we still don't have a integral, try reading the integral
+  // from the input
+  if (integral.null()) {
+    integral << keyval->describedclassvalue("integrals");
+  }
+
+  if (integral.nonnull())
+    Integral::set_default_integral(integral);
+  else
+    integral = Integral::get_default_integral();
+
 }
 
@@ -822 +894 @@
        << "Total number of processors = " << grp->n() * thread->nthread() << endl;
 
-#ifdef HAVE_CHEMISTRY_CCA
-  // initialize cca framework
-  KeyValValuestring emptystring("");
-  bool do_cca = keyval->booleanvalue("do_cca",falsevalue);
-
-  string cca_path(options.retrieve("cca-path"));
-  string cca_load(options.retrieve("cca-load"));
-  if(cca_path.size()==0)
-    cca_path = keyval->stringvalue("cca_path",emptystring);
-  if(cca_load.size()==0)
-    cca_load = keyval->stringvalue("cca_load",emptystring);
-
-  if( !do_cca && (cca_load.size() > 0 || cca_path.size() > 0) )
-    do_cca = true;
-
-  if(cca_path.size()==0) {
-    #ifdef CCA_PATH
-      cca_path = CCA_PATH;                                 
-    #endif
-  }
-  if(cca_load.size()==0) {
-    cca_load += "MPQC.IntegralEvaluatorFactory";
-  }
-
-  if( cca_load.size() > 0 && cca_path.size() > 0 && do_cca ) {
-    string cca_args = "--path " + cca_path + " --load " + cca_load;
-    ExEnv::out0() << endl << indent << "Initializing CCA framework with args: "
-                  << endl << indent << cca_args << endl;
-    CCAEnv::init( cca_args );
-  }
-#endif
+  // prepapre CCA if available
+  prepareCCA(keyval, options);
 
   // now set up the debugger
@@ -864 +907 @@
         keyval->describedclassvalue("matrixkit").pointer()));
 
-  // get the integral factory. first try commandline and environment
-  Ref<Integral> integral = Integral::initial_integral(argc, argv);
-  
-  // if we still don't have a integral, try reading the integral
-  // from the input
-  if (integral.null()) {
-    integral << keyval->describedclassvalue("integrals");
-  }
-
-  if (integral.nonnull())
-    Integral::set_default_integral(integral);
-  else
-    integral = Integral::get_default_integral();
-
+  // get the integral factory.
+  Ref<Integral> integral;
+  getIntegralFactory(keyval, integral, argc, argv);
   ExEnv::out0() << endl << indent
        << "Using " << integral->class_name()