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
Last change
on this file since 7b9fe0 was 560bbe, checked in by Frederik Heber <heber@…>, 13 years ago |
AtomicInfo now also (re)stores ParticleInfo::Nr, molecule has own IdPool.
- molecule now also has an internal IdPool to be able to hand out unique ids,
according to uniqueId policy.
- new functions: molecule::changeAtomNr(), molecule::setAtomName()
- molecule::erase() and ::insert() release and set the id (and the name).
- molecule::setAtomName() uses getNr() with id increased by one.
- AtomicInfo stores and sets ParticleInfo::Nr.
- atom::changeNr() is similar to changeId() only for the molecule.
- molecule::AddAtom() does not set the name anymore, is done by ::insert().
- simplified molecule::doCountAtoms() a lot, no more naming of atoms.
- SPEEDUP: This speeds up the GUI already a lot.
- TESTFIX: changed regression test Tesselation/BigNonConvex due to different
ordering of node ids (due to above), surface is still the same (checked).
|
-
Property mode
set to
100644
|
File size:
2.2 KB
|
Line | |
---|
1 | /*
|
---|
2 | * Project: MoleCuilder
|
---|
3 | * Description: creates and alters molecular systems
|
---|
4 | * Copyright (C) 2010-2012 University of Bonn. All rights reserved.
|
---|
5 | * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
|
---|
6 | */
|
---|
7 |
|
---|
8 | /*
|
---|
9 | * AtomicInfo.cpp
|
---|
10 | *
|
---|
11 | * Created on: Aug 10, 2010
|
---|
12 | * Author: heber
|
---|
13 | */
|
---|
14 |
|
---|
15 | // include config.h
|
---|
16 | #ifdef HAVE_CONFIG_H
|
---|
17 | #include <config.h>
|
---|
18 | #endif
|
---|
19 |
|
---|
20 | #include "CodePatterns/MemDebug.hpp"
|
---|
21 |
|
---|
22 | #include "atom.hpp"
|
---|
23 | #include "AtomicInfo.hpp"
|
---|
24 | #include "Descriptors/AtomIdDescriptor.hpp"
|
---|
25 | #include "Descriptors/MoleculeIdDescriptor.hpp"
|
---|
26 | #include "Element/element.hpp"
|
---|
27 | #include "LinearAlgebra/Vector.hpp"
|
---|
28 | #include "molecule.hpp"
|
---|
29 | #include "World.hpp"
|
---|
30 |
|
---|
31 | /********************************** Functions for class AtomicInfo **********************************/
|
---|
32 |
|
---|
33 | AtomicInfo::AtomicInfo() :
|
---|
34 | Type(NULL),
|
---|
35 | FatherId(0),
|
---|
36 | MolId(0),
|
---|
37 | Id(0),
|
---|
38 | Nr(0)
|
---|
39 | {}
|
---|
40 | AtomicInfo::AtomicInfo(const atom &_atom) :
|
---|
41 | Position(_atom.getPosition()),
|
---|
42 | Type(_atom.getType()),
|
---|
43 | Velocity(_atom.getAtomicVelocity()),
|
---|
44 | FatherId(_atom.father->getId()),
|
---|
45 | MolId(_atom.getMolecule()->getId()),
|
---|
46 | Id(_atom.getId()),
|
---|
47 | Nr(_atom.getNr())
|
---|
48 | {}
|
---|
49 |
|
---|
50 | AtomicInfo::~AtomicInfo()
|
---|
51 | {}
|
---|
52 |
|
---|
53 |
|
---|
54 | bool AtomicInfo::setAtom(atom &_atom) const
|
---|
55 | {
|
---|
56 | _atom.setPosition(Position);
|
---|
57 | _atom.setType(Type);
|
---|
58 | _atom.setAtomicVelocity(Velocity);
|
---|
59 |
|
---|
60 | // set old id
|
---|
61 | bool status = true;
|
---|
62 | if (_atom.getId() != Id)
|
---|
63 | status = _atom.changeId(Id);
|
---|
64 |
|
---|
65 | // set its father
|
---|
66 | atom * const _father = World::getInstance().getAtom(AtomById(FatherId));
|
---|
67 | if (_father == NULL)
|
---|
68 | _atom.father = &_atom;
|
---|
69 | else
|
---|
70 | _atom.father = _father;
|
---|
71 |
|
---|
72 | // setting molecule
|
---|
73 | molecule * const _mol = World::getInstance().getMolecule(MoleculeById(MolId));
|
---|
74 | if (_mol != NULL)
|
---|
75 | _atom.setMolecule(_mol); // this is ok, mol is const within AtomicInfo, but not outside (atoms need to register)
|
---|
76 | _atom.changeNr(Nr);
|
---|
77 |
|
---|
78 | return status;
|
---|
79 | }
|
---|
80 |
|
---|
81 | atomId_t AtomicInfo::getId() const {
|
---|
82 | return Id;
|
---|
83 | }
|
---|
84 |
|
---|
85 | AtomicInfo& AtomicInfo::operator=(const AtomicInfo& AI)
|
---|
86 | {
|
---|
87 | if (&AI == this) // check self-assignment
|
---|
88 | return *this;
|
---|
89 | Position = AI.Position;
|
---|
90 | Type = AI.Type;
|
---|
91 | FatherId = AI.FatherId;
|
---|
92 | MolId = AI.MolId;
|
---|
93 | Velocity = AI.Velocity;
|
---|
94 | Id = AI.Id;
|
---|
95 | Nr = AI.Nr;
|
---|
96 | return *this;
|
---|
97 | }
|
---|
98 |
|
---|
Note:
See
TracBrowser
for help on using the repository browser.