source: src/atom.cpp@ 5f612ee

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 5f612ee was 5f612ee, checked in by Frederik Heber <heber@…>, 15 years ago

Merge branch 'Analysis_PairCorrelation' into StructureRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/World.cpp
molecuilder/src/World.hpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/log.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/periodentafel.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/gslvectorunittest.cpp
molecuilder/src/unittests/logunittest.cpp
molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
molecuilder/src/vector.cpp
molecuilder/tests/Tesselations/defs.in

Conflicts have been many and too numerous to listen here, just the few general cases

  • new molecule() replaced by World::getInstance().createMolecule()
  • new atom() replaced by World::getInstance().createAtom() where appropriate.
  • Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
  • DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
  • ...

Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.

This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.
It configures, compiles and runs all test cases and the test suite without errors.

Signed-off-by: Frederik Heber <heber@…>

  • Property mode set to 100644
File size: 9.5 KB
Line 
1/** \file atom.cpp
2 *
3 * Function implementations for the class atom.
4 *
5 */
6
7#include "atom.hpp"
8#include "bond.hpp"
9#include "config.hpp"
10#include "element.hpp"
11#include "lists.hpp"
12#include "memoryallocator.hpp"
13#include "parser.hpp"
14#include "vector.hpp"
15#include "World.hpp"
16
17/************************************* Functions for class atom *************************************/
18
19
20/** Constructor of class atom.
21 */
22atom::atom() :
23 previous(NULL), next(NULL), father(this), sort(&nr)
24{
25 node = &x; // TesselPoint::x can only be referenced from here
26};
27
28/** Constructor of class atom.
29 */
30atom::atom(atom *pointer) :
31 ParticleInfo(pointer),
32 previous(NULL), next(NULL), father(pointer), sort(&nr)
33{
34 type = pointer->type; // copy element of atom
35 x.CopyVector(&pointer->x); // copy coordination
36 v.CopyVector(&pointer->v); // copy velocity
37 FixedIon = pointer->FixedIon;
38 node = &x;
39};
40
41atom *atom::clone(){
42 atom *res = new atom();
43 res->previous=0;
44 res->next=0;
45 res->father = this;
46 res->sort = &res->nr;
47 res->type = type;
48 res->x.CopyVector(&this->x);
49 res->v.CopyVector(&this->v);
50 res->FixedIon = FixedIon;
51 res->node = &x;
52 World::getInstance().registerAtom(res);
53 return res;
54}
55
56
57/** Destructor of class atom.
58 */
59atom::~atom()
60{
61 unlink(this);
62};
63
64
65/** Climbs up the father list until NULL, last is returned.
66 * \return true father, i.e. whose father points to itself, NULL if it could not be found or has none (added hydrogen)
67 */
68atom *atom::GetTrueFather()
69{
70 atom *walker = this;
71 do {
72 if (walker == walker->father) // top most father is the one that points on itself
73 break;
74 walker = walker->father;
75 } while (walker != NULL);
76 return walker;
77};
78
79/** Sets father to itself or its father in case of copying a molecule.
80 */
81void atom::CorrectFather()
82{
83 if (father->father == father) // same atom in copy's father points to itself
84 father = this; // set father to itself (copy of a whole molecule)
85 else
86 father = father->father; // set father to original's father
87
88};
89
90/** Check whether father is equal to given atom.
91 * \param *ptr atom to compare father to
92 * \param **res return value (only set if atom::father is equal to \a *ptr)
93 */
94void atom::EqualsFather ( const atom *ptr, const atom **res ) const
95{
96 if ( ptr == father )
97 *res = this;
98};
99
100/** Checks whether atom is within the given box.
101 * \param offset offset to box origin
102 * \param *parallelepiped box matrix
103 * \return true - is inside, false - is not
104 */
105bool atom::IsInParallelepiped(const Vector offset, const double *parallelepiped) const
106{
107 return (node->IsInParallelepiped(offset, parallelepiped));
108};
109
110/** Counts the number of bonds weighted by bond::BondDegree.
111 * \param bonds times bond::BondDegree
112 */
113int BondedParticle::CountBonds() const
114{
115 int NoBonds = 0;
116 for (BondList::const_iterator Runner = ListOfBonds.begin(); Runner != ListOfBonds.end(); (++Runner))
117 NoBonds += (*Runner)->BondDegree;
118 return NoBonds;
119};
120
121/** Output of a single atom with given numbering.
122 * \param ElementNo cardinal number of the element
123 * \param AtomNo cardinal number among these atoms of the same element
124 * \param *out stream to output to
125 * \param *comment commentary after '#' sign
126 * \return true - \a *out present, false - \a *out is NULL
127 */
128bool atom::OutputIndexed(ofstream * const out, const int ElementNo, const int AtomNo, const char *comment) const
129{
130 if (out != NULL) {
131 *out << "Ion_Type" << ElementNo << "_" << AtomNo << "\t" << fixed << setprecision(9) << showpoint;
132 *out << x.x[0] << "\t" << x.x[1] << "\t" << x.x[2];
133 *out << "\t" << FixedIon;
134 if (v.Norm() > MYEPSILON)
135 *out << "\t" << scientific << setprecision(6) << v.x[0] << "\t" << v.x[1] << "\t" << v.x[2] << "\t";
136 if (comment != NULL)
137 *out << " # " << comment << endl;
138 else
139 *out << " # molecule nr " << nr << endl;
140 return true;
141 } else
142 return false;
143};
144
145/** Output of a single atom with numbering from array according to atom::type.
146 * \param *ElementNo cardinal number of the element
147 * \param *AtomNo cardinal number among these atoms of the same element
148 * \param *out stream to output to
149 * \param *comment commentary after '#' sign
150 * \return true - \a *out present, false - \a *out is NULL
151 */
152bool atom::OutputArrayIndexed(ofstream * const out, const int *ElementNo, int *AtomNo, const char *comment) const
153{
154 AtomNo[type->Z]++; // increment number
155 if (out != NULL) {
156 *out << "Ion_Type" << ElementNo[type->Z] << "_" << AtomNo[type->Z] << "\t" << fixed << setprecision(9) << showpoint;
157 *out << x.x[0] << "\t" << x.x[1] << "\t" << x.x[2];
158 *out << "\t" << FixedIon;
159 if (v.Norm() > MYEPSILON)
160 *out << "\t" << scientific << setprecision(6) << v.x[0] << "\t" << v.x[1] << "\t" << v.x[2] << "\t";
161 if (comment != NULL)
162 *out << " # " << comment << endl;
163 else
164 *out << " # molecule nr " << nr << endl;
165 return true;
166 } else
167 return false;
168};
169
170/** Output of a single atom as one lin in xyz file.
171 * \param *out stream to output to
172 * \return true - \a *out present, false - \a *out is NULL
173 */
174bool atom::OutputXYZLine(ofstream *out) const
175{
176 if (out != NULL) {
177 *out << type->symbol << "\t" << x.x[0] << "\t" << x.x[1] << "\t" << x.x[2] << "\t" << endl;
178 return true;
179 } else
180 return false;
181};
182
183/** Output of a single atom as one lin in xyz file.
184 * \param *out stream to output to
185 * \param *ElementNo array with ion type number in the config file this atom's element shall have
186 * \param *AtomNo array with atom number in the config file this atom shall have, is increase by one automatically
187 * \param step Trajectory time step to output
188 * \return true - \a *out present, false - \a *out is NULL
189 */
190bool atom::OutputTrajectory(ofstream * const out, const int *ElementNo, int *AtomNo, const int step) const
191{
192 AtomNo[type->Z]++;
193 if (out != NULL) {
194 *out << "Ion_Type" << ElementNo[type->Z] << "_" << AtomNo[type->Z] << "\t" << fixed << setprecision(9) << showpoint;
195 *out << Trajectory.R.at(step).x[0] << "\t" << Trajectory.R.at(step).x[1] << "\t" << Trajectory.R.at(step).x[2];
196 *out << "\t" << FixedIon;
197 if (Trajectory.U.at(step).Norm() > MYEPSILON)
198 *out << "\t" << scientific << setprecision(6) << Trajectory.U.at(step).x[0] << "\t" << Trajectory.U.at(step).x[1] << "\t" << Trajectory.U.at(step).x[2] << "\t";
199 if (Trajectory.F.at(step).Norm() > MYEPSILON)
200 *out << "\t" << scientific << setprecision(6) << Trajectory.F.at(step).x[0] << "\t" << Trajectory.F.at(step).x[1] << "\t" << Trajectory.F.at(step).x[2] << "\t";
201 *out << "\t# Number in molecule " << nr << endl;
202 return true;
203 } else
204 return false;
205};
206
207/** Output of a single atom as one lin in xyz file.
208 * \param *out stream to output to
209 * \param step Trajectory time step to output
210 * \return true - \a *out present, false - \a *out is NULL
211 */
212bool atom::OutputTrajectoryXYZ(ofstream * const out, const int step) const
213{
214 if (out != NULL) {
215 *out << type->symbol << "\t";
216 *out << Trajectory.R.at(step).x[0] << "\t";
217 *out << Trajectory.R.at(step).x[1] << "\t";
218 *out << Trajectory.R.at(step).x[2] << endl;
219 return true;
220 } else
221 return false;
222};
223
224/** Outputs the MPQC configuration line for this atom.
225 * \param *out output stream
226 * \param *center center of molecule subtracted from position
227 * \param *AtomNo pointer to atom counter that is increased by one
228 */
229void atom::OutputMPQCLine(ofstream * const out, const Vector *center, int *AtomNo = NULL) const
230{
231 *out << "\t\t" << type->symbol << " [ " << x.x[0]-center->x[0] << "\t" << x.x[1]-center->x[1] << "\t" << x.x[2]-center->x[2] << " ]" << endl;
232 if (AtomNo != NULL)
233 *AtomNo++;
234};
235
236/** Compares the indices of \a this atom with a given \a ptr.
237 * \param ptr atom to compare index against
238 * \return true - this one's is smaller, false - not
239 */
240bool atom::Compare(const atom &ptr) const
241{
242 if (nr < ptr.nr)
243 return true;
244 else
245 return false;
246};
247
248/** Returns squared distance to a given vector.
249 * \param origin vector to calculate distance to
250 * \return distance squared
251 */
252double atom::DistanceSquaredToVector(const Vector &origin) const
253{
254 return origin.DistanceSquared(&x);
255};
256
257/** Returns distance to a given vector.
258 * \param origin vector to calculate distance to
259 * \return distance
260 */
261double atom::DistanceToVector(const Vector &origin) const
262{
263 return origin.Distance(&x);
264};
265
266/** Initialises the component number array.
267 * Size is set to atom::ListOfBonds.size()+1 (last is th encode end by -1)
268 */
269void atom::InitComponentNr()
270{
271 if (ComponentNr != NULL)
272 Free(&ComponentNr);
273 ComponentNr = Malloc<int>(ListOfBonds.size()+1, "atom::InitComponentNumbers: *ComponentNr");
274 for (int i=ListOfBonds.size()+1;i--;)
275 ComponentNr[i] = -1;
276};
277
278
279bool operator < (atom &a, atom &b)
280{
281 return a.Compare(b);
282};
283
284World *atom::getWorld(){
285 return world;
286}
287
288void atom::setWorld(World* _world){
289 world = _world;
290}
291
292bool atom::changeId(atomId_t newId){
293 // first we move ourselves in the world
294 // the world lets us know if that succeeded
295 if(world->changeAtomId(id,newId,this)){
296 id = newId;
297 return true;
298 }
299 else{
300 return false;
301 }
302}
303
304void atom::setId(atomId_t _id) {
305 id=_id;
306}
307
308atomId_t atom::getId() {
309 return id;
310}
311
312atom* NewAtom(atomId_t _id){
313 atom * res =new atom();
314 res->setId(_id);
315 return res;
316}
317
318void DeleteAtom(atom* atom){
319 delete atom;
320}
Note: See TracBrowser for help on using the repository browser.