Changeset 4459fc for src/LinkedCell

Timestamp:

Jan 2, 2012, 1:34:29 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:

c80643

Parents:

c8f6b6

git-author:

Frederik Heber <heber@…> (12/19/11 21:38:50)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:34:29)

Message:

Refactored typedef tripleIndex into own structure.

• we need the struct to accomodate some helpful operators.

Location:

src/LinkedCell

Files:

• LinkedCell.hpp (modified) (1 diff)
• LinkedCell_Model.hpp (modified) (1 diff)
• LinkedCell_View.cpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• tripleIndex.cpp (added)
• tripleIndex.hpp (added)
• types.hpp (modified) (2 diffs)

src/LinkedCell/LinkedCell.hpp

@@ -14 +14 @@
 #endif
 
+#include "LinkedCell/tripleIndex.hpp"
 #include "LinkedCell/types.hpp"
 

src/LinkedCell/LinkedCell_Model.hpp

@@ -20 +20 @@
 #include "LinearAlgebra/defs.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
+#include "LinkedCell/tripleIndex.hpp"
 #include "LinkedCell/types.hpp"
 

src/LinkedCell/LinkedCell_View.cpp

@@ -26 +26 @@
 #include "LinkedCell.hpp"
 #include "LinkedCell_Model.hpp"
+#include "tripleIndex.hpp"
 
 using namespace LinkedCell;

src/LinkedCell/Makefile.am

@@ -7 +7 @@
   LinkedCell/LinkedCell_Controller.cpp \
   LinkedCell/LinkedCell_Model.cpp \
-  LinkedCell/LinkedCell_View.cpp
+  LinkedCell/LinkedCell_View.cpp \
+  LinkedCell/tripleIndex.cpp
 
 LINKEDCELLHEADER = \
@@ -16 +17 @@
   LinkedCell/LinkedCell_Model.hpp \
   LinkedCell/LinkedCell_View.hpp \
-  LinkedCell/PointCloudAdaptor.hpp
+  LinkedCell/PointCloudAdaptor.hpp \
+  LinkedCell/tripleIndex.hpp
 
 

src/LinkedCell/types.hpp

@@ -17 +17 @@
 #include <vector>
 
-#include <boost/array.hpp>
 #include <boost/multi_array.hpp>
 
@@ -36 +35 @@
   //!> three-dimensional array of LinkedCell instances
   typedef boost::multi_array<LinkedCell *, NDIM> LinkedCellArray;
-
-  //!> vector of 3 indices
-  typedef boost::array<LinkedCellArray::index, NDIM> tripleIndex;
 }
 
+
 #endif /* LINKEDCELL_TYPES_HPP_ */