Changeset 1363 for XIOS/dev/XIOS_DEV_CMIP6/src/node

Timestamp:

12/06/17 18:36:26 (6 years ago)

Author:

ymipsl

Message:

Fix : when arithmetic field expression is defined, other xml node are now taking into account.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

@@ -1509 +1509 @@
    void CField::parse(xml::CXMLNode& node)
    {
+      string newContent ;
       SuperClass::parse(node);
-      if (!node.getContent(this->content))
+      if (node.goToChildElement())
       {
-        if (node.goToChildElement())
+        do
         {
-          do
-          {
-            if (node.getElementName() == "variable" || node.getElementName() == "variable_group") this->getVirtualVariableGroup()->parseChild(node);
-          } while (node.goToNextElement());
-          node.goToParentElement();
-        }
-      }
+          if (node.getElementName() == "variable" || node.getElementName() == "variable_group") this->getVirtualVariableGroup()->parseChild(node);
+          else if (node.getElementName() == "expr") if (node.getContent(newContent)) content+=newContent ;
+        } while (node.goToNextElement());
+        node.goToParentElement();
+      }
+      if (node.getContent(newContent)) content=newContent ;
     }