Changeset 042f82 for src/moleculelist.cpp
- Timestamp:
- Jul 23, 2009, 2:21:57 PM (16 years ago)
- 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:
- 36ec71
- Parents:
- 205ccd
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/moleculelist.cpp
r205ccd r042f82 523 523 524 524 // open file for the force factors 525 *out << Verbose(1) << "Saving 525 *out << Verbose(1) << "Saving force factors ... "; 526 526 line << path << "/" << FRAGMENTPREFIX << FORCESFILE; 527 527 ForcesFile.open(line.str().c_str(), ios::out); … … 691 691 MoleculeLeafClass::MoleculeLeafClass(MoleculeLeafClass *PreviousLeaf = NULL) 692 692 { 693 // 694 // 695 // 696 // 697 // 693 // if (Up != NULL) 694 // if (Up->DownLeaf == NULL) // are we the first down leaf for the upper leaf? 695 // Up->DownLeaf = this; 696 // UpLeaf = Up; 697 // DownLeaf = NULL; 698 698 Leaf = NULL; 699 699 previous = PreviousLeaf; … … 711 711 MoleculeLeafClass::~MoleculeLeafClass() 712 712 { 713 // 714 // 715 // 716 // 717 // 718 // 719 // 720 // 721 // 722 // 713 // if (DownLeaf != NULL) {// drop leaves further down 714 // MoleculeLeafClass *Walker = DownLeaf; 715 // MoleculeLeafClass *Next; 716 // do { 717 // Next = Walker->NextLeaf; 718 // delete(Walker); 719 // Walker = Next; 720 // } while (Walker != NULL); 721 // // Last Walker sets DownLeaf automatically to NULL 722 // } 723 723 // remove the leaf itself 724 724 if (Leaf != NULL) { … … 729 729 if (previous != NULL) 730 730 previous->next = next; 731 // 732 // 733 // NextLeaf->UpLeaf = UpLeaf;// either null as we are top level or the upleaf of the first node734 // 735 // UpLeaf->DownLeaf = NextLeaf;// either null as we are only leaf or NextLeaf if we are just the first736 // 737 // 731 // } else { // we are first in list (connects to UpLeaf->DownLeaf) 732 // if ((NextLeaf != NULL) && (NextLeaf->UpLeaf == NULL)) 733 // NextLeaf->UpLeaf = UpLeaf; // either null as we are top level or the upleaf of the first node 734 // if (UpLeaf != NULL) 735 // UpLeaf->DownLeaf = NextLeaf; // either null as we are only leaf or NextLeaf if we are just the first 736 // } 737 // UpLeaf = NULL; 738 738 if (next != NULL) // are we last in list 739 739 next->previous = previous;
Note:
See TracChangeset
for help on using the changeset viewer.