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 20bb3b was 94db13, checked in by Frederik Heber <heber@…>, 9 years ago |
Again changes to obtain correct longrange forces, also forces are optional.
- renamed particle_forces -> forces to make it consistent with MPQCData_Fused.
- MPQCData_Fused and VMGData_Fused are structs and no longer namespace as the
latter cannot serve as template arguments.
- split off forces in VMGData into VMGDataForceMap_t and VMGDataForceVector_t.
- changed ConvertMPQCDataToForceMap() into template function
ConvertDataToForceMap(), working also on VMGDataForceMap_t.
- this required changes in FragmentationShortRangeResults.
- FragmentationLongRangeResults now also converts the longrange forces
correctly.
- AnalyseFragmentResults now prints also a ..VMGForces.dat file.
- VMGData's forces are now optional to some degree and analysis chain can deal
with it.
- introducing forces we must still maintain working code when results without
forces are calculated (e.g. as in the regression tests). Hence, a boolean
im VMGData and FragmentationLongRangeResults states whether forces have been
found or not and whether these should be summed up or not subsequently.
|
-
Property mode
set to
100644
|
File size:
1.7 KB
|
Rev | Line | |
---|
[2bc560] | 1 | /*
|
---|
| 2 | * VMGData.hpp
|
---|
| 3 | *
|
---|
| 4 | * Created on: Aug 6, 2012
|
---|
| 5 | * Author: heber
|
---|
| 6 | */
|
---|
| 7 |
|
---|
| 8 | #ifndef VMGDATA_HPP_
|
---|
| 9 | #define VMGDATA_HPP_
|
---|
| 10 |
|
---|
| 11 |
|
---|
| 12 | // include config.h
|
---|
| 13 | #ifdef HAVE_CONFIG_H
|
---|
| 14 | #include <config.h>
|
---|
| 15 | #endif
|
---|
| 16 |
|
---|
| 17 |
|
---|
| 18 | #include <boost/serialization/access.hpp>
|
---|
| 19 | #include <boost/serialization/vector.hpp>
|
---|
| 20 |
|
---|
| 21 | #include <iosfwd>
|
---|
| 22 | #include <vector>
|
---|
| 23 |
|
---|
[d200ae] | 24 | #include "Fragmentation/Summation/SetValues/FragmentForces.hpp"
|
---|
[fbf143] | 25 | #include "Fragmentation/Summation/SetValues/SamplingGrid.hpp"
|
---|
[2bc560] | 26 |
|
---|
| 27 | /** This struct contains all returned data from an VMGJob
|
---|
| 28 | *
|
---|
| 29 | */
|
---|
| 30 | struct VMGData
|
---|
| 31 | {
|
---|
| 32 | /** Constructor for class VMGData.
|
---|
| 33 | *
|
---|
| 34 | * \param _props properties of sampled potential
|
---|
| 35 | */
|
---|
| 36 | VMGData(const SamplingGridProperties &_props);
|
---|
| 37 |
|
---|
| 38 | /** Default constructor for class VMGData.
|
---|
| 39 | *
|
---|
| 40 | */
|
---|
| 41 | VMGData();
|
---|
| 42 |
|
---|
| 43 | //!> sampled potential on the grid as output
|
---|
| 44 | SamplingGrid sampled_potential;
|
---|
[e355b31] | 45 | //!> sampled potential on the grid as output
|
---|
| 46 | SamplingGrid both_sampled_potential;
|
---|
[e2925fd] | 47 | //!> nuclei long-range contribution to energy
|
---|
| 48 | double nuclei_long;
|
---|
| 49 | //!> electron long-range contribution to energy
|
---|
| 50 | double electron_long;
|
---|
[d200ae] | 51 | //!> force vectors of all nuclei
|
---|
[94db13] | 52 | FragmentForces forces;
|
---|
| 53 |
|
---|
| 54 | //!> internal value to check when we should sum forces and when not
|
---|
| 55 | bool hasForces;
|
---|
[2bc560] | 56 |
|
---|
| 57 | private:
|
---|
| 58 | friend class boost::serialization::access;
|
---|
| 59 | // serialization
|
---|
| 60 | template <typename Archive>
|
---|
| 61 | void serialize(Archive& ar, const unsigned int version)
|
---|
| 62 | {
|
---|
| 63 | ar & sampled_potential;
|
---|
[e355b31] | 64 | if (version > 1)
|
---|
| 65 | ar & both_sampled_potential;
|
---|
[e2925fd] | 66 | if (version > 0)
|
---|
| 67 | ar & nuclei_long;
|
---|
| 68 | ar & electron_long;
|
---|
[94db13] | 69 | if (version > 2) {
|
---|
| 70 | ar & forces;
|
---|
| 71 | hasForces = true;
|
---|
| 72 | } else
|
---|
| 73 | hasForces = false;
|
---|
[2bc560] | 74 | }
|
---|
| 75 | };
|
---|
| 76 |
|
---|
[d200ae] | 77 | BOOST_CLASS_VERSION(VMGData, 3)
|
---|
[e2925fd] | 78 |
|
---|
[2bc560] | 79 | std::ostream & operator<<(std::ostream &ost, const VMGData &data);
|
---|
| 80 |
|
---|
| 81 |
|
---|
| 82 | #endif /* VMGDATA_HPP_ */
|
---|
Note:
See
TracBrowser
for help on using the repository browser.