Changeset b5d38d

Timestamp:

Nov 7, 2011, 4:13:01 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

567357

Parents:

bcfb77

git-author:

Frederik Heber <heber@…> (11/01/11 22:27:22)

git-committer:

Frederik Heber <heber@…> (11/07/11 16:13:01)

Message:

Moved dumpMemory() and saveAll() from module builder_init to cleanUp.

Location:

src

Files:

• builder.cpp (modified) (1 diff)
• builder_init.cpp (modified) (1 diff)
• builder_init.hpp (modified) (1 diff)
• cleanUp.cpp (modified) (1 diff)
• cleanUp.hpp (modified) (1 diff)

src/builder.cpp

@@ -20 +20 @@
 
 #include "builder_init.hpp"
+#include "cleanUp.hpp"
 
 /********************************************** Main routine **************************************/

src/builder_init.cpp

@@ -141 +141 @@
 }
 
-/** Dump current memory chunks.
- *
- */
-void dumpMemory()
-{
-  ofstream ost("molecuilder.memdump");
-  Memory::dumpMemory(ost);
-}
-
-/** Save the current World to output files and exit.
- *
- * @return retrieved from World::getExitFlag()
- */
-int saveAll()
-{
-  FormatParserStorage::getInstance().SaveAll();
-  ChangeTracker::getInstance().saveStatus();
-
-  int ExitFlag = World::getInstance().getExitFlag();
-  return (ExitFlag == 1 ? 0 : ExitFlag);
-}

src/builder_init.hpp

@@ -20 +20 @@
 void doUI();
 
-void dumpMemory();
-
-int saveAll();
 
 #endif /* BUILDER_INIT_HPP_ */

src/cleanUp.cpp

@@ -114 +114 @@
   std::cout << "Total Actions called: " << Chron.SumUpTotalFunctions() << std::endl;
 }
+
+/** Dump current memory chunks.
+ *
+ */
+void dumpMemory()
+{
+  ofstream ost("molecuilder.memdump");
+  Memory::dumpMemory(ost);
+}
+
+/** Save the current World to output files and exit.
+ *
+ * @return retrieved from World::getExitFlag()
+ */
+int saveAll()
+{
+  FormatParserStorage::getInstance().SaveAll();
+  ChangeTracker::getInstance().saveStatus();
+
+  int ExitFlag = World::getInstance().getExitFlag();
+  return (ExitFlag == 1 ? 0 : ExitFlag);
+}

src/cleanUp.hpp

@@ -16 +16 @@
 void AddStaticEntitiestoIgnoreList();
 void cleanUp();
+void dumpMemory();
 void printTimings();
+int saveAll();
 
 #endif /* CLEANUP_HPP_ */