--- trunk/OOPSE/libmdtools/fortranWrappers.cpp	2003/07/16 21:30:56	626
+++ trunk/OOPSE/libmdtools/fortranWrappers.cpp	2003/09/29 21:16:11	790
@@ -1,35 +1,37 @@
 #define __C
+
+#include "config.h"
 #include "fSimulation.h"
-#include <fortranWrappers.hpp>
+#include "fortranWrappers.hpp"
 
+//extern "C"{
 
-extern "C" {
-
-  void wrapforcefield_( void (*wrapFunction)( void (*p1) makeAtypeList,
-					      void (*p2) initFortranFFList,
-					      void (*p3) doForceLoopList,
-					      void (*p4) set_sticky_params_List,
-					      void (*p5) set_gb_pair_params_List ) 
-			);
+  void F90_FUNC(wrapforcefield, WRAPFORCEFIELD) (void (*wrapFunction)(void (*p1) makeAtypeList,
+								      void (*p2) initFortranFFList,
+								      void (*p3) doForceLoopList,
+								      void (*p4) set_sticky_params_List,
+								      void (*p5) set_gb_pair_params_List, 
+								      void (*p6) newEAMtype_List) 
+						 );
   
-  void wrapsimmod_ ( void (*wrapFunction)( void (*p1) setFortranSimList,
-					   void (*p2) setFortranBoxList,
-					   void (*p3) notifyFortranCutOffList) );
-
+  void F90_FUNC(wrapsimmod, WRAPSIMMOD) (void (*wrapFunction)(void (*p1) setFortranSimList,
+							      void (*p2) setFortranBoxList,
+							      void (*p3) notifyFortranCutOffList) 
+					 );
+  
 #ifdef IS_MPI
-  void wrapsimparallelmod_( void (*wrapFunction)(void (*p1) setFortranMPIlist ) );
+  void F90_FUNC(wrapsimparallelmod, WRAPSIMPARALLELMOD) (void (*wrapFunction)(void (*p1) setFortranMPIlist) );
 #endif // is_mpi
+//}
 
-}
-
-
 void wrapFF( void (*p1) makeAtypeList, void (*p2) initFortranFFList, 
 	     void (*p3) doForceLoopList, void (*p4) set_sticky_params_List, 
-	     void (*p5) set_gb_pair_params_List );
+	     void (*p5) set_gb_pair_params_List, void (*p6) newEAMtype_List);
 void (*makeAtype) makeAtypeList;
 void (*initFortranFF) initFortranFFList;
 void (*set_sticky_params) set_sticky_params_List;
 void (*set_gb_pair_params) set_gb_pair_params_List;
+void (*newEAMtype) newEAMtype_List;
 
 void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, 
 		  void (*p3) notifyFortranCutOffList );
@@ -45,20 +47,21 @@ void wrapMeFF( ForceFields* thisFF ){
 void wrapMeFF( ForceFields* thisFF ){
   
   currentFF = thisFF;
-  wrapforcefield_( wrapFF );
+  F90_FUNC(wrapforcefield, WRAPFORCEFIELD)( wrapFF );
 }
-  
 
+
 void wrapFF( void (*p1) makeAtypeList, void (*p2) initFortranFFList,
 	     void (*p3) doForceLoopList, void (*p4) set_sticky_params_List, 
-	     void (*p5) set_gb_pair_params_List ){
+	     void (*p5) set_gb_pair_params_List, void (*p6) newEAMtype_List){
   
   makeAtype = p1;
   initFortranFF = p2;
   currentFF->setFortranForceLoop( p3 );
   set_sticky_params = p4;
   set_gb_pair_params = p5;
-
+  newEAMtype = p6;
+  
 }
 
 
@@ -68,7 +71,7 @@ void wrapMeSimInfo( SimInfo* thePlug ){
 void wrapMeSimInfo( SimInfo* thePlug ){
   
   currentPlug = thePlug;
-  wrapsimmod_( wrapSimInfo );
+  F90_FUNC(wrapsimmod, WRAPSIMMOD) ( wrapSimInfo );
 }
 
 void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, 
@@ -76,8 +79,8 @@ void wrapSimInfo( void (*p1) setFortranSimList, void (
   
   currentPlug->setInternal( p1, p2, p3 );
 }
-  
 
+
 #ifdef IS_MPI
 
 // wrap the mpiSim functions
@@ -86,7 +89,7 @@ void wrapMeSimParallel( mpiSimulation* thisMPIsim ){
 void wrapMeSimParallel( mpiSimulation* thisMPIsim ){
   
   currentMPIsim = thisMPIsim;
-  wrapsimparallelmod_( wrapSimParallel );
+  F90_FUNC(wrapsimparallelmod, WRAPSIMPARALLELMOD) ( wrapSimParallel );
 }
 
 void wrapSimParallel(void (*p1) setFortranMPIlist ){
@@ -96,3 +99,4 @@ void wrapSimParallel(void (*p1) setFortranMPIlist ){
 
 
 #endif // is_mpi
+