1 |
|
#include <cstdlib> |
2 |
|
|
3 |
|
#include "SimInfo.hpp" |
4 |
< |
|
4 |
> |
#define __C |
5 |
> |
#include "fsimulation.h" |
6 |
|
extern "C"{ |
7 |
|
void wrapsimmod_( void (*wrapFunction)(void (*fSub)( int*, double*, |
8 |
|
double*, double*))); |
9 |
|
} |
10 |
|
|
11 |
< |
void wrapSimInfo((void (*fSub)( int*, double*, double*, double*))); |
11 |
> |
void wrapSimInfo(void (*fSub)( int*, double*, double*, double*)); |
12 |
|
|
13 |
|
SimInfo* currentInfo; |
14 |
|
|
41 |
|
box[1] = box_y; |
42 |
|
box[2] = box_z; |
43 |
|
|
44 |
< |
setFsimulation( &n_atoms, box, &rList, &rCut ); |
44 |
> |
|
45 |
> |
|
46 |
> |
setFsimulation( &n_atoms, box, &rList, &rCut,&ensemble, |
47 |
> |
&mixingRule,&usePBC); |
48 |
|
} |
49 |
|
|
50 |
|
|
51 |
< |
void wrapSimInfo((void (*fSub)( int*, double*, double*, double*))){ |
51 |
> |
void wrapSimInfo(void (*fSub)( int*, double*, double*, double*)){ |
52 |
|
|
53 |
|
currentInfo->setInternal(fSub); |
54 |
|
} |