Changeset cd4ccc for src


Ignore:
Timestamp:
Aug 3, 2009, 3:09:12 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Branches:
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
Children:
edb93c
Parents:
a80fbdf
Message:

definitions for class element and verbose moved to their own header files and reducing contents of helpers.hpp

Location:
src
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.am

    ra80fbdf rcd4ccc  
    11SOURCE = 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
    2 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
     2HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp helpers.hpp linkedcell.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
    33
    44bin_PROGRAMS = molecuilder joiner analyzer
  • src/atom.hpp

    ra80fbdf rcd4ccc  
    1111using namespace std;
    1212
    13 #include "periodentafel.hpp"
     13// include config.h
     14#ifdef HAVE_CONFIG_H
     15#include <config.h>
     16#endif
     17
     18
     19#include <iostream>
     20
     21#include "element.hpp"
    1422#include "tesselation.hpp"
    1523#include "vector.hpp"
  • src/bond.hpp

    ra80fbdf rcd4ccc  
    1010
    1111using namespace std;
     12
     13// include config.h
     14#ifdef HAVE_CONFIG_H
     15#include <config.h>
     16#endif
     17
    1218
    1319#include "atom.hpp"
  • src/config.hpp

    ra80fbdf rcd4ccc  
    1010
    1111using namespace std;
     12
     13// include config.h
     14#ifdef HAVE_CONFIG_H
     15#include <config.h>
     16#endif
     17
    1218
    1319#include "molecules.hpp"
  • src/element.cpp

    ra80fbdf rcd4ccc  
    55 */
    66
    7 #include "periodentafel.hpp"
     7#include <iomanip>
     8#include <fstream>
     9
     10#include "element.hpp"
    811
    912/************************************* Functions for class element **********************************/
  • src/helpers.hpp

    ra80fbdf rcd4ccc  
    88
    99using namespace std;
     10
     11// include config.h
     12#ifdef HAVE_CONFIG_H
     13#include <config.h>
     14#endif
    1015
    1116#include <iostream>
     
    2126
    2227#include "defs.hpp"
    23 
    24 // include config.h
    25 #ifdef HAVE_CONFIG_H
    26 #include <config.h>
    27 #endif
     28#include "verbose.hpp"
    2829
    2930/********************************************** helpful functions *********************************/
     
    275276};
    276277
    277 /************************************* Class Verbose & Binary *******************************/
    278 
    279 /** Verbose is an IO manipulator, that writes tabs according to \a Verbosity level.
    280  */
    281 class Verbose
    282 {
    283   public:
    284     Verbose(int value) : Verbosity(value) { }
    285 
    286     ostream& print (ostream &ost) const;
    287   private:
    288     int Verbosity;
    289 };
    290 
    291 ostream& operator<<(ostream& ost,const Verbose& m);
    292 
    293 /** Binary is an IO manipulator, that writes 0 and 1 according to number \a Binary.
    294  */
    295 class Binary
    296 {
    297   public:
    298     Binary(int value) : BinaryNumber(value) { }
    299 
    300     ostream& print (ostream &ost) const;
    301   private:
    302     int BinaryNumber;
    303 };
    304 
    305 ostream& operator<<(ostream& ost,const Binary& m);
    306 
    307 
    308278
    309279#endif /*HELPERS_HPP_*/
  • src/molecules.hpp

    ra80fbdf rcd4ccc  
    2727#include "atom.hpp"
    2828#include "bond.hpp"
     29#include "element.hpp"
    2930#include "helpers.hpp"
    3031#include "linkedcell.hpp"
     
    3839class MoleculeLeafClass;
    3940class MoleculeListClass;
    40 class Verbose;
    4141
    4242/******************************** Some definitions for easier reading **********************************/
  • src/periodentafel.cpp

    ra80fbdf rcd4ccc  
    77using namespace std;
    88
     9#include <iomanip>
     10#include <fstream>
     11
     12#include "helpers.hpp"
    913#include "periodentafel.hpp"
     14#include "verbose.hpp"
    1015
    1116/************************************* Functions for class periodentafel ***************************/
  • src/periodentafel.hpp

    ra80fbdf rcd4ccc  
    33
    44using namespace std;
    5 
    6 #include "defs.hpp"
    7 #include "helpers.hpp"
    85
    96// include config.h
     
    129#endif
    1310
     11#include <iostream>
     12
     13#include "defs.hpp"
     14#include "element.hpp"
     15
    1416// ====================================== class definitions =========================
    1517
    16 class element;
    17 class periodentafel;
    18 
    19 /** Chemical element.
    20  * Class incorporates data for a certain chemical element to be referenced from atom class.
    21  */
    22 class element {
    23   public:
    24     double mass;    //!< mass in g/mol
    25     double CovalentRadius;  //!< covalent radius
    26     double VanDerWaalsRadius;  //!< can-der-Waals radius
    27     int Z;          //!< atomic number
    28     char name[64];  //!< atom name, i.e. "Hydrogren"
    29     char symbol[3]; //!< short form of the atom, i.e. "H"
    30     char period[8];    //!< period: n quantum number
    31     char group[8];    //!< group: l quantum number
    32     char block[8];    //!< block: l quantum number
    33     element *previous;  //!< previous item in list
    34     element *next;  //!< next element in list
    35     int *sort;      //!< sorc criteria
    36     int No;         //!< number of element set on periodentafel::Output()
    37     double Valence;   //!< number of valence electrons for this element
    38     int NoValenceOrbitals;  //!< number of valence orbitals, used for determining bond degree in molecule::CreateConnectmatrix()
    39     double HBondDistance[NDIM]; //!< distance in Angstrom of this element to hydrogen  (for single, double and triple bonds)
    40     double HBondAngle[NDIM];     //!< typical angle for one, two, three bonded hydrogen (in degrees)
    41 
    42   element();
    43   ~element();
    44 
    45   //> print element entries to screen
    46   bool Output(ofstream *out) const;
    47   bool Checkout(ofstream *out, const int No, const int NoOfAtoms) const;
    48 
    49   private:
    50 };
    5118
    5219/** Periodentafel is a list of all elements sorted by their atomic number.
  • src/stackclass.hpp

    ra80fbdf rcd4ccc  
    11#ifndef STACKCLASS_HPP_
    22#define STACKCLASS_HPP_
     3
     4#include "verbose.hpp"
    35
    46template <typename T> class StackClass;
Note: See TracChangeset for help on using the changeset viewer.