1 |
< |
/* |
1 |
> |
/* |
2 |
|
* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. |
3 |
|
* |
4 |
|
* The University of Notre Dame grants you ("Licensee") a |
50 |
|
#include "UseTheForce/DarkSide/atype_interface.h" |
51 |
|
#include "UseTheForce/DarkSide/lj_interface.h" |
52 |
|
#include "UseTheForce/DarkSide/eam_interface.h" |
53 |
< |
#include "UseTheForce/DarkSide/charge_interface.h" |
53 |
> |
#include "UseTheForce/DarkSide/electrostatic_interface.h" |
54 |
|
namespace oopse { |
55 |
|
AtomType::AtomType(){ |
56 |
|
|
122 |
|
if (ljData != NULL) { |
123 |
|
LJParam ljParam = ljData->getData(); |
124 |
|
|
125 |
< |
newLJtype(&atp.ident, &ljParam.sigma, &ljParam.epsilon, &isError); |
125 |
> |
newLJtype(&atp.ident, &ljParam.sigma, &ljParam.epsilon, &ljParam.soft_pot, &isError); |
126 |
|
|
127 |
|
if (isError != 0) { |
128 |
|
sprintf( painCave.errMsg, |
147 |
|
} |
148 |
|
} |
149 |
|
|
150 |
+ |
if (isElectrostatic()) { |
151 |
+ |
newElectrostaticType(&atp, &isError); |
152 |
+ |
if (isError != 0) { |
153 |
+ |
sprintf( painCave.errMsg, |
154 |
+ |
"Fortran rejected newElectrostaticType\n"); |
155 |
+ |
painCave.severity = OOPSE_ERROR; |
156 |
+ |
painCave.isFatal = 1; |
157 |
+ |
simError(); |
158 |
+ |
} |
159 |
+ |
} |
160 |
+ |
|
161 |
|
if (isCharge()) { |
162 |
|
data = getPropertyByName("Charge"); |
163 |
|
if (data != NULL) { |
165 |
|
|
166 |
|
if (doubleData != NULL) { |
167 |
|
double charge = doubleData->getData(); |
168 |
< |
newChargeType(&atp.ident, &charge, &isError); |
169 |
< |
|
168 |
> |
setCharge(&atp.ident, &charge, &isError); |
169 |
> |
|
170 |
|
if (isError != 0) { |
171 |
|
sprintf( painCave.errMsg, |
172 |
< |
"Fortran rejected newChargeType\n"); |
172 |
> |
"Fortran rejected setCharge\n"); |
173 |
|
painCave.severity = OOPSE_ERROR; |
174 |
|
painCave.isFatal = 1; |
175 |
|
simError(); |