MGAdapt: allow using float field. Fixes test 13.

diff --git a/doc/salome/examples/MGAdaptTests_without_session.py b/doc/salome/examples/MGAdaptTests_without_session.py
index aa3f087a2afacb56bcd65464db71906edfd9bb7b..2f0621d703125b2472c63c0893e1231f25d939a5 100644 (file)
--- a/doc/salome/examples/MGAdaptTests_without_session.py
+++ b/doc/salome/examples/MGAdaptTests_without_session.py
@@ -450,7 +450,7 @@ if __name__ == "__main__" :
   L_OPTIONS.append("05")
   L_OPTIONS.append("06")
   L_OPTIONS.append("08")
-  #L_OPTIONS.append("13")
+  L_OPTIONS.append("13")
 
 # 2. Lancement de la classe
 

diff --git a/src/SMESH/MG_ADAPT.cxx b/src/SMESH/MG_ADAPT.cxx
index 8f2a36a44f25b9be1fbb7a83dd88ed959cf6ce5f..6253f497574ce5d49293e631bad06802edfcd8cd 100644 (file)
--- a/src/SMESH/MG_ADAPT.cxx
+++ b/src/SMESH/MG_ADAPT.cxx
@@ -1381,8 +1381,17 @@ void MgAdapt::convertMedFile(std::string& meshFormatMeshFileName, std::string& s
     checkTimeStepRank(medFileIn) ;
     MEDCoupling::MCAuto<MEDCoupling::MEDFileAnyTypeFieldMultiTS> fts( mfd->getFields()->getFieldWithName(fieldName) );
     MEDCoupling::MCAuto<MEDCoupling::MEDFileAnyTypeField1TS> f = fts->getTimeStep(timeStep, rank);
-    MEDCoupling::MCAuto<MEDCoupling::MEDFileFieldMultiTS> tmFts = MEDCoupling::MEDFileFieldMultiTS::New();
-    tmFts->pushBackTimeStep(f);
+    MEDCoupling::MCAuto<MEDCoupling::MEDFileFieldMultiTS> tmFts = MEDCoupling::DynamicCast<MEDCoupling::MEDFileAnyTypeFieldMultiTS,MEDCoupling::MEDFileFieldMultiTS>(fts);
+
+    // if not able to cast to double field, try float field
+    if (!tmFts)
+    {
+      MEDCoupling::MCAuto<MEDCoupling::MEDFileFloatFieldMultiTS>  tmFtsFloat = MEDCoupling::DynamicCast<MEDCoupling::MEDFileAnyTypeFieldMultiTS,MEDCoupling::MEDFileFloatFieldMultiTS>(fts);
+      if (!tmFtsFloat)
+        THROW_SALOME_EXCEPTION("\nUnexpected field type.\n");
+      // convert float field to double
+      tmFts = tmFtsFloat->convertToDouble();
+    }
 
     fields->pushField(tmFts);