--- trunk/OOPSE/libmdtools/fortranWrappers.cpp 2003/03/21 17:42:12 378 +++ trunk/OOPSE/libmdtools/fortranWrappers.cpp 2003/04/04 22:22:30 460 @@ -7,7 +7,11 @@ extern "C" { void wrapforcefield_( void (*wrapFunction)( void (*p1) makeAtypeList, void (*p2) initFortranFFList, - void (*p3) doForceLoopList )); + void (*p3) doForceLoopList, + void (*p4) LJ_new_rcut_List, + void (*p5) set_sticky_params_List, + void (*p6) set_gp_pair_params_List ) + ); void wrapsimmod_ ( void (*wrapFunction)( void (*p1) setFortranSimList, void (*p2) setFortranBoxList) ); @@ -20,9 +24,14 @@ void wrapFF( void (*p1) makeAtypeList, void (*p2) init void wrapFF( void (*p1) makeAtypeList, void (*p2) initFortranFFList, - void (*p3) doForceLoopList ); + void (*p3) doForceLoopList, void (*p4) LJ_new_rcut_List, + void (*p5) set_sticky_params_List, + void (*p6) 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 ); @@ -42,11 +51,17 @@ void wrapFF( void (*p1) makeAtypeList, void (*p2) init void wrapFF( void (*p1) makeAtypeList, void (*p2) initFortranFFList, - void (*p3) doForceLoopList ){ + void (*p3) doForceLoopList, void (*p4) LJ_new_rcut_List, + void (*p5) set_sticky_params_List, + void (*p6) 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; + }