52 |
|
} |
53 |
|
~LinkedAtomType(){ if( next != NULL ) delete next; } |
54 |
|
|
55 |
< |
LinkedAtomType* find(char* key){ |
55 |
> |
LinkedAtomType* find(const char* key){ |
56 |
|
if( !strcmp(name, key) ) return this; |
57 |
|
if( next != NULL ) return next->find(key); |
58 |
|
return NULL; |
118 |
|
//**************************************************************** |
119 |
|
|
120 |
|
|
121 |
< |
LJFF::LJFF(){ |
121 |
> |
LJFF::LJFF() : ForceFields() { |
122 |
|
|
123 |
< |
char fileName[200]; |
124 |
< |
char* ffPath_env = "FORCE_PARAM_PATH"; |
125 |
< |
char* ffPath; |
126 |
< |
char temp[200]; |
127 |
< |
|
123 |
> |
string fileName; |
124 |
> |
string tempString; |
125 |
> |
|
126 |
|
headAtomType = NULL; |
127 |
|
currentAtomType = NULL; |
128 |
|
|
158 |
|
if( worldRank == 0 ){ |
159 |
|
#endif |
160 |
|
|
161 |
< |
// generate the force file name |
162 |
< |
|
163 |
< |
strcpy( fileName, "LJFF.frc" ); |
161 |
> |
// generate the force file name |
162 |
> |
|
163 |
> |
fileName = "LJFF.frc"; |
164 |
|
// fprintf( stderr,"Trying to open %s\n", fileName ); |
165 |
|
|
166 |
|
// attempt to open the file in the current directory first. |
167 |
|
|
168 |
< |
frcFile = fopen( fileName, "r" ); |
168 |
> |
frcFile = fopen( fileName.c_str(), "r" ); |
169 |
|
|
170 |
|
if( frcFile == NULL ){ |
171 |
|
|
172 |
|
// next see if the force path enviorment variable is set |
173 |
+ |
|
174 |
+ |
tempString = ffPath + "/" + fileName; |
175 |
+ |
fileName = tempString; |
176 |
|
|
177 |
< |
ffPath = getenv( ffPath_env ); |
177 |
< |
if( ffPath == NULL ) { |
178 |
< |
STR_DEFINE(ffPath, FRC_PATH ); |
179 |
< |
} |
180 |
< |
|
181 |
< |
|
182 |
< |
strcpy( temp, ffPath ); |
183 |
< |
strcat( temp, "/" ); |
184 |
< |
strcat( temp, fileName ); |
185 |
< |
strcpy( fileName, temp ); |
177 |
> |
frcFile = fopen( fileName.c_str(), "r" ); |
178 |
|
|
187 |
– |
frcFile = fopen( fileName, "r" ); |
188 |
– |
|
179 |
|
if( frcFile == NULL ){ |
180 |
|
|
181 |
|
sprintf( painCave.errMsg, |
183 |
|
"\t%s\n" |
184 |
|
"\tHave you tried setting the FORCE_PARAM_PATH environment " |
185 |
|
"variable?\n", |
186 |
< |
fileName ); |
186 |
> |
fileName.c_str() ); |
187 |
|
painCave.severity = OOPSE_ERROR; |
188 |
|
painCave.isFatal = 1; |
189 |
|
simError(); |
396 |
|
|
397 |
|
for( i=0; i<nAtoms; i++ ){ |
398 |
|
|
399 |
< |
currentAtomType = headAtomType->find( the_atoms[i]->getType() ); |
399 |
> |
currentAtomType = headAtomType->find(the_atoms[i]->getType().c_str() ); |
400 |
|
if( currentAtomType == NULL ){ |
401 |
|
sprintf( painCave.errMsg, |
402 |
|
"AtomType error, %s not found in force file.\n", |
403 |
< |
the_atoms[i]->getType() ); |
403 |
> |
the_atoms[i]->getType().c_str() ); |
404 |
|
painCave.isFatal = 1; |
405 |
|
simError(); |
406 |
|
} |