Changeset 2315

Timestamp:

03/22/22 15:52:41 (2 years ago)

Author:

ymipsl

Message:

fix missing workflow dependcy when using grid_ref with field Id.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• field.cpp (modified) (1 diff)
• grid.cpp (modified) (1 diff)
• grid.hpp (modified) (1 diff)

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

@@ -1298 +1298 @@
     else
     {
+      CField* field=CGrid::getFieldFromId(grid_ref) ;
+      if (field!=nullptr) field->solveGridReference() ;
       if (CGrid::has(grid_ref)) this->grid_ = CGrid::get(grid_ref);
       else  ERROR("CField::solveGridReference(void)",

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

@@ -212 +212 @@
      if (CGrid::get(id,true)==nullptr) return false ;
      else return true ;
+   }
+   
+   CField* CGrid::getFieldFromId(const string& id)
+   {
+     const regex r("::");
+     smatch m;
+     if (regex_search(id, m, r))
+     {
+        if (m.size()!=1) ERROR("CField* CGrid::getFieldFromId(const string& id)", <<" id = "<<id<< "  -> bad format id, separator :: append more than one time");
+        string fieldId=m.prefix() ;
+        if (fieldId.empty()) ERROR("CField* CGrid::getFieldFromId(const string& id)", <<" id = "<<id<< "  -> bad format id, field name is empty");
+        string suffix=m.suffix() ;
+        if (!suffix.empty()) ERROR("CField* CGrid::getFieldFromId(const string& id)", <<" id = "<<id<< "  -> bad format id, suffix is not empty");
+        if (!CField::has(fieldId)) ERROR("CField* CGrid::getFieldFromId(const string& id)", <<" id = "<<id<< "  -> field Id : < "<<fieldId<<" > doesn't exist");
+        return CField::get(fieldId) ;
+     } 
+     else return nullptr ;
    }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp

@@ -144 +144 @@
          static CGrid* get(const string& id, bool noError=false) ; //<! return grid pointer using id
          static bool has(const string& id) ; //<! return if grid exist using id
+         static CField* getFieldFromId(const string& id) ; //<! return field id if used in grid reference
          static StdString generateId(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                                      const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder = CArray<int,1>());