| 7 |
|
#include "fSimulation.h" |
| 8 |
|
#include "simError.h" |
| 9 |
|
|
| 10 |
< |
extern "C"{ |
| 11 |
< |
void wrapsimmod_( void (*wrapFunction)(void (*fSub)( simtype*, int* ))); |
| 12 |
< |
} |
| 10 |
> |
#include <fortranWrappers.hpp> |
| 11 |
|
|
| 14 |
– |
void wrapSimInfo(void (*fSub)( simtype*, int* )); |
| 15 |
– |
|
| 12 |
|
SimInfo* currentInfo; |
| 13 |
|
|
| 14 |
|
SimInfo::SimInfo(){ |
| 20 |
|
setTemp = 0; |
| 21 |
|
thermalTime = 0.0; |
| 22 |
|
|
| 23 |
< |
currentInfo = this; |
| 28 |
< |
wrapMe(); |
| 23 |
> |
wrapMeSimInfo( this ); |
| 24 |
|
} |
| 25 |
|
|
| 31 |
– |
|
| 32 |
– |
void SimInfo::wrapMe(){ |
| 33 |
– |
|
| 34 |
– |
wrapsimmod_( wrapSimInfo ); |
| 35 |
– |
} |
| 36 |
– |
|
| 37 |
– |
|
| 26 |
|
void SimInfo::refreshSim(){ |
| 27 |
|
|
| 28 |
|
simtype fInfo; |
| 34 |
|
|
| 35 |
|
fInfo.rlist = rList; |
| 36 |
|
fInfo.rcut = rCut; |
| 37 |
< |
fInfo.rlistsq = rlist * rlist; |
| 50 |
< |
fInfo.rcutsq = rCut * rCut; |
| 51 |
< |
fInfo.rcut6 = fInfo.rcutsq * fInfo.rcutsq * fInfo.rcutsq; |
| 52 |
< |
fInfo.natoms = n_atoms; |
| 53 |
< |
fInfo.usePBC = usePBC; |
| 54 |
< |
strcpy( fInfo.ensemble, ensemble ); |
| 55 |
< |
strcpy( fInfo.mixingRule, mixingRule ); |
| 37 |
> |
fInfo.SIM_uses_PBC = usePBC; |
| 38 |
|
|
| 39 |
|
isError = 0; |
| 40 |
|
setFsimulation( &fInfo, &isError ); |
| 54 |
|
#endif // is_mpi |
| 55 |
|
} |
| 56 |
|
|
| 75 |
– |
void wrapSimInfo(void (*fSub)( simtype*, int* )){ |
| 76 |
– |
|
| 77 |
– |
currentInfo->setInternal(fSub); |
| 78 |
– |
} |
