--- branches/new-templateless/OOPSE/libmdtools/InitializeFromFile.cpp	2003/10/31 21:06:47	849
+++ branches/new-templateless/OOPSE/libmdtools/InitializeFromFile.cpp	2003/11/03 22:07:17	850
@@ -583,6 +583,8 @@ char* InitializeFromFile::parseCommentLine(char* readL
   entry_plug->setBoxM( theBoxMat3 );
 
   //get chi and integralOfChidt, they should appear by pair
+
+  GenericData* myProps = entry_plug->getProperties();
   foo = strtok(NULL, " ,;\t\n");
   if(foo != NULL){
     chi = atof(foo);
@@ -597,20 +599,13 @@ char* InitializeFromFile::parseCommentLine(char* readL
 
     //push chi and integralOfChidt into SimInfo::properties which can be
     //retrieved by integrator later
-    DoubleData* chiValue = new DoubleData();
-    chiValue->setID(CHIVALUE_ID);
-    chiValue->setData(chi);
-    entry_plug->addProperty(chiValue);
-
-    DoubleData* integralOfChidtValue = new DoubleData();
-    integralOfChidtValue->setID(INTEGRALOFCHIDT_ID);
-    integralOfChidtValue->setData(integralOfChidt);
-    entry_plug->addProperty(integralOfChidtValue);
-
+    
+    myProps->add( CHIVALUE_ID, chi );
+    myProps->add( INTEGRALOFCHIDT_ID, integralOfChidt );
   }
   else
     return NULL;
-
+  
   //get eta
   for(int i = 0 ; i < 9; i++){
     foo = strtok(NULL, " ,;\t");
@@ -621,16 +616,12 @@ char* InitializeFromFile::parseCommentLine(char* readL
     }
     eta[i] = atof( foo );
   }
-
+  
   //push eta into SimInfo::properties which can be
   //retrieved by integrator later
-  //entry_plug->setBoxM( theBoxMat3 );
-  DoubleArrayData* etaValue = new DoubleArrayData();
-  etaValue->setID(ETAVALUE_ID);
-  etaValue->setData(eta, 9);
-  entry_plug->addProperty(etaValue);
+  
+  myProps->add( ETAVALUE_ID, eta, 9);
 
-
   return NULL;
 }
 
@@ -644,7 +635,7 @@ void initFile::nodeZeroError( void ){
   myStatus = 0;
   for (j = 0; j < mpiSim->getNumberProcessors(); j++) {
     MPI_Send( &myStatus, 1, MPI_INT, j,
-	      TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
+	      TAKE_THIS_TAG_INT, MPI_COMM_WORLD;
   }