Changeset 1918 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp

Timestamp:

07/16/20 17:18:01 (4 years ago)

Author:

ymipsl

Message:

Big update on on going work related to data distribution and transfer between clients and servers.

• move all related file into distribution directorie
• implement the concept of data "View"
• implement the concept of "connector" which make the data transfer between 2 differents "Views"

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp (modified) (6 diffs)

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

@@ -16 +16 @@
 #include "utils.hpp"
 #include "transformation_enum.hpp"
+#include "grid_local_connector.hpp"
+#include "grid_elements.hpp"
 
 namespace xios {
@@ -255 +257 @@
          void modifyMask(const CArray<int,1>& indexToModify, bool valueToModify = false);
          void modifyMaskSize(const std::vector<int>& newDimensionSize, bool newValue = false);
+        
+        /** get mask pointer stored in mask_1d, or mask_2d, or..., or mask_7d */
+         CArray<bool,1> mask_ ;
+         CArray<bool,1>& getMask(void) ;
 
          void computeGridGlobalDimension(const std::vector<CDomain*>& domains,
@@ -289 +295 @@
                           const CArray<int,1>& axisDomainOrder,
                           bool createMask = false);
+
         template<int N>
         void modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify, bool valueToModify);
@@ -500 +507 @@
 /** List order of axis and domain in a grid, if there is a domain, it will take value 2, axis 1, scalar 0 */
         std::vector<int> order_;
+
+      private:  
+        CGridLocalElements* gridLocalElements_= nullptr ;
+        void computeGridLocalElements(void) ;
+      public:
+        CGridLocalElements* getGridLocalElements(void) { if (gridLocalElements_==nullptr) computeGridLocalElements() ; return gridLocalElements_ ;}
+
+      private:
+        CGridLocalConnector* modelToWorkflowConnector_ ;
+      public:
+        void computeModelToWorkflowConnector(void) ;
+        CGridLocalConnector* getModelToWorkflowConnector(void) { if (modelToWorkflowConnector_==nullptr) computeModelToWorkflowConnector() ; return modelToWorkflowConnector_;}
 
    }; // class CGrid
@@ -521 +540 @@
    CATCH
 
+/* obsolete
    template <int n>
    void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored)
@@ -534 +554 @@
       this->maskField_arr(field.dataFirst(), stored);
    }
+*/
+   template <int n>
+   void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored)
+   {
+      auto connector = getModelToWorkflowConnector() ;
+
+      if (connector->getSrcSize() != field.numElements())
+         ERROR("void CGrid::inputField(const  CArray<double,n>& field, CArray<double,1>& stored) const",
+                << "[ Awaiting data of size = " << this->getDataSize() << ", "
+                << "Received data size = "      << field.numElements() << " ] "
+                << "The data array does not have the right size! "
+                << "Grid = " << this->getId())
+      const double nanValue = std::numeric_limits<double>::quiet_NaN();
+      connector->transfer(field, stored, nanValue) ;
+   }
+
+
 
    template <int n>