Changeset 526 for XIOS/trunk/src/config

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/config

Files:

• calendar_type.conf (modified) (1 diff)
• context_attribute.conf (modified) (1 diff)
• file_attribute.conf (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)