--- trunk/OOPSE-1.0/libmdtools/SimSetup.cpp	2004/07/27 15:41:17	1417
+++ trunk/OOPSE-1.0/libmdtools/SimSetup.cpp	2004/07/27 16:13:29	1418
@@ -122,7 +122,7 @@ void SimSetup::createSim(void){
 
 void SimSetup::createSim(void){
 
-  // gather all of the information from the Bass file
+  // gather all of the information from the meta-data file
 
   gatherInfo();
 
@@ -646,7 +646,7 @@ void SimSetup::makeMolecules(void){
 
 }
 
-void SimSetup::initFromBass(void){
+void SimSetup::initFromMetaDataFile(void){
   int i, j, k;
   int n_cells;
   double cellx, celly, cellz;
@@ -769,7 +769,7 @@ void SimSetup::makeElement(double x, double y, double 
     current_atom = comp_stamps[current_comp]->getAtom(k);
     if (!current_atom->havePosition()){
       sprintf(painCave.errMsg,
-              "SimSetup:initFromBass error.\n"
+              "SimSetup:initFromMetaData error.\n"
               "\tComponent %s, atom %s does not have a position specified.\n"
               "\tThe initialization routine is unable to give a start"
               " position.\n",
@@ -1003,7 +1003,7 @@ void SimSetup::gatherInfo(void){
                   "\tKeyword useSolidThermInt was set to 'true' but\n"
                   "\tthermodynamicIntegrationLambda (and/or\n"
                   "\tthermodynamicIntegrationK) was not specified.\n"
-                  "\tPlease provide a lambda value and k value in your .md file.\n");
+                  "\tPlease provide a lambda value and k value in your meta-data file.\n");
           painCave.isFatal = 1;
           simError();    
         }
@@ -1012,12 +1012,12 @@ void SimSetup::gatherInfo(void){
         if (globals->getUseSolidThermInt()) {
           sprintf( painCave.errMsg,
                    "SimSetup Warning: It appears that you have both solid and\n"
-                   "\tliquid thermodynamic integration activated in your .md\n"
+                   "\tliquid thermodynamic integration activated in your meta-data\n"
                    "\tfile. To avoid confusion, specify only one technique in\n"
-                   "\tyour .md file. Liquid-state thermodynamic integration\n"
+                   "\tyour meta-data file. Liquid-state thermodynamic integration\n"
                    "\twill be assumed for the current simulation. If this is not\n"
                    "\twhat you desire, set useSolidThermInt to 'true' and\n"
-                   "\tuseLiquidThermInt to 'false' in your .md file.\n");
+                   "\tuseLiquidThermInt to 'false' in your meta-data file.\n");
           painCave.isFatal = 0;
           simError();
         }
@@ -1032,7 +1032,7 @@ void SimSetup::gatherInfo(void){
                   "\tKeyword useLiquidThermInt was set to 'true' but\n"
                   "\tthermodynamicIntegrationLambda (and/or\n"
                   "\tthermodynamicIntegrationK) was not specified.\n"
-                  "\tPlease provide a lambda value and k value in your .md file.\n");
+                  "\tPlease provide a lambda value and k value in your meta-data file.\n");
           painCave.isFatal = 1;
           simError();    
         }
@@ -1041,7 +1041,7 @@ void SimSetup::gatherInfo(void){
         sprintf(painCave.errMsg,
                 "SimSetup Warning: If you want to use Thermodynamic\n"
                 "\tIntegration, set useSolidThermInt or useLiquidThermInt to\n"
-                "\t'true' in your .md file.  These keywords are set to\n"
+                "\t'true' in your meta-data file.  These keywords are set to\n"
                 "\t'false' by default, so your lambda and/or k values are\n"
                 "\tbeing ignored.\n");
         painCave.isFatal = 0;
@@ -1136,7 +1136,7 @@ void SimSetup::gatherInfo(void){
   }
   
 #ifdef IS_MPI
-  strcpy(checkPointMsg, "Successfully gathered all information from Bass\n");
+  strcpy(checkPointMsg, "Successfully gathered all information from meta-data file\n");
   MPIcheckPoint();
 #endif // is_mpi
 }
@@ -1765,7 +1765,7 @@ void SimSetup::makeIntegrator(void){
         else{
           sprintf(painCave.errMsg,
                   "SimSetup error: If you use a constant pressure\n"
-                  "\tensemble, you must set targetPressure in the BASS file.\n");
+                  "\tensemble, you must set targetPressure in the meta-data file.\n");
           painCave.isFatal = 1;
           simError();
         }
@@ -1816,7 +1816,7 @@ void SimSetup::makeIntegrator(void){
         else{
           sprintf(painCave.errMsg,
                   "SimSetup error: If you use a constant pressure\n"
-                  "\tensemble, you must set targetPressure in the BASS file.\n");
+                  "\tensemble, you must set targetPressure in the meta-data file.\n");
           painCave.isFatal = 1;
           simError();
         }    
@@ -1869,7 +1869,7 @@ void SimSetup::makeIntegrator(void){
         else{
           sprintf(painCave.errMsg,
                   "SimSetup error: If you use a constant pressure\n"
-                  "\tensemble, you must set targetPressure in the BASS file.\n");
+                  "\tensemble, you must set targetPressure in the meta-data file.\n");
           painCave.isFatal = 1;
           simError();
         }