ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/brains/SimInfo.hpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/brains/SimInfo.hpp (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 1617 by chuckv, Wed Oct 20 20:46:20 2004 UTC

# Line 5 | Line 5
5   #include <string>
6   #include <vector>
7  
8 < #include "Atom.hpp"
9 < #include "RigidBody.hpp"
10 < #include "Molecule.hpp"
11 < #include "Exclude.hpp"
12 < #include "SkipList.hpp"
13 < #include "AbstractClasses.hpp"
14 < #include "MakeStamps.hpp"
15 < #include "SimState.hpp"
16 < #include "Restraints.hpp"
8 > #include "primitives/Atom.hpp"
9 > #include "primitives/RigidBody.hpp"
10 > #include "primitives/Molecule.hpp"
11 > #include "brains/Exclude.hpp"
12 > #include "brains/SkipList.hpp"
13 > #include "primitives/AbstractClasses.hpp"
14 > #include "types/MakeStamps.hpp"
15 > #include "brains/SimState.hpp"
16 > #include "restraints/Restraints.hpp"
17  
18   #define __C
19 < #include "fSimulation.h"
20 < #include "fortranWrapDefines.hpp"
21 < #include "GenericData.hpp"
19 > #include "brains/fSimulation.h"
20 > #include "utils/GenericData.hpp"
21  
22  
23   //#include "Minimizer.hpp"
24 < //#include "OOPSEMinimizer.hpp"
24 > //#include "minimizers/OOPSEMinimizer.hpp"
25  
26  
27   double roundMe( double x );
# Line 152 | Line 151 | class SimInfo{ (public)
151  
152    // sets the internal function pointer to fortran.
153  
155  void setInternal( setFortranSim_TD fSetup,
156                    setFortranBox_TD fBox,
157                    notifyFortranCutOff_TD fCut){
158    setFsimulation = fSetup;
159    setFortranBoxSize = fBox;
160    notifyFortranCutOffs = fCut;
161  }
154  
155    int getNDF();
156    int getNDFraw();
# Line 213 | Line 205 | class SimInfo{ (public)
205    void calcBoxL();
206    double calcMaxCutOff();
207  
216  // private function to initialize the fortran side of the simulation
217  setFortranSim_TD setFsimulation;
218
219  setFortranBox_TD setFortranBoxSize;
208    
221  notifyFortranCutOff_TD notifyFortranCutOffs;
222  
209    //Addtional Properties of SimInfo
210    map<string, GenericData*> properties;
211    void getFortranGroupArrays(SimInfo* info,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines