--- trunk/OOPSE_old/src/mdtools/libmdCode/SimInfo.cpp	2003/03/06 16:07:57	293
+++ trunk/OOPSE_old/src/mdtools/libmdCode/SimInfo.cpp	2003/03/06 17:04:09	294
@@ -7,12 +7,8 @@ extern "C"{
 #include "fSimulation.h"
 #include "simError.h"
 
-extern "C"{
-  void wrapsimmod_( void (*wrapFunction)(void (*fSub)( simtype*, int* )));
-}
+#include <fortranWrappers.hpp>
 
-void wrapSimInfo(void (*fSub)( simtype*, int* ));
-
 SimInfo* currentInfo;
 
 SimInfo::SimInfo(){
@@ -24,17 +20,9 @@ SimInfo::SimInfo(){
   setTemp = 0;
   thermalTime = 0.0;
 
-  currentInfo = this;
-  wrapMe();
+  wrapMeSimInfo( this );
 }
 
-
-void SimInfo::wrapMe(){
-
-  wrapsimmod_( wrapSimInfo );
-}
-
-
 void SimInfo::refreshSim(){
 
   simtype fInfo;
@@ -72,7 +60,3 @@ void wrapSimInfo(void (*fSub)( simtype*, int* )){
 #endif // is_mpi
 }
 
-void wrapSimInfo(void (*fSub)( simtype*, int* )){
-  
-  currentInfo->setInternal(fSub);
-}