ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/SimSetup.hpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/SimSetup.hpp (file contents):
Revision 616 by mmeineke, Tue Jul 15 18:52:16 2003 UTC vs.
Revision 1214 by gezelter, Tue Jun 1 18:42:58 2004 UTC

# Line 6 | Line 6
6   #include "ForceFields.hpp"
7   #include "SimInfo.hpp"
8   #include "ReadWrite.hpp"
9 + #include "AllIntegrator.hpp"
10  
11   // this routine is defined in BASS_interface.cpp
12   extern void set_interface_stamps( MakeStamps* ms, Globals* g );
# Line 17 | Line 18 | class SimSetup{ (public)
18    ~SimSetup();
19  
20    void setSimInfo( SimInfo* the_info ) { info = the_info; }
21 +  void setSimInfo( SimInfo* the_info, int theNinfo );
22 +  void suspendInit( void ) { initSuspend = true; }  
23    void parseFile( char* fileName );
24    void createSim( void );
25  
# Line 34 | Line 37 | class SimSetup{ (public)
37    void makeOutNames(void);
38    void makeIntegrator(void);
39    void initFortran(void);
40 +  void makeMinimizer(void);
41  
42    void createFF( void );
43    void compList( void );
# Line 55 | Line 59 | class SimSetup{ (public)
59    int ensembleCase;
60    int ffCase;
61  
58 –
62    MakeStamps* stamps;
63    Globals* globals;
64    char* inFileName;
65  
66    SimInfo* info;
67 +  int isInfoArray;
68 +  int nInfo;
69 +  
70 +  bool initSuspend;
71  
72    int n_components;
73 <  int globalAtomIndex;
73 >  int globalAtomCounter;
74 >  int globalMolCounter;
75  
76    char force_field[100];
77    char ensemble[100];
# Line 73 | Line 81 | class SimSetup{ (public)
81    MoleculeStamp** comp_stamps; //the stamps matching the components
82    int tot_nmol;
83    int tot_atoms;
84 +  int tot_groups;
85 +  int tot_rigid;
86    int tot_bonds;
87    int tot_bends;
88    int tot_torsions;
89    int tot_SRI;
90  
81 –  Atom** the_atoms;
82 –  SRI** the_sris;
83 –  Exclude** the_excludes;
84 –  Molecule* the_molecules;
91    ForceFields* the_ff;
92  
93    // needed by makeElement
# Line 91 | Line 97 | class SimSetup{ (public)
97    int current_comp;
98    int current_atom_ndx;
99  
100 < #ifdef IS_MPI
101 <  int* globalIndex;
102 < #endif //is_mpi
100 >  vector<int> globalAtomIndex;
101 >  vector<int> globalGroupIndex;
102 >  void setupZConstraint(SimInfo& theInfo);  //setup parameters for zconstraint method
103  
104   };
105   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines