Changeset 770

Timestamp:

10/30/15 16:33:48 (8 years ago)

Author:

rlacroix

Message:

Field: Handle more correctly the output name for the fields with a field_ref.

If the field has an explicitly defined name (which might be inherited) then it is used as the output name.
If no name was defined but an id was set, the id is used as the output name.
If no name was defined and the id was automatically generated, the id of the field directly referenced is used as the output name.

Location:

XIOS/trunk/src

Files:

• declare_ref_func.hpp (modified) (8 diffs)
• io/nc4_data_input.cpp (modified) (2 diffs)
• io/nc4_data_output.cpp (modified) (2 diffs)
• node/field.cpp (modified) (1 diff)
• node/file.cpp (modified) (1 diff)

XIOS/trunk/src/declare_ref_func.hpp

@@ -12 +12 @@
 // Declarations
 
-#define DECLARE_REF_FUNC(type, name)                        \
+#define DECLARE_REF_FUNC(type, name_)                       \
 public:                                                     \
   bool hasDirect##type##Reference(void) const;              \
@@ -21 +21 @@
   void solveRefInheritance(bool apply = true);              \
   void solveBaseReference(void);                            \
+  const StdString& get##type##OutputName(void) const;       \
                                                             \
 private:                                                    \
@@ -27 +28 @@
 // Definitions
 
-#define DEFINE_REF_FUNC(type, name)                                    \
+#define DEFINE_REF_FUNC(type, name_)                                   \
 void C##type::solveRefInheritance(bool apply)                          \
 {                                                                      \
@@ -42 +43 @@
     {                                                                  \
       ERROR("void C" #type "::solveRefInheritance(bool apply)",        \
-            << "Circular dependency stopped for " #name " object "     \
+            << "Circular dependency stopped for " #name_ " object "    \
             << "with id = \"" << refer_ptr->getId() << "\".");         \
     }                                                                  \
@@ -52 +53 @@
 void C##type::removeRefInheritance()                                   \
 {                                                                      \
-  if (!this->name##_ref.isEmpty())                                     \
-    this->name##_ref.reset();                                          \
+  if (!this->name_##_ref.isEmpty())                                    \
+    this->name_##_ref.reset();                                         \
 }                                                                      \
                                                                        \
@@ -70 +71 @@
     {                                                                  \
       ERROR("void C" #type "::solveBaseReference(void)",               \
-            << "Circular dependency stopped for " #name " object "     \
+            << "Circular dependency stopped for " #name_ " object "    \
             << "with id = \"" << baseRefObject->getId() << "\".");     \
     }                                                                  \
@@ -78 +79 @@
 C##type* C##type::getDirect##type##Reference(void) const               \
 {                                                                      \
-  if (this->name##_ref.isEmpty())                                      \
+  if (this->name_##_ref.isEmpty())                                     \
     return this->getBase##type##Reference();                           \
                                                                        \
-  if (!C##type::has(this->name##_ref))                                 \
+  if (!C##type::has(this->name_##_ref))                                \
     ERROR("C" #type "* C" #type "::getDirect" #type "Reference(void)", \
-          << this->name##_ref                                          \
-          << " refers to an unknown " #name " id.");                   \
+          << this->name_##_ref                                         \
+          << " refers to an unknown " #name_ " id.");                  \
                                                                        \
-  return C##type::get(this->name##_ref);                               \
+  return C##type::get(this->name_##_ref);                              \
 }                                                                      \
                                                                        \
@@ -98 +99 @@
   return this->getBase##type##Reference()->getId();                    \
 }                                                                      \
-                                                                       \
 bool C##type::hasDirect##type##Reference(void) const                   \
 {                                                                      \
-  return !this->name##_ref.isEmpty();                                  \
+  return !this->name_##_ref.isEmpty();                                 \
+}                                                                      \
+                                                                       \
+const StdString& C##type::get##type##OutputName(void) const            \
+{                                                                      \
+  if (!this->name.isEmpty())                                           \
+    return this->name;                                                 \
+  else if (hasAutoGeneratedId() && hasDirect##type##Reference())       \
+    return this->name_##_ref;                                          \
+  else                                                                 \
+    return getId();                                                    \
 }                                                                      \
 

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -21 +21 @@
   StdSize CNc4DataInput::getFieldNbRecords_(CField* field)
   {
-    StdString fieldId = !field->name.isEmpty() ? field->name.getValue() : field->getBaseFieldReference()->getId();
+    StdString fieldId = field->getFieldOutputName();
 
     if (SuperClassWriter::isTemporal(fieldId))
@@ -41 +41 @@
       if (SuperClass::type==MULTI_FILE || !isCollective) return;
 
-    StdString fieldId = !field->name.isEmpty() ? field->name.getValue() : field->getBaseFieldReference()->getId();
+    StdString fieldId = field->getFieldOutputName();
 
     CArray<double,1> fieldData(grid->getWrittenDataSize());

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -1058 +1058 @@
                              : latid;
 */
-         StdString fieldid   = (!field->name.isEmpty())
-                             ? field->name.getValue() : field->getBaseFieldReference()->getId();
+         StdString fieldid = field->getFieldOutputName();
 
 //         unsigned int ssize = domain->zoom_ni_loc.getValue() * domain->zoom_nj_loc.getValue();
@@ -1384 +1383 @@
           if (SuperClass::type == MULTI_FILE || !isCollective) return;
 
-        StdString fieldid = !field->name.isEmpty()
-                          ? field->name.getValue()
-                          : field->getBaseFieldReference()->getId();
+        StdString fieldid = field->getFieldOutputName();
 
         StdOStringStream oss;

XIOS/trunk/src/node/field.cpp

@@ -760 +760 @@
       {
         ERROR("CField::solveGridReference(void)",
-              << "A grid must be defined for field '" << (!name.isEmpty() ? name.getValue() : getId()) << "' .");
+              << "A grid must be defined for field '" << getFieldOutputName() << "' .");
       }
       else if (!grid_ref.isEmpty() && (!domain_ref.isEmpty() || !axis_ref.isEmpty()))
       {
         ERROR("CField::solveGridReference(void)",
-              << "Field '" << (!name.isEmpty() ? name.getValue() : getId()) << "' has both a grid and a domain/axis." << std::endl
+              << "Field '" << getFieldOutputName() << "' has both a grid and a domain/axis." << std::endl
               << "Please define either 'grid_ref' or 'domain_ref'/'axis_ref'.");
       }

XIOS/trunk/src/node/file.cpp

@@ -956 +956 @@
    void CFile::sendEnabledFields()
    {
-     int size = this->enabledFields.size();
-     CField* fieldPtr(0);
-     for (int i = 0; i < size; ++i)
+     size_t size = this->enabledFields.size();
+     for (size_t i = 0; i < size; ++i)
      {
-       fieldPtr = this->enabledFields[i];
-       if (fieldPtr->name.isEmpty()) fieldPtr->name.setValue(fieldPtr->getBaseFieldReference()->getId());
-       this->sendAddField(fieldPtr->getId());
-       fieldPtr->sendAllAttributesToServer();
-       fieldPtr->sendAddAllVariables();
+       CField* field = this->enabledFields[i];
+       this->sendAddField(field->getId());
+       field->sendAllAttributesToServer();
+       field->sendAddAllVariables();
      }
    }