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

Comparing trunk/OOPSE-1.0/libBASS/Globals.cpp (file contents):
Revision 1402 by gezelter, Fri Jul 23 19:58:37 2004 UTC vs.
Revision 1415 by gezelter, Mon Jul 26 17:50:57 2004 UTC

# Line 1734 | Line 1734 | char* Globals::checkMe( void ){
1734    char err[300];
1735    short int have_err = 0;
1736  
1737 <  strcpy( err, "Global error. The following are required:\n" );
1737 >  strcpy( err, "The following required keywords are missing:\n" );
1738    
1739    if( !have_force_field ){
1740 <    strcat( err, "\t->forceField\n" );
1740 >    strcat( err, "\t\t->forceField\n" );
1741      have_err= 1;
1742    }
1743  
1744    if( !have_n_components ){
1745 <    strcat( err, "\t->nComponents\n" );
1745 >    strcat( err, "\t\t->nComponents\n" );
1746      have_err= 1;
1747    }
1748  
1749  if( !have_target_temp ){
1750    strcat( err, "\t->targetTemp\n" );
1751    have_err= 1;
1752  }
1749    
1750 <  if(!have_minimizer)
1751 <    if( !have_ensemble ){
1752 <      strcat( err, "\t->ensemble\n" );
1753 <      have_err= 1;
1754 <    }
1755 <  
1756 <  if( !have_dt ){
1757 <    strcat( err, "\t->dt\n" );
1758 <    have_err= 1;
1750 >  if ( !have_ensemble ) {
1751 >    // I'm not doing MD:
1752 >    if ( !have_minimizer ) {
1753 >      // I'm not doing MD or minimization:
1754 >      strcat( err, "\t\t->either ensemble or minimizer must be set!\n" );
1755 >      have_err = 1;      
1756 >    } else {
1757 >      // I'm a minimizer:
1758 >    }
1759 >  } else {
1760 >    // I *am* doing MD:
1761 >    if( !have_dt ){
1762 >      strcat( err, "\t\t->dt (timestep in fs)\n" );
1763 >      have_err= 1;
1764 >    }
1765 >    if( !have_run_time ){
1766 >      strcat( err, "\t\t->runTime (total run time in fs)\n" );
1767 >      have_err= 1;
1768 >    }    
1769    }
1770 <  
1765 <  if( !have_run_time ){
1766 <    strcat( err, "\t->runTime\n" );
1767 <    have_err= 1;
1768 <  }
1769 <  
1770 >      
1771    if( have_err ) return strdup( err );
1772    
1773    return NULL;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines