Changeset db3ea3 for molecuilder/src/parser.hpp

Timestamp:

Jul 24, 2008, 2:00:19 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

747b10

Parents:

b3eb8e

Message:

BIG change: Hcorrection included and bugfix of analyzer (wrt forces)

• Hcorrection is supplied via molecuilder which gives correction values if hydrogen atoms are to close and thus already feel each other's influence. This correction energy matrix is also parsed ans subtracted from the approximated energy matrix generated from the fragments. This impacts both on joiner, analyzer and molecuilder
• Forces were not working which had multiple causes:
  • first, we stepped back down to absolute errors which rather gives a feel about convergence (1e-6 is simply small and neglegible)
  • there may have been bugs where (either in Force or in ForceFragments) adding up took place, this is cleaned up
  • more routines have been abstracted from analyzer into datacreator functions
    • the order of ions had changed, re-run with current molecuilder, calculation and subsequent joining/analyzing brought correct results finally
• plots were bad still due to wrong axes (two more functions finding max/min values), use of wrong columns in plot file

File:

• molecuilder/src/parser.hpp (modified) (5 diffs)

molecuilder/src/parser.hpp

@@ -19 +19 @@
 
 #define EnergySuffix ".energy.all"
+#define HcorrectionSuffix ".Hcorrection.all"
 #define ForcesSuffix ".forces.all"
 #define ShieldingSuffix ".sigma_all.csv"
@@ -26 +27 @@
 #define TimeSuffix ".speed"
 #define EnergyFragmentSuffix ".energyfragment.all"
+#define HcorrectionFragmentSuffix ".Hcorrectionfragment.all"
 #define ForceFragmentSuffix ".forcefragment.all"
 #define OrderSuffix ".Order"
@@ -52 +54 @@
   bool AllocateMatrix(char *GivenHeader, int MCounter, int *RCounter, int CCounter);
   bool ResetMatrix();
+  double FindMinValue();
+  double FindMaxValue();
   bool SetLastMatrix(double value, int skipcolumns);
   bool SetLastMatrix(double **values, int skipcolumns);
@@ -66 +70 @@
   public:
     bool ParseIndices();
-    bool SumSubEnergy(class EnergyMatrix &Fragments, class KeySetsContainer &KeySet, int Order);
+    bool SumSubEnergy(class EnergyMatrix &Fragments, class EnergyMatrix *CorrectionFragments, class KeySetsContainer &KeySet, int Order, double sign);
 };
 
@@ -74 +78 @@
   public: 
     bool ParseIndices(char *name);
-    bool SumSubForces(class ForceMatrix &Fragments, class KeySetsContainer &KeySet, int Order);
+    bool SumSubForces(class ForceMatrix &Fragments, class KeySetsContainer &KeySet, int Order, double sign);
 };