Changeset 311

Timestamp:

02/14/12 14:37:56 (12 years ago)

Author:

ymipsl

Message:

CXios::getin has now default parameters

YM

Location:

XIOS/trunk/src

Files:

• cxios.cpp (modified) (1 diff)
• cxios.hpp (modified) (1 diff)
• cxios_impl.hpp (modified) (1 diff)
• parameters.cpp (added)

XIOS/trunk/src/cxios.cpp

@@ -22 +22 @@
   {
     tree::CTreeManager::ParseFile(rootFile);
-    usingServer=getin<bool>("using_server") ;
-    usingOasis=getin<bool>("using_oasis") ;
-    info.setLevel(getin<int>("info_level")) ;
+    usingServer=getin<bool>("using_server",false) ;
+    usingOasis=getin<bool>("using_oasis",false) ;
+    info.setLevel(getin<int>("info_level",0)) ;
     globalComm=MPI_COMM_WORLD ;
   }

XIOS/trunk/src/cxios.hpp

@@ -22 +22 @@
    
      template <typename T>
+     static T getin(const string& id,const T& defaultValue) ;
+     
+     template <typename T>
      static T getin(const string& id) ;
-
 
      static bool isClient ;

XIOS/trunk/src/cxios_impl.hpp

@@ -13 +13 @@
   }
 
+  template <typename T>
+  T CXios::getin(const string& id, const T& defaultValue)
+  {
+    if (CObjectFactory::HasObject<CVariable>("xios",id))
+      return CObjectFactory::GetObject<CVariable>("xios",id)->getData<T>() ;
+    else return defaultValue ;
+  }