Changeset 526 for XIOS/trunk/src/node/file.cpp

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.

File:

• XIOS/trunk/src/node/file.cpp (modified) (1 diff)

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));