Changeset 9d5ddf

Timestamp:

Jul 7, 2010, 11:51:34 AM (14 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

5e8e02

Parents:

7e0a6d

Message:

Added constructor and destructor to VectorContent struct

Location:

src

Files:

• VectorContent.hpp (modified) (2 diffs)
• vector.cpp (modified) (4 diffs)

src/VectorContent.hpp

@@ -13 +13 @@
  * The way GSL works does not allow for forward definitions of the structures.
  * Because of this the pointer to the gsl_vector struct is wrapped inside another
- * (dumb) object that allows for forward definitions. All methods of this class
- * are empty, to allow for a maximum of flexibility.
+ * (dumb) object that allows for forward definitions.
  */
 
@@ -20 +19 @@
 
 struct VectorContent{
+  VectorContent(){
+    content =  gsl_vector_calloc (NDIM);
+  }
+  ~VectorContent(){
+    gsl_vector_free(content);
+    content = 0;
+  }
   gsl_vector *content;
 };

src/vector.cpp

@@ -29 +29 @@
 {
   content = new VectorContent();
-  content->content = gsl_vector_calloc (NDIM);
 };
 
@@ -39 +38 @@
 {
   content = new VectorContent();
-  content->content = gsl_vector_alloc(NDIM);
   gsl_vector_memcpy(content->content, src.content->content);
 }
@@ -48 +46 @@
 {
   content = new VectorContent();
-  content->content = gsl_vector_alloc(NDIM);
   gsl_vector_set(content->content,0,x1);
   gsl_vector_set(content->content,1,x2);
@@ -72 +69 @@
  */
 Vector::~Vector() {
-  gsl_vector_free(content->content);
   delete content;
 };