source: src/defs.hpp@ efc3cb

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 efc3cb 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 100755
File size: 4.9 KB
RevLine 
[14de469]1/** \file defs.hpp
2 *
3 * Constant definitons and enumerations.
4 *
5 */
6
7#ifndef DEFS_HPP_
8#define DEFS_HPP_
9
10#define MYEPSILON 1e-13 //!< machine epsilon precision
11#define NDIM 3 //!< number of spatial dimensions
12#define MAX_ELEMENTS 128 //!< maximum number of elements for certain lookup tables
13#define AtomicLengthToAngstroem 0.52917721 //!< conversion factor from atomic length/bohrradius to angstroem
[698b04]14#define AtomicEnergyToKelvin 315774.67 //!< conversion factor from atomic energy to kelvin via boltzmann factor
[16a52b]15#define KelvinToAtomicTemperature 3.1668152e-06 //!< conversion factor for Kelvin to atomic temperature (Hartree over k_B)
16#define KelvinToeV 8.6173422e-05 //!< conversion factor for Kelvin to Ht (k_B * T = energy), thus Boltzmann constant in eV/K
17#define AtomicMassUnitsToeV 931494088. //!< conversion factor for atomic weight in units to mass in eV
18#define AtomicMassUnitsToHt 34480864. //!< conversion factor for atomic weight in units to mass in Ht (protonmass/electronmass * electron_mass_in_Ht
19#define ElectronMass_Ht 18778.865 //!< electron mass in Ht
20#define ElectronMass_eV 510998.903 //!< electron mass in eV
21#define Units2Electronmass (AtomicMassUnitsToeV/ElectronMass_eV) //!< atomic mass unit in eV/ electron mass in eV = 1 822.88863
22#define Atomictime2Femtoseconds 0.024188843 //!< Atomictime in fs
23
[7151c4]24#define VERSIONSTRING "v1.0"
25
[0329bf]26#define LocalPath "./"
27
[db942e]28//enum BondOrderScheme { NoScheme, BottomUp, TopDown, ANOVA, Combined }; //!< Fragmentation scheme used in BOSS
[14de469]29
30enum EdgeType { Undetermined, TreeEdge, BackEdge }; //!< edge type in a graph after Depth-First-Search analysis.
31
32enum Shading { white, lightgray, darkgray, black }; //!< color in Breadth-First-Search analysis
33
[ead4e6]34
[cbc5fb]35
[db942e]36//enum CutCyclicBond { KeepBond, SaturateBond }; //!< Saturation scheme either atom- or bondwise
[14de469]37
38// Specifting whether a value in the parameter file must be specified or is optional
39enum necessity { optional, //!< parameter is optional, if not given sensible value is chosen
40 critical //!< parameter must be given or programme won't initiate
41 };
42
[7151c4]43// Specifying the status of the on command line given config file
44enum ConfigStatus { absent, empty, present };
45
[14de469]46// Specifying the cast type to be read of a parameter, see ParseForParameter()
47enum value_type { string_type, double_type, int_type, row_int, row_double, grid, lower_trigrid, upper_trigrid};
48
[c750cc]49// maximum length of any char array
50#define MAXSTRINGSIZE 255
51
[10f641]52// various standard filenames
[110ceb]53#define DEFAULTCONFIG "main_pcp_linux" //!< default filename of config file
54#define CONVEXENVELOPE "ConvexEnvelope.dat" //!< default filename of convex envelope tecplot data file
55#define KEYSETFILE "KeySets.dat" //!< default filename of BOSSANOVA key sets file
56#define ADJACENCYFILE "Adjacency.dat" //!< default filename of BOSSANOVA adjacancy file
57#define TEFACTORSFILE "TE-Factors.dat" //!< default filename of BOSSANOVA total energy factors file
58#define FORCESFILE "Forces-Factors.dat" //!< default filename of BOSSANOVA force factors file
[390248]59#define HCORRECTIONSUFFIX "Hcorrection.dat" //!< default filename of BOSSANOVA H correction file (unwanted saturation interaction)
60#define FITCONSTANTSUFFIX "FitConstant.dat" //!< suffix of default filename of BOSSANOVA fit constants file (unwanted saturation interaction)
[68cb0f]61#define SHIELDINGSUFFIX "sigma_all.csv" //!< default filename of BOSSANOVA shieldings file
62#define SHIELDINGPASSUFFIX "sigma_all_PAS.csv" //!< default filename of BOSSANOVA shieldings PAS file
[110ceb]63#define ORDERATSITEFILE "OrderAtSite.dat" //!< default filename of BOSSANOVA Bond Order at each atom file
64#define ENERGYPERFRAGMENT "EnergyPerFragment" //!< default filename of BOSSANOVA Energy contribution Per Fragment file
65#define FRAGMENTPREFIX "BondFragment" //!< default filename prefix of BOSSANOVA fragment config and directories
66#define STANDARDCONFIG "unknown.conf" //!< default filename of standard config file
67#define STANDARDELEMENTSDB "elements.db" //!< default filename of elements data base with masses, Z, VanDerWaals radii, ...
68#define STANDARDVALENCEDB "valence.db" //!< default filename of valence number per element database
69#define STANDARDORBITALDB "orbitals.db" //!< default filename of orbitals per element database
70#define STANDARDHBONDDISTANCEDB "Hbonddistance.db" //!< default filename of typial bond distance to hydrogen database
71#define STANDARDHBONDANGLEDB "Hbondangle.db" //!< default filename of typial bond angle to hydrogen database
72
73// some values
74#define SOLVENTDENSITY_A 0.6022142
75#define SOLVENTDENSITY_a0 0.089238936
76
[10f641]77
[db942e]78#define UPDATECOUNT 10 //!< update ten sites per BOSSANOVA interval
[14de469]79
[5b9bba]80#define STD_MENU_LENGTH 60
81#define STD_MENU_TITLE_SPACER '='
82#define STD_SEPERATOR_SPACER '-'
83
[14de469]84#endif /*DEFS_HPP_*/
Note: See TracBrowser for help on using the repository browser.