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

Comparing trunk/OOPSE/libmdtools/SimSetup.cpp (file contents):
Revision 682 by tim, Tue Aug 12 17:51:33 2003 UTC vs.
Revision 690 by mmeineke, Tue Aug 12 21:44:06 2003 UTC

# Line 5 | Line 5
5   #include <string>
6  
7   #include "SimSetup.hpp"
8 + #include "ReadWrite.hpp"
9   #include "parse_me.h"
10   #include "Integrator.hpp"
11   #include "simError.h"
# Line 96 | Line 97 | void SimSetup::createSim(void){
97    int i, j, k, globalAtomIndex;
98    
99    // gather all of the information from the Bass file
100 <  
100 >
101    gatherInfo();
102  
103    // creation of complex system objects
# Line 104 | Line 105 | void SimSetup::createSim(void){
105    sysObjectsCreation();
106  
107    // check on the post processing info
108 <  
108 >
109    finalInfoCheck();
110  
111    // initialize the system coordinates
# Line 888 | Line 889 | void SimSetup::initSystemCoords( void ){
889   void SimSetup::initSystemCoords( void ){
890    int i;
891    
892 <  std::cerr << "Setting atom Coords\n";
892 >  char* inName;
893  
894 +
895    (info[0].getConfiguration())->createArrays( info[0].n_atoms );
896    
897    for(i=0; i<info[0].n_atoms; i++) info[0].atoms[i]->setCoords();
# Line 900 | Line 902 | void SimSetup::initSystemCoords( void ){
902   #ifdef IS_MPI // is_mpi
903      if( worldRank == 0 ){
904   #endif //is_mpi
905 <      fileInit = new InitializeFromFile( globals->getInitialConfig() );
905 >      inName = globals->getInitialConfig();
906 >      fileInit = new InitializeFromFile( inName );
907   #ifdef IS_MPI
908      }else fileInit = new InitializeFromFile( NULL );
909   #endif
# Line 1033 | Line 1036 | void SimSetup::sysObjectsCreation( void ){
1036    int i,k;
1037    
1038    // create the forceField
1039 <  
1039 >
1040    createFF();
1041  
1042    // extract componentList
# Line 1051 | Line 1054 | void SimSetup::sysObjectsCreation( void ){
1054   #endif //is_mpi
1055    
1056    // create the atom and SRI arrays. Also initialize Molecule Stamp ID's
1057 <  
1057 >
1058    makeSysArrays();
1059  
1060    // make and initialize the molecules (all but atomic coordinates)
1061 <  
1061 >
1062    makeMolecules();
1063    
1064    for(k=0; k<nInfo; k++){

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines