ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.cpp
(Generate patch)

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 726 by chrisfen, Fri Nov 11 15:22:11 2005 UTC vs.
Revision 749 by tim, Wed Nov 16 23:10:02 2005 UTC

# Line 52 | Line 52
52  
53   #include "io/ParamConstraint.hpp"
54  
55 < #define DefineParameter(NAME,KEYWORD)                              \
56 <  NAME.setKeyword(KEYWORD);                  \
57 <  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
55 > using namespace oopse;
56  
59 #define DefineOptionalParameter(NAME,KEYWORD)                              \
60  NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
61  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
62
63 #define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \
64  NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \
65  parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
66
67 #define CheckParameter(NAME, CONSTRAINT)                              \
68  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();} }                
69
57   Globals::Globals(){
58  
59    DefineParameter(ForceField, "forceField")
# Line 143 | Line 130 | Globals::Globals(){
130    
131   }
132  
133 + Globals::~Globals(){
134 +  int i;
135 +  if( components != NULL ){
136 +    for( i=0; i< getNComponents(); i++ ) delete components[i];
137 +    delete[] components;
138 +  }
139 +  
140 +  if( zConstraints != NULL ){
141 +    for( i=0; i< getNZconstraints(); i++ ) delete zConstraints[i];
142 +    delete[] zConstraints;
143 +  }
144 +  
145 + }
146 +
147   int Globals::globalAssign( event* the_event ){
148    char errorMessage[65535];
149    int key;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines