Merge from mergeto_trunk_22Aug12

[samples/dsccode.git] / src / FLUIDE / FLUIDE.cxx

diff --git a/src/FLUIDE/FLUIDE.cxx b/src/FLUIDE/FLUIDE.cxx
index ccd9271a675ceb2c074c1fa30e038b89eb3371c1..1bce9944e8a28454e5c644da933ec3108f2c7e0d 100755 (executable)
--- a/src/FLUIDE/FLUIDE.cxx
+++ b/src/FLUIDE/FLUIDE.cxx
@@ -3,6 +3,7 @@
 #include <unistd.h>
 
 #include <Calcium.hxx>
+#include <CalciumException.hxx>
 #include <calcium.h>
 
 using namespace std;
@@ -46,10 +47,10 @@ FLUIDE_i::init_service(const char * service_name) {
         {
           std::cerr << "FLUIDE: prun: "  << std::endl;
           //initialization CALCIUM ports IN
-          create_calcium_port(this,"tpi","CALCIUM_real","IN","I");
-          create_calcium_port(this,"iconv","CALCIUM_integer","IN","I");
+          create_calcium_port(this,(char *)"tpi",(char *)"CALCIUM_real",(char *)"IN",(char *)"I");
+          create_calcium_port(this,(char *)"iconv",(char *)"CALCIUM_integer",(char *)"IN",(char *)"I");
           //initialization CALCIUM ports OUT
-          create_calcium_port(this,"tfi","CALCIUM_real","OUT","I");
+          create_calcium_port(this,(char *)"tfi",(char *)"CALCIUM_real",(char *)"OUT",(char *)"I");
         }
       catch(const PortAlreadyDefined& ex)
         {
@@ -69,11 +70,11 @@ FLUIDE_i::init_service(const char * service_name) {
         {
           std::cerr << "FLUIDE: trun: "  << std::endl;
           //initialization CALCIUM ports IN
-          create_calcium_port(this,"tparoi","CALCIUM_real","IN","T");
-          create_calcium_port(this,"rparoi","CALCIUM_real","IN","T");
+          create_calcium_port(this,(char *)"tparoi",(char *)"CALCIUM_real",(char *)"IN",(char *)"T");
+          create_calcium_port(this,(char *)"rparoi",(char *)"CALCIUM_real",(char *)"IN",(char *)"T");
           //initialization CALCIUM ports OUT
-          create_calcium_port(this,"tfluide","CALCIUM_real","OUT","T");
-          create_calcium_port(this,"rfluide","CALCIUM_real","OUT","T");
+          create_calcium_port(this,(char *)"tfluide",(char *)"CALCIUM_real",(char *)"OUT",(char *)"T");
+          create_calcium_port(this,(char *)"rfluide",(char *)"CALCIUM_real",(char *)"OUT",(char *)"T");
         }
       catch(const PortAlreadyDefined& ex)
         {
@@ -92,9 +93,11 @@ FLUIDE_i::init_service(const char * service_name) {
 void FLUIDE_i::prun()
 {
   std::cerr << "FLUIDE_i::prun" << std::endl;
+  beginService("FLUIDE_i::prun");
   Superv_Component_i * component = dynamic_cast<Superv_Component_i*>(this);
   char       nom_instance[INSTANCE_LEN];
   int info = cp_cd(component,nom_instance);
+  std::cerr << nom_instance << std::endl;
   try
     {
       perma_(&component);
@@ -111,12 +114,14 @@ void FLUIDE_i::prun()
       std::cerr << "unexpected exception" << std::endl;
       cp_fin(component,CP_ARRET);
     }
+  endService("FLUIDE_i::prun");
   std::cerr << "end of FLUIDE_i::prun" << std::endl;
 }
 
 void FLUIDE_i::trun(CORBA::Double dt)
 {
   std::cerr << "FLUIDE_i::trun" << std::endl;
+  beginService("FLUIDE_i::trun");
   Superv_Component_i * component = dynamic_cast<Superv_Component_i*>(this);
   char       nom_instance[INSTANCE_LEN];
   int info = cp_cd(component,nom_instance);
@@ -136,6 +141,7 @@ void FLUIDE_i::trun(CORBA::Double dt)
       std::cerr << "unexpected exception" << std::endl;
       cp_fin(component,CP_ARRET);
     }
+  endService("FLUIDE_i::trun");
   std::cerr << "end of FLUIDE_i::trun" << std::endl;
 }