Changeset 516fb4 for src/bin/mpqc/mpqc.cc

Timestamp:

Jul 10, 2012, 1:19:31 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

2fbba84

Parents:

c96b1d

Message:

Input file can now be parsed externally and given as char array to mainFunction().

File:

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

src/bin/mpqc/mpqc.cc

@@ -626 +626 @@
     Ref<ParsedKeyVal> &parsedkv,
     struct OptionValues &values,
-    char *in_char_array,
+    char *&in_char_array,
     int use_simple_input)
 {
@@ -1187 +1187 @@
     const char *&input,
     const char *&generic_input,
+    char *&in_char_array,
     int argc,
     char **argv)
@@ -1196 +1197 @@
   // parse input into keyvalue container
   Ref<ParsedKeyVal> parsedkv;
-  char *in_char_array = 0;
-  int use_simple_input;
-  parseInputfile(grp, parsedkv, values, input, generic_input, in_char_array, use_simple_input);
+  int use_simple_input = 0; // default is object-oriented if in_char_array is given
+  if (!in_char_array) // obtain from file
+    parseInputfile(grp, parsedkv, values, input, generic_input, in_char_array, use_simple_input);
   parseIntoKeyValue(parsedkv, values, in_char_array, use_simple_input);
   delete[] in_char_array;
@@ -1525 +1526 @@
 
   // now comes the actual work
-  mainFunction(outstream, values, input, generic_input, argc, argv);
+  char *in_char_array = 0;
+  mainFunction(outstream, values, input, generic_input, in_char_array, argc, argv);
 
   if (output != 0) {