Changeset 7ed4e8

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

f5403d

Parents:

3cb97b

git-author:

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

git-committer:

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

Message:

Extracted getting memory group into own function.

File:

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

src/bin/mpqc/mpqc.cc

@@ -670 +670 @@
 }
 
+/** Get the memory group.
+ *
+ * \param keyval keyvalue container
+ * \param memory memory group on return
+ * \param argc argument count
+ * \param argv argument array
+ */
+void getMemoryGroup(
+    Ref<KeyVal> &keyval,
+    Ref<MemoryGrp> &memory,
+    int argc,
+    char **argv)
+{
+  // first try the commandline and environment
+  memory = MemoryGrp::initial_memorygrp(argc, argv);
+
+  // if we still don't have a group, try reading the memory group
+  // from the input
+  if (memory.null()) {
+    memory << keyval->describedclassvalue("memory");
+  }
+
+  if (memory.nonnull())
+    MemoryGrp::set_default_memorygrp(memory);
+  else
+    memory = MemoryGrp::get_default_memorygrp();
+}
+
 int
 try_main(int argc, char *argv[])
@@ -753 +781 @@
   getThreadGroup(keyval, thread, argc, argv);
   
-  // get the memory group.  first try the commandline and environment
-  Ref<MemoryGrp> memory = MemoryGrp::initial_memorygrp(argc, argv);
-  
-  // if we still don't have a group, try reading the memory group
-  // from the input
-  if (memory.null()) {
-    memory << keyval->describedclassvalue("memory");
-  }
-
-  if (memory.nonnull())
-    MemoryGrp::set_default_memorygrp(memory);
-  else
-    memory = MemoryGrp::get_default_memorygrp();
+  // get the memory group.
+  Ref<MemoryGrp> memory;
+  getMemoryGroup(keyval, memory, argc, argv);
 
   ExEnv::out0() << indent