Changeset 4adfba

Timestamp:

Nov 14, 2012, 10:02:52 AM (12 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:

c889b7

Parents:

442cee

git-author:

Frederik Heber <heber@…> (07/30/12 08:11:15)

git-committer:

Frederik Heber <heber@…> (11/14/12 10:02:52)

Message:

LibMolecuilderJobsGrid is now a distinct convenience library, however included in libMolecuilderJobs.

Location:

src

Files:

• Jobs/Grid/Makefile.am (added)
• Jobs/Makefile.am (modified) (3 diffs)
• Makefile.am (modified) (1 diff)

src/Jobs/Makefile.am

@@ -9 +9 @@
 JOBSSOURCE += \
         Jobs/InterfaceVMGJob.cpp \
-        Jobs/VMGJob.cpp \
-        Jobs/Grid/SamplingGrid.cpp \
-        Jobs/Grid/SamplingGridProperties.cpp
+        Jobs/VMGJob.cpp
 endif
 
@@ -24 +22 @@
 JOBSHEADER += \
         Jobs/InterfaceVMGJob.hpp \
-        Jobs/VMGJob.hpp \
-        Jobs/Grid/SamplingGrid.hpp \
-        Jobs/Grid/SamplingGridProperties.hpp
+        Jobs/VMGJob.hpp
 endif
 
@@ -35 +31 @@
 libMolecuilderJobs_la_LDFLAGS = $(AM_LDFLAGS) \
   $(BOOST_SERIALIZATION_LDFLAGS) \
+  $(BOOST_SYSTEM_LDFLAGS) \
   $(JobMarket_LDFLAGS) \
   $(CodePatterns_LDFLAGS)
 libMolecuilderJobs_la_SOURCES = $(JOBSSOURCE)
 libMolecuilderJobs_la_LIBADD = \
-        $(VMG_LIBS) \
-        $(JobMarket_LIBS) \
+  libMolecuilderJobsGrid.la \
+  $(VMG_LIBS) \
+  $(JobMarket_LIBS) \
   $(BOOST_SERIALIZATION_LIBS) \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+  $(BOOST_SYSTEM_LIBS) \
+  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
   $(CodePatterns_LIBS)
 if CONDVMGMPI

src/Makefile.am

@@ -23 +23 @@
 if CONDJOBMARKET
 include Jobs/Makefile.am
+include Jobs/Grid/Makefile.am
 endif