Changeset 770 for XIOS/trunk/src/node

Timestamp:

10/30/15 16:33:48 (9 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/node

Files:

• field.cpp (modified) (1 diff)
• file.cpp (modified) (1 diff)

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