Changeset 2206 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

Timestamp:

08/24/21 13:48:12 (3 years ago)

Author:

ymipsl

Message:

New feature : when can now use the syntax :
fieldId:domainId[n], in domain reference inside the workflow (XML). Same for axis and scalar.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -327 +327 @@
   CATCH
 
-  CDomain* CField::getAssociatedDomain(const string& domainId) const
-  {
-    if (grid_==nullptr) ERROR("CDomain* CField::getAssociatedDomain(const string& domainId)", <<" field with id="<<getId()<<" has no associated grid, "
+  CDomain* CField::getAssociatedDomain(const string& domainId, bool noError) const
+  {
+    if (grid_==nullptr)
+    { 
+      if (noError) return nullptr ;
+      else ERROR("CDomain* CField::getAssociatedDomain(const string& domainId)", <<" field with id="<<getId()<<" has no associated grid, "
                               <<"check if the worklfow is enabled for this field");
-    grid_->getAssociatedDomain(domainId) ;
-  }
-
-  CAxis* CField::getAssociatedAxis(const string& axisId) const
-  {
-    if (grid_==nullptr) ERROR("CAxis* CField::getAssociatedAxis(const string& axisId)", <<" field with id="<<getId()<<" has no associated grid, "
+    }
+    return grid_->getAssociatedDomain(domainId, noError) ;
+  }
+
+  CAxis* CField::getAssociatedAxis(const string& axisId, bool noError) const
+  {
+    if (grid_==nullptr) 
+    {
+      if (noError) return nullptr ;
+      else  ERROR("CAxis* CField::getAssociatedAxis(const string& axisId)", <<" field with id="<<getId()<<" has no associated grid, "
                               <<"check if the worklfow is enabled for this field");
-    grid_->getAssociatedAxis(axisId) ;
-  }
-
-  CScalar* CField::getAssociatedScalar(const string& scalarId) const
-  {
-    if (grid_==nullptr) ERROR("CScalar* CField::getAssociatedScalar(const string& scalarId)", <<" field with id="<<getId()<<" has no associated grid, "
+    }
+    return grid_->getAssociatedAxis(axisId, noError) ;
+  }
+
+  CScalar* CField::getAssociatedScalar(const string& scalarId, bool noError) const
+  {
+    if (grid_==nullptr) 
+    { 
+      if (noError) return nullptr ;
+      else ERROR("CScalar* CField::getAssociatedScalar(const string& scalarId)", <<" field with id="<<getId()<<" has no associated grid, "
                               <<"check if the worklfow is enabled for this field");
-    grid_->getAssociatedScalar(scalarId) ;
+    }
+    return grid_->getAssociatedScalar(scalarId, noError) ;
   }
 
@@ -618 +630 @@
     solveGridReference() ; // grid_ is now defined
     if (!isGridCompleted()) return false;
+    if (grid_->activateFieldWorkflow(gc)==false) return false; // workflow graph cannot be built at this stage
 
     // Check if we have an expression to parse
@@ -1181 +1194 @@
       if (!domain_ref.isEmpty())
       {
-        StdString tmp = domain_ref.getValue();
+        CField* field=CDomain::getFieldFromId(domain_ref) ;
+        if (field!=nullptr) field->solveGridReference() ;
         if (CDomain::has(domain_ref))
         {
@@ -1195 +1209 @@
       if (!axis_ref.isEmpty())
       {
+        CField* field=CAxis::getFieldFromId(axis_ref) ;
+        if (field!=nullptr) field->solveGridReference() ;
         if (CAxis::has(axis_ref))
         {
@@ -1208 +1224 @@
       if (!scalar_ref.isEmpty())
       {
+        CField* field=CScalar::getFieldFromId(scalar_ref) ;
+        if (field!=nullptr) field->solveGridReference() ;
         if (CScalar::has(scalar_ref))
         {