Changeset e78824 for molecuilder/src

Timestamp:

Aug 3, 2009, 2:58:43 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

4dca8e

Parents:

834ff3

Message:

class config definitions moved to their own header file.

NOTE: Tesselation of heptan was working correctly! (The config file just grew bigger and bigger that's why more and more triangles were added)

Location:

molecuilder/src

Files:

• Makefile.am (modified) (1 diff)
• boundary.hpp (modified) (1 diff)
• config.cpp (modified) (1 diff)
• config.hpp (added)
• moleculelist.cpp (modified) (1 diff)
• molecules.cpp (modified) (1 diff)
• molecules.hpp (modified) (2 diffs)

molecuilder/src/Makefile.am

@@ -1 +1 @@
 SOURCE = atom.cpp bond.cpp boundary.cpp builder.cpp config.cpp element.cpp ellipsoid.cpp helpers.cpp linkedcell.cpp moleculelist.cpp molecules.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
-HEADER = atom.hpp bond.hpp boundary.hpp defs.hpp ellipsoid.hpp helpers.hpp linkedcell.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp
+HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp ellipsoid.hpp helpers.hpp linkedcell.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp
 
 bin_PROGRAMS = molecuilder joiner analyzer

molecuilder/src/boundary.hpp

@@ -12 +12 @@
 #include <deque>
 
+#include "config.hpp"
 #include "linkedcell.hpp"
 #include "molecules.hpp"

molecuilder/src/config.cpp

@@ -5 +5 @@
  */
 
-#include "molecules.hpp"
+#include "config.hpp"
 
 /******************************** Functions for class ConfigFileBuffer **********************/

molecuilder/src/moleculelist.cpp

@@ -5 +5 @@
  */
 
+#include "config.hpp"
 #include "molecules.hpp"
 

molecuilder/src/molecules.cpp

@@ -5 +5 @@
  */
 
+#include "config.hpp"
 #include "molecules.hpp"
 

molecuilder/src/molecules.hpp

@@ -35 +35 @@
 #include "vector.hpp"
 
-class config;
 class molecule;
 class MoleculeLeafClass;
@@ -344 +343 @@
 
 
-/** The config file.
- * The class contains all parameters that control a dft run also functions to load and save.
- */
-class config {
-  public:
-    int PsiType;
-    int MaxPsiDouble;
-    int PsiMaxNoUp;
-    int PsiMaxNoDown;
-    int MaxMinStopStep;
-    int InitMaxMinStopStep;
-    int ProcPEGamma;
-    int ProcPEPsi;
-    char *configpath;
-    char *configname;
-    bool FastParsing;
-    double Deltat;
-    string basis;
-
-    char *databasepath;
-
-    int DoConstrainedMD;
-    int MaxOuterStep;
-    int Thermostat;
-    int *ThermostatImplemented;
-    char **ThermostatNames;
-    double TempFrequency;
-    double alpha;
-    double HooverMass;
-    double TargetTemp;
-    int ScaleTempStep;
-    
-  private:
-    char *mainname;
-    char *defaultpath;
-    char *pseudopotpath;
-
-    int DoOutVis;
-    int DoOutMes;
-    int DoOutNICS;
-    int DoOutOrbitals;
-    int DoOutCurrent;
-    int DoFullCurrent;
-    int DoPerturbation;
-    int DoWannier;
-    int CommonWannier;
-    double SawtoothStart;
-    int VectorPlane;
-    double VectorCut;
-    int UseAddGramSch;
-    int Seed;
-
-    int OutVisStep;
-    int OutSrcStep;
-    int MaxPsiStep;
-    double EpsWannier;
-
-    int MaxMinStep;
-    double RelEpsTotalEnergy;
-    double RelEpsKineticEnergy;
-    int MaxMinGapStopStep;
-    int MaxInitMinStep;
-    double InitRelEpsTotalEnergy;
-    double InitRelEpsKineticEnergy;
-    int InitMaxMinGapStopStep;
-
-    //double BoxLength[NDIM*NDIM];
-
-    double ECut;
-    int MaxLevel;
-    int RiemannTensor;
-    int LevRFactor;
-    int RiemannLevel;
-    int Lev0Factor;
-    int RTActualUse;
-    int AddPsis;
-
-    double RCut;
-    int StructOpt;
-    int IsAngstroem;
-    int RelativeCoord;
-    int MaxTypes;
-
-
-  int ParseForParameter(int verbose, ifstream *file, const char *name, int sequential, int const xth, int const yth, int type, void *value, int repetition, int critical);
-  int ParseForParameter(int verbose, struct ConfigFileBuffer *FileBuffer, const char *name, int sequential, int const xth, int const yth, int type, void *value, int repetition, int critical);
-
-  public:
-  config();
-  ~config();
-
-  int TestSyntax(char *filename, periodentafel *periode, molecule *mol);
-  void Load(char *filename, periodentafel *periode, molecule *mol);
-  void LoadOld(char *filename, periodentafel *periode, molecule *mol);
-  void RetrieveConfigPathAndName(string filename);
-  bool Save(const char *filename, periodentafel *periode, molecule *mol) const;
-  bool SaveMPQC(const char *filename, molecule *mol) const;
-  void Edit();
-  bool GetIsAngstroem() const;
-  char *GetDefaultPath() const;
-  void SetDefaultPath(const char *path);
-  void InitThermostats(class ConfigFileBuffer *fb);
-};
-
 #endif /*MOLECULES_HPP_*/