Changeset 6b91e64 for src/LinkedCell

Timestamp:

Jan 2, 2012, 1:00:05 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:

fea945

Parents:

c379f9

git-author:

Frederik Heber <heber@…> (11/29/11 09:20:04)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:00:05)

Message:

Added convenience library for files of new LinkedCell implementation.

• is used with unit tests only so far.
• name is temporary to vaid class with present convenience library.

• Temporarily added libMolecuilderLinkedCell_refactored to ALLLIBS for TestRunner. This is changed when we swap the now two LinkedCell libraries.

Location:

src/LinkedCell

Files:

• Makefile.am (modified) (1 diff)
• unittests/Makefile.am (modified) (3 diffs)

src/LinkedCell/Makefile.am

@@ -51 +51 @@
 #pkgconfigdir = $(libdir)/pkgconfig
 #pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
+
+LINKEDCELL_REFACTOREDSOURCE = \
+  LinkedCell/LinkedCell.cpp \
+  LinkedCell/LinkedCell_Model.cpp \
+  LinkedCell/LinkedCell_View.cpp
+
+LINKEDCELL_REFACTOREDHEADER = \
+  LinkedCell/LinkedCell.hpp \
+  LinkedCell/LinkedCell_Model.hpp \
+  LinkedCell/LinkedCell_View.hpp
+
+
+noinst_LTLIBRARIES += libMolecuilderLinkedCell_refactored.la
+libMolecuilderLinkedCell_refactored_la_includedir = $(includedir)/MoleCuilder/LinkedCell/
+
+nobase_libMolecuilderLinkedCell_refactored_la_include_HEADERS = ${LINKEDCELL_REFACTOREDHEADER}
+libMolecuilderLinkedCell_refactored_la_SOURCES = ${LINKEDCELL_REFACTOREDSOURCE}
+

src/LinkedCell/unittests/Makefile.am

@@ -3 +3 @@
 
 LINKEDCELLTESTSSOURCES = \
-        ../LinkedCell/LinkedCell.cpp \
-        ../LinkedCell/LinkedCell_Model.cpp \
-        ../LinkedCell/LinkedCell_View.cpp \
         ../LinkedCell/unittests/LinkedCellUnitTest.cpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp \
@@ -12 +9 @@
 
 LINKEDCELLTESTSHEADERS = \
-        ../LinkedCell/LinkedCell.hpp \
-        ../LinkedCell/LinkedCell_Model.hpp \
-        ../LinkedCell/LinkedCell_View.hpp \
         ../LinkedCell/PointCloudAdaptor.hpp \
         ../LinkedCell/unittests/LinkedCellUnitTest.hpp \
@@ -46 +40 @@
 LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../LinkedCell/unittests/LinkedCellUnitTest.cpp \
-        ../LinkedCell/unittests/LinkedCellUnitTest.hpp \
-        ../LinkedCell/LinkedCell.cpp \
-        ../LinkedCell/LinkedCell.hpp
-LinkedCellUnitTest_LDADD = $(LINKEDCELLLIBS)
-#       ../libMolecuilderLinkedCell.la \
-        ../libMolecuilderAtom.la \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la
+        ../LinkedCell/unittests/LinkedCellUnitTest.hpp
+LinkedCellUnitTest_LDADD = \
+        ../libMolecuilderLinkedCell_refactored.la \
+        $(LINKEDCELLLIBS)
 
 LinkedCell_ModelUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp \
-        ../LinkedCell/LinkedCell.cpp \
-        ../LinkedCell/LinkedCell_Model.cpp \
-        ../LinkedCell/LinkedCell.hpp \
-        ../LinkedCell/LinkedCell_Model.hpp \
         ../LinkedCell/PointCloudAdaptor.hpp
-LinkedCell_ModelUnitTest_LDADD = $(LINKEDCELLLIBS)
+LinkedCell_ModelUnitTest_LDADD = \
+        ../libMolecuilderLinkedCell_refactored.la \
+        $(LINKEDCELLLIBS)
 
 LinkedCell_ViewUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../LinkedCell/unittests/LinkedCell_ViewUnitTest.cpp \
         ../LinkedCell/unittests/LinkedCell_ViewUnitTest.hpp \
-        ../LinkedCell/LinkedCell.cpp \
-        ../LinkedCell/LinkedCell_Model.cpp \
-        ../LinkedCell/LinkedCell_View.cpp \
-        ../LinkedCell/LinkedCell.hpp \
-        ../LinkedCell/LinkedCell_Model.hpp \
-        ../LinkedCell/LinkedCell_View.hpp \
         ../LinkedCell/PointCloudAdaptor.hpp
-LinkedCell_ViewUnitTest_LDADD = $(LINKEDCELLLIBS)
+LinkedCell_ViewUnitTest_LDADD = \
+        ../libMolecuilderLinkedCell_refactored.la \
+        $(LINKEDCELLLIBS)
 
 #AUTOMAKE_OPTIONS = parallel-tests