Changeset 526 for XIOS/trunk

Timestamp:

12/02/14 15:18:09 (9 years ago)

Author:

rlacroix

Message:

Convert some attributes to enumerations:

• file: par_access
• context: calendar_type

Those changes should have no effect on existing XML configuration files and ensure that a proper error message is always displayed during parsing if the value is not supported.

Location:

XIOS/trunk/src

Files:

• config/calendar_type.conf (modified) (1 diff)
• config/context_attribute.conf (modified) (1 diff)
• config/file_attribute.conf (modified) (1 diff)
• interface/c_attr/iccontext_attr.cpp (modified) (2 diffs)
• interface/c_attr/icfile_attr.cpp (modified) (2 diffs)
• interface/c_attr/icfilegroup_attr.cpp (modified) (2 diffs)
• node/context.cpp (modified) (2 diffs)
• node/file.cpp (modified) (1 diff)

XIOS/trunk/src/config/calendar_type.conf

@@ -1 +1 @@
 #ifdef __XMLIO_CAllLeapCalendar__
-   DECLARE_CALENDAR(AllLeap  , AllLeap)
+   DECLARE_CALENDAR(AllLeap, calendar_type_attr::AllLeap)
 #endif //__XMLIO_CAllLeapCalendar__
 
 #ifdef __XMLIO_CD360Calendar__
-   DECLARE_CALENDAR(D360  , D360)
+   DECLARE_CALENDAR(D360, calendar_type_attr::D360)
 #endif //__XMLIO_CD360Calendar__
 
 #ifdef __XMLIO_CGregorianCalendar__
-   DECLARE_CALENDAR(Gregorian  , Gregorian)
+   DECLARE_CALENDAR(Gregorian, calendar_type_attr::Gregorian)
 #endif //__XMLIO_CGregorianCalendar__
 
 #ifdef __XMLIO_CJulianCalendar__
-   DECLARE_CALENDAR(Julian  , Julian)
+   DECLARE_CALENDAR(Julian, calendar_type_attr::Julian)
 #endif //__XMLIO_CJulianCalendar__
 
 #ifdef __XMLIO_CNoLeapCalendar__
-   DECLARE_CALENDAR(NoLeap  , NoLeap)
+   DECLARE_CALENDAR(NoLeap, calendar_type_attr::NoLeap)
 #endif //__XMLIO_CNoLeapCalendar__
-
-#undef DECLARE_CALENDAR

XIOS/trunk/src/config/context_attribute.conf

@@ -1 @@
-DECLARE_ATTRIBUTE(StdString, calendar_type)
+DECLARE_ENUM5(calendar_type, D360, AllLeap, NoLeap, Julian, Gregorian)
 DECLARE_ATTRIBUTE(StdString, start_date)
 DECLARE_ATTRIBUTE(StdString, time_origin)

XIOS/trunk/src/config/file_attribute.conf

@@ -13 +13 @@
 DECLARE_ENUM2(type,one_file,multiple_file)
 DECLARE_ENUM2(format, netcdf4, netcdf4_classic)
-DECLARE_ATTRIBUTE(StdString,      par_access)
+DECLARE_ENUM2(par_access, collective, independent)
 
 // DECLARE_ATTRIBUTE_DEF(bool, enabled, true)

XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp

@@ -22 +22 @@
     if(!cstr2string(calendar_type, calendar_type_size, calendar_type_str)) return;
      CTimer::get("XIOS").resume();
-    context_hdl->calendar_type.setValue(calendar_type_str);
+    context_hdl->calendar_type.fromString(calendar_type_str);
      CTimer::get("XIOS").suspend();
   }
@@ -29 +29 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->calendar_type.getInheritedValue(),calendar_type , calendar_type_size))
+    if(!string_copy(context_hdl->calendar_type.getInheritedStringValue(),calendar_type , calendar_type_size))
       ERROR("void cxios_get_context_calendar_type(context_Ptr context_hdl, char * calendar_type, int calendar_type_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();

XIOS/trunk/src/interface/c_attr/icfile_attr.cpp

@@ -215 +215 @@
     if(!cstr2string(par_access, par_access_size, par_access_str)) return;
      CTimer::get("XIOS").resume();
-    file_hdl->par_access.setValue(par_access_str);
+    file_hdl->par_access.fromString(par_access_str);
      CTimer::get("XIOS").suspend();
   }
@@ -222 +222 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(file_hdl->par_access.getInheritedValue(),par_access , par_access_size))
+    if(!string_copy(file_hdl->par_access.getInheritedStringValue(),par_access , par_access_size))
       ERROR("void cxios_get_file_par_access(file_Ptr file_hdl, char * par_access, int par_access_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();

XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp

@@ -241 +241 @@
     if(!cstr2string(par_access, par_access_size, par_access_str)) return;
      CTimer::get("XIOS").resume();
-    filegroup_hdl->par_access.setValue(par_access_str);
+    filegroup_hdl->par_access.fromString(par_access_str);
      CTimer::get("XIOS").suspend();
   }
@@ -248 +248 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(filegroup_hdl->par_access.getInheritedValue(),par_access , par_access_size))
+    if(!string_copy(filegroup_hdl->par_access.getInheritedStringValue(),par_access , par_access_size))
       ERROR("void cxios_get_filegroup_par_access(filegroup_Ptr filegroup_hdl, char * par_access, int par_access_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();

XIOS/trunk/src/node/context.cpp

@@ -73 +73 @@
    {
       this->calendar = newCalendar;
-      calendar_type.setValue(this->calendar->getId());
+      calendar_type.fromString(this->calendar->getId());
       start_date.setValue(this->calendar->getInitDate().toString());
    }
@@ -87 +87 @@
                << "Impossible to define a calendar (an attribute is missing).");
 
-#define DECLARE_CALENDAR(MType  , mtype)                              \
-   if (calendar_type.getValue().compare(#mtype) == 0)                 \
-   {                                                                  \
-      if (time_origin.isEmpty())                                       \
-        this->calendar =  boost::shared_ptr<CCalendar>          \
-           (new C##MType##Calendar(start_date.getValue()));     \
-      else this->calendar =  boost::shared_ptr<CCalendar>       \
-           (new C##MType##Calendar(start_date.getValue(),time_origin.getValue()));     \
-      if (!this->timestep.isEmpty())                                  \
-       this->calendar->setTimeStep                                    \
-          (CDuration::FromString(this->timestep.getValue()));   \
-      return;                                                         \
+#define DECLARE_CALENDAR(MType, eType)                                              \
+   if (calendar_type.getValue() == eType)                                           \
+   {                                                                                \
+      if (time_origin.isEmpty())                                                    \
+        this->calendar = boost::shared_ptr<CCalendar>                               \
+            (new C##MType##Calendar(start_date.getValue()));                        \
+      else this->calendar = boost::shared_ptr<CCalendar>                            \
+            (new C##MType##Calendar(start_date.getValue(),time_origin.getValue())); \
+      if (!this->timestep.isEmpty())                                                \
+        this->calendar->setTimeStep                                                 \
+            (CDuration::FromString(this->timestep.getValue()));                     \
+      return;                                                                       \
    }
 #include "calendar_type.conf"
+#undef DECLARE_CALENDAR
 
       ERROR("CContext::solveCalendar(void)",
-            << "[ calendar_type = " << calendar_type.getValue() << " ] "
-            << "The calendar is not defined !");
+            << "[ calendar_type = " << calendar_type.getStringValue() << " ] "
+            << "The calendar is not properly handled!");
    }
 

XIOS/trunk/src/node/file.cpp

@@ -358 +358 @@
          oss << ".nc";
 
-         if (isOpen) data_out->closeFile() ;
-         bool isCollective=true ;
-         if (!par_access.isEmpty())
-         {
-           if (par_access.getValue()=="independent") isCollective=false ;
-           else if (par_access.getValue()=="collective") isCollective=true ;
-           else
-           {
-             ERROR("void Context::createDataOutput(void)",
-                        "incorrect file <par_access> attribut : must be <collective> or <indepedent>, "
-                        <<"having : <"<<type.getValue()<<">") ;
-           }
-         }
+         bool isCollective = par_access.isEmpty() ||  par_access == par_access_attr::collective;
+
+         if (isOpen) data_out->closeFile();
+
          data_out=shared_ptr<CDataOutput>(new CNc4DataOutput(oss.str(), false, useClassicFormat,
                                                              fileComm, multifile, isCollective));