--- trunk/src/io/Globals.cpp	2005/11/11 15:22:11	726
+++ trunk/src/io/Globals.cpp	2005/11/16 23:10:02	749
@@ -52,21 +52,8 @@
 
 #include "io/ParamConstraint.hpp"
 
-#define DefineParameter(NAME,KEYWORD)                              \
-  NAME.setKeyword(KEYWORD);                  \
-  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
+using namespace oopse;
 
-#define DefineOptionalParameter(NAME,KEYWORD)                              \
-  NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
-  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
-
-#define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \
-  NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \
-  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
-
-#define CheckParameter(NAME, CONSTRAINT)                              \
-  if (!NAME.empty()) { if (!(CONSTRAINT)(NAME.getData())) { sprintf(painCave.errMsg,"Error in checking %s : should be %s\n",NAME.getKeyword().c_str(),(CONSTRAINT).getConstraintDescription().c_str()); painCave.isFatal = 1; painCave.severity = OOPSE_ERROR; simError();} }                 
-
 Globals::Globals(){
  
   DefineParameter(ForceField, "forceField")
@@ -143,6 +130,20 @@ Globals::Globals(){
   
 }
 
+Globals::~Globals(){
+  int i;
+  if( components != NULL ){
+    for( i=0; i< getNComponents(); i++ ) delete components[i];
+    delete[] components;
+  }
+  
+  if( zConstraints != NULL ){
+    for( i=0; i< getNZconstraints(); i++ ) delete zConstraints[i];
+    delete[] zConstraints;
+  }
+  
+}
+
 int Globals::globalAssign( event* the_event ){
   char errorMessage[65535]; 
   int key;