--- trunk/OOPSE_old/src/mdtools/libmdCode/mpiSimulation.cpp	2003/03/06 16:07:57	293
+++ trunk/OOPSE_old/src/mdtools/libmdCode/mpiSimulation.cpp	2003/03/06 17:04:09	294
@@ -5,14 +5,9 @@
 
 #include "mpiSimulation.hpp"
 #include "simError.h"
+#include <fortranWrappers.hpp>
 
-extern "C"{
-  void wrapsimparallelmod_( void (*wrapFunction)(void (*fSub)( mpiSimData*,
-							       int*, int*, 
-							       int*)));
-}
 
-void wrapSimParallel(void (*fSub)(mpiSimData*, int*, int*, int*));
 
 
 mpiSimulation* mpiSim;
@@ -26,8 +21,7 @@ mpiSimulation::mpiSimulation(SimInfo* the_entryPlug)
   mpiPlug->myNode = worldRank;
   
   mpiSim = this;
-  wrapMe();
-
+  wrapMeSimParallel( this );
 }
 
 
@@ -38,13 +32,8 @@ void mpiSimulation::wrapMe(){
   
 }
 
-void mpiSimulation::wrapMe(){
 
-  wrapsimparallelmod_( wrapSimParallel );
-}
 
-
-
 int* mpiSimulation::divideLabor( void ){
 
   int* globalIndex;
@@ -198,12 +187,6 @@ void wrapSimParallel(void (*fSub)(mpiSimData*, int*, i
 }
 
 
-void wrapSimParallel(void (*fSub)(mpiSimData*, int*, int*, int*)){
-  
-  mpiSim->setInternal( fSub );
-}
-
-
 void mpiSimulation::mpiRefresh( void ){
 
   int isError, i;