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

Comparing trunk/OOPSE-1.0/libmdtools/InitializeFromFile.cpp (file contents):
Revision 1334 by gezelter, Fri Jul 16 18:58:03 2004 UTC vs.
Revision 1418 by gezelter, Tue Jul 27 16:13:29 2004 UTC

# Line 110 | Line 110 | void InitializeFromFile :: readInit( SimInfo* the_simn
110  
111    if( nTotObjs != simnfo->getTotIntegrableObjects() ){
112      sprintf( painCave.errMsg,
113 <             "Initialize from File error. %s n_atoms, %d, "
114 <             "does not match the BASS file's n_atoms, %d.\n",
113 >             "Initialize from File error. %s nIntegrable, %d, "
114 >             "does not match the meta-data file's nIntegrable, %d.\n",
115               c_in_name, nTotObjs, simnfo->getTotIntegrableObjects());
116      painCave.isFatal = 1;
117      simError();
# Line 191 | Line 191 | void InitializeFromFile :: readInit( SimInfo* the_simn
191  
192      nItems = atoi( read_buffer );
193  
194 <    // Check to see that the number of integrable objects  in the intial configuration file is the
195 <    // same as declared in simBass.
194 >    // Check to see that the number of integrable objects in the
195 >    // intial configuration file is the same as derived from the
196 >    // meta-data file.
197  
198      if( nTotObjs != nItems){
199        sprintf( painCave.errMsg,
200 <               "Initialize from File error. %s n_atoms, %d, "
201 <               "does not match the BASS file's n_atoms, %d.\n",
200 >               "Initialize from File error. %s nIntegrable, %d, "
201 >               "does not match the meta-data file's nIntegrable, %d.\n",
202                 c_in_name, nTotObjs, simnfo->getTotIntegrableObjects());
203        haveError= 1;
204        simError();
# Line 371 | Line 372 | char* InitializeFromFile::parseDumpLine(char* readLine
372    if( strcmp( foo, sd->getType() ) ){
373      sprintf( painCave.errMsg,
374               "Initialize from file error.  Does not"
375 <             " match the BASS atom %s.\n",
375 >             " match the meta-data atom %s.\n",
376               sd->getType() );
377      return strdup( painCave.errMsg );
378    }

Diff Legend

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