Merge from V6_main 13/12/2012

[modules/homard.git] / src / HOMARD / HOMARD_DriverTools.cxx

diff --git a/src/HOMARD/HOMARD_DriverTools.cxx b/src/HOMARD/HOMARD_DriverTools.cxx
index ccd5429f7ae60cb2556152138cc844ff034f343a..ee9264b4f36ba3fc7a9a01252dc9111d8809ee16 100644 (file)
--- a/src/HOMARD/HOMARD_DriverTools.cxx
+++ b/src/HOMARD/HOMARD_DriverTools.cxx
@@ -228,6 +228,8 @@ namespace HOMARD
 
     os << separator() << hypothesis.GetNivMax();
     os << separator() << hypothesis.GetDiamMin();
+    os << separator() << hypothesis.GetAdapInit();
+    os << separator() << hypothesis.GetLevelOutput();
 
 //    MESSAGE( ". Fin avec "<<os.str());
     return os.str();
@@ -585,6 +587,14 @@ namespace HOMARD
     if ( !ok ) return false;
     hypothesis.SetDiamMin( strtod( chunk.c_str(), 0 ) );
 
+    chunk = getNextChunk( stream, start, ok );
+    if ( !ok ) return false;
+    hypothesis.SetAdapInit( strtod( chunk.c_str(), 0 ) );
+
+    chunk = getNextChunk( stream, start, ok );
+    if ( !ok ) return false;
+    hypothesis.SetLevelOutput( strtod( chunk.c_str(), 0 ) );
+
     return true;
   }