--- trunk/OOPSE/libmdtools/fortranWrappers.cpp 2003/04/05 02:56:27 462 +++ trunk/OOPSE/libmdtools/fortranWrappers.cpp 2003/07/16 21:30:56 626 @@ -8,13 +8,13 @@ extern "C" { void wrapforcefield_( void (*wrapFunction)( void (*p1) makeAtypeList, void (*p2) initFortranFFList, void (*p3) doForceLoopList, - void (*p4) LJ_new_rcut_List, - void (*p5) set_sticky_params_List, - void (*p6) set_gb_pair_params_List ) + void (*p4) set_sticky_params_List, + void (*p5) set_gb_pair_params_List ) ); void wrapsimmod_ ( void (*wrapFunction)( void (*p1) setFortranSimList, - void (*p2) setFortranBoxList) ); + void (*p2) setFortranBoxList, + void (*p3) notifyFortranCutOffList) ); #ifdef IS_MPI void wrapsimparallelmod_( void (*wrapFunction)(void (*p1) setFortranMPIlist ) ); @@ -24,16 +24,15 @@ void wrapFF( void (*p1) makeAtypeList, void (*p2) init void wrapFF( void (*p1) makeAtypeList, void (*p2) initFortranFFList, - void (*p3) doForceLoopList, void (*p4) LJ_new_rcut_List, - void (*p5) set_sticky_params_List, - void (*p6) set_gb_pair_params_List ); + void (*p3) doForceLoopList, void (*p4) set_sticky_params_List, + void (*p5) set_gb_pair_params_List ); void (*makeAtype) makeAtypeList; void (*initFortranFF) initFortranFFList; -void (*LJ_new_rcut) LJ_new_rcut_List; void (*set_sticky_params) set_sticky_params_List; void (*set_gb_pair_params) set_gb_pair_params_List; -void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList ); +void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, + void (*p3) notifyFortranCutOffList ); #ifdef IS_MPI void wrapSimParallel(void (*p1) setFortranMPIlist ); @@ -51,16 +50,14 @@ void wrapFF( void (*p1) makeAtypeList, void (*p2) init void wrapFF( void (*p1) makeAtypeList, void (*p2) initFortranFFList, - void (*p3) doForceLoopList, void (*p4) LJ_new_rcut_List, - void (*p5) set_sticky_params_List, - void (*p6) set_gb_pair_params_List ){ + void (*p3) doForceLoopList, void (*p4) set_sticky_params_List, + void (*p5) set_gb_pair_params_List ){ makeAtype = p1; initFortranFF = p2; currentFF->setFortranForceLoop( p3 ); - LJ_new_rcut = p4; - set_sticky_params = p5; - set_gb_pair_params = p6; + set_sticky_params = p4; + set_gb_pair_params = p5; } @@ -74,9 +71,10 @@ void wrapSimInfo( void (*p1) setFortranSimList, void ( wrapsimmod_( wrapSimInfo ); } -void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList ){ +void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, + void (*p3) notifyFortranCutOffList){ - currentPlug->setInternal( p1, p2 ); + currentPlug->setInternal( p1, p2, p3 ); }