Changeset 2311

Timestamp:

03/15/22 19:00:58 (2 years ago)

Author:

ymipsl

Message:

Add possibility to refer to a grid using the field which is attached to, using notation : "fieldId::"

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

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

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

@@ -365 +365 @@
     else if (hasFileOut()) return this->fileOut_ ;
     else return nullptr ;
+  }
+  CATCH
+
+  CGrid* CField::getAssociatedGrid(void) const
+  TRY
+  {
+    return this->grid_;
   }
   CATCH

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

@@ -104 +104 @@
          CGrid* getRelGrid(void) const;
          CFile* getRelFile(void) const;
+         CGrid* getAssociatedGrid(void) const ;
          CDomain* getAssociatedDomain(const std::string& domainId, bool noError=false) const;
          CAxis*   getAssociatedAxis(const std::string& axisId, bool noError=false) const;

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

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

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

@@ -142 +142 @@
          static CGrid* createGrid(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                                   const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder);
+         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 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>());