Changeset 052c10 for src/LinkedCell

Timestamp:

Aug 28, 2014, 8:53:42 AM (10 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:

11d433

Parents:

7ee21d

git-author:

Frederik Heber <heber@…> (08/28/14 08:48:24)

git-committer:

Frederik Heber <heber@…> (08/28/14 08:53:42)

Message:

MEMFIX: Tesselation::operator() did not free linkedlist.

Location:

src/LinkedCell

Files:

• linkedcell.cpp (modified) (2 diffs)
• unittests/linkedcellUnitTest.cpp (modified) (1 diff)

src/LinkedCell/linkedcell.cpp

@@ -141 +141 @@
 LinkedCell_deprecated::~LinkedCell_deprecated()
 {
-  if (LC != NULL)
-  for (index=0;index<N[0]*N[1]*N[2];index++)
-    LC[index].clear();
-  delete[](LC);
+  if (LC != NULL) {
+    for (index=0;index<N[0]*N[1]*N[2];index++) {
+      // don't delete pointers are just "borrowed"
+      LC[index].clear();
+    }
+    delete[] LC;
+  }
   for(int i=0;i<NDIM;i++)
     N[i] = 0;
@@ -367 +370 @@
       }
     }
-    delete(NeighbourList);
+    delete NeighbourList;
   } else
     ELOG(2, "Around vector " << *center << " there are no atoms.");

src/LinkedCell/unittests/linkedcellUnitTest.cpp

@@ -378 +378 @@
   CPPUNIT_ASSERT_EQUAL( (size_t)0, ListOfPoints->size() );
   CPPUNIT_ASSERT_EQUAL( true, ListOfPoints->empty() );
-  delete(ListOfPoints);
-};
+  delete ListOfPoints;
+};