Changeset 246d97 for src

Timestamp:

Jun 22, 2012, 8:19:31 AM (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:

142ff5

Parents:

7ca772

git-author:

Frederik Heber <heber@…> (03/09/12 09:47:57)

git-committer:

Frederik Heber <heber@…> (06/22/12 08:19:31)

Message:

FragmentResult has additional variable exitflag.

• this is to store the result flag from a system call.

Location:

src/Fragmentation/Automation

Files:

• FragmentResult.cpp (modified) (4 diffs)
• FragmentResult.hpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentResult.cpp

@@ -29 +29 @@
 FragmentResult::FragmentResult() :
   JobId(JobId::NoJob),
-  result(std::string("NoJob"))
+  result(std::string("NoJob")),
+  exitflag(0)
 {}
 
@@ -38 +39 @@
 FragmentResult::FragmentResult(const JobId_t _id) :
   JobId(_id),
-  result(std::string("Nothing"))
+  result(std::string("Nothing")),
+  exitflag(0)
 {}
 
@@ -45 +47 @@
 FragmentResult::FragmentResult(const JobId_t _id, const std::string _result) :
   JobId(_id),
-  result(_result)
+  result(_result),
+  exitflag(0)
 {}
 
@@ -53 +56 @@
 FragmentResult::FragmentResult(const FragmentResult &other) :
   JobId(other.getId()),
-  result(other.result)
+  result(other.result),
+  exitflag(other.exitflag)
 {}
 

src/Fragmentation/Automation/FragmentResult.hpp

@@ -48 +48 @@
   std::string result;
 
+  //!> exit flag
+  int exitflag;
+
 private:
   friend class boost::serialization::access;
@@ -60 +63 @@
     ar & boost::serialization::base_object<JobId>(*this);
     ar & result;
+    ar & exitflag;
   }
 };