Changeset ef7b4b for src/Jobs

Timestamp:

Mar 15, 2017, 6:15:56 PM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

6ec999

Parents:

86f27c

git-author:

Frederik Heber <heber@…> (03/14/17 21:59:48)

git-committer:

Frederik Heber <heber@…> (03/15/17 18:15:56)

Message:

ENABLEFIX: disable-jobmarket is now working.

• needed to add additional results for parse/save-fragment-results regression test in case of no jobmarket.
• MPQCJob_Work lacked include in ndef HAVE_JOBMARKET case.
• should not compile mpqc_extract without JobMarket.

Location:

src/Jobs

Files:

• MPQCJob_Work.cpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)

src/Jobs/MPQCJob_Work.cpp

@@ -37 +37 @@
 #include "CodePatterns/Log.hpp"
 
+#include <boost/archive/text_oarchive.hpp>
 #ifdef HAVE_JOBMARKET
 // include headers that implement a archive in simple text format
 // otherwise BOOST_CLASS_EXPORT_IMPLEMENT has no effect
-#include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/tokenizer.hpp>

src/Jobs/Makefile.am

@@ -56 +56 @@
 
 lib_LTLIBRARIES += \
-        libMolecuilderJobs.la \
+        libMolecuilderJobs.la
+if CONDJOBMARKET
+lib_LTLIBRARIES += \
         libmolecuilder_mpqc_extract.la
+endif
 noinst_LTLIBRARIES += \
         libMolecuilderJobs_Work.la
 
 ### libmolecuilder_mpqc_extract.la
+if CONDJOBMARKET
 libmolecuilder_mpqc_extract_la_SOURCES = \
         Jobs/mpqc_extract.cc \
@@ -83 +87 @@
         libMolecuilderFragmentationSummation.la \
         -lboost_serialization
+endif
 
 ### libMolecuilderJobs_Work.la