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

Timestamp:

04/15/20 13:23:39 (4 years ago)

Author:

ymipsl

Message:

Some update...

YM

File:

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

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

@@ -71 +71 @@
          void checkEligibilityForCompressedOutput();
 
-         void solveDomainAxisRef(bool areAttributesChecked);
+
 
          void checkMaskIndex(bool doCalculateIndex);
@@ -89 +89 @@
          StdSize getDimension(void);
 
-         StdSize  getDataSize(void) const;
+         StdSize  getDataSize(void) ;
 
          /// Entrees-sorties de champs
          template <int n>
-         void inputField(const CArray<double,n>& field, CArray<double,1>& stored) const;
+         void inputField(const CArray<double,n>& field, CArray<double,1>& stored) ;
          template <int n>
-         void maskField(const CArray<double,n>& field, CArray<double,1>& stored) const;
+         void maskField(const CArray<double,n>& field, CArray<double,1>& stored) ;
          template <int n>
-         void outputField(const CArray<double,1>& stored, CArray<double,n>& field) const;  
+         void outputField(const CArray<double,1>& stored, CArray<double,n>& field) ;  
          template <int n>
-         void uncompressField(const CArray<double,n>& data, CArray<double,1>& outData) const; 
+         void uncompressField(const CArray<double,n>& data, CArray<double,1>& outData) ; 
 
          virtual void parse(xml::CXMLNode& node);
@@ -133 +133 @@
          void computeIndexScalarGrid();
          void computeWrittenIndex();
+         void solveDomainAxisRef(bool areAttributesChecked);
+         void checkElementsAttributes(void) ;
 
          void solveDomainRef(bool checkAtt);
          void solveAxisRef(bool checkAtt);
          void solveScalarRef(bool checkAtt);
-         void solveDomainAxisRefInheritance(bool apply = true);
-         void solveTransformations();
+         void solveElementsRefInheritance(bool apply = true);
+        // void solveTransformations();
          void solveDomainAxisBaseRef();
 
@@ -195 +197 @@
 
          void transformGrid(CGrid* transformGridSrc);
+         
+         void prepareTransformGrid(CGrid* transformGridSrc);
+         bool prepareTransformGrid_done_ = false ;
+
+         void makeTransformGrid(void); 
+         bool makeTransformGrid_done_ = false ;
+         
+         std::vector<std::string> getAuxInputTransformGrid(void) ; 
+
          void completeGrid(CGrid* transformGridSrc = 0);
          void doAutoDistribution(CGrid* transformGridSrc);
@@ -205 +216 @@
          bool hasTransform();
          size_t getGlobalWrittenSize(void) ;
+         bool checkIfCompleted(void) ;
+
 
          bool hasMask(void) const;
@@ -217 +230 @@
                                          const CArray<int,1>& axisDomainOrder);
 
+         void computeGridIndexToFileServer(CContextClient* client) ;
+
       private:
+       void computeClientDistribution(void) ;
+       bool computeClientDistribution_done_ = false ;
+
        template<int N>
        void checkGridMask(CArray<bool,N>& gridMask,
@@ -230 +248 @@
         void modifyGridMaskSize(CArray<bool,N>& gridMask, const std::vector<int>& eachDimSize, bool newValue);
 
-        void storeField_arr(const double* const data, CArray<double, 1>& stored) const;
-        void restoreField_arr(const CArray<double, 1>& stored, double* const data) const;
-        void uncompressField_arr(const double* const data, CArray<double, 1>& outData) const;
-        void maskField_arr(const double* const data, CArray<double, 1>& stored) const;
+        void storeField_arr(const double* const data, CArray<double, 1>& stored) ;
+        void restoreField_arr(const CArray<double, 1>& stored, double* const data) ;
+        void uncompressField_arr(const double* const data, CArray<double, 1>& outData) ;
+        void maskField_arr(const double* const data, CArray<double, 1>& stored) ;
 
         void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);
@@ -259 +277 @@
         int getDistributedDimension();
 
+       
         void computeClientIndex();
-        void computeConnectedClients();
+        bool computeClientIndex_done_ = false ;
+        
+        void computeConnectedClients(CContextClient* client);
+        set<CContextClient*> computeConnectedClients_done_ ;
+
         void computeClientIndexScalarGrid(); 
-        void computeConnectedClientsScalarGrid(); 
-
+        bool computeClientIndexScalarGrid_done_ = false ;
+
+        void computeConnectedClientsScalarGrid(CContextClient* client); 
+        set<CContextClient*> computeConnectedClientsScalarGrid_done_ ;
 
       public:
@@ -270 +295 @@
  *  Used to store field from model into the worklow, or to return field into models.  
  *  The size of the array is the number of local index of the workflow grid */        
-         CArray<int, 1> storeIndex_client_;
+        CArray<int, 1> storeIndex_client_;
+        void computeStoreIndex_client(void) ;
+        bool computeStoreIndex_client_done_ = false ;
+        CArray<int, 1>& getStoreIndex_client(void) { if (!computeStoreIndex_client_done_) computeStoreIndex_client() ; return storeIndex_client_ ;}
 
 /** Array containing the grid mask masked defined by the mask_nd grid attribute.        
   * The corresponding masked field value provided by the model will be replaced by a NaN value
   * in the workflow.  */
-         CArray<bool, 1> storeMask_client_;
+        CArray<bool, 1> storeMask_client_;
+        void computeStoreMask_client(void) ;
+        bool computeStoreMask_client_done_ = false ;
+        CArray<bool, 1>& getStoreMask_client(void) { if (!computeStoreMask_client_done_) computeStoreMask_client() ; return storeMask_client_ ;}
 
 /** Map containing the indexes on client side that will be sent to each connected server.
@@ -419 +450 @@
 
    template <int n>
-   void CGrid::inputField(const CArray<double,n>& field, CArray<double,1>& stored) const
+   void CGrid::inputField(const CArray<double,n>& field, CArray<double,1>& stored)
    TRY
    {
@@ -435 +466 @@
 
    template <int n>
-   void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored) const
+   void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored)
    {
 //#ifdef __XIOS_DEBUG
@@ -449 +480 @@
 
    template <int n>
-   void CGrid::outputField(const CArray<double,1>& stored, CArray<double,n>& field) const
+   void CGrid::outputField(const CArray<double,1>& stored, CArray<double,n>& field)
    TRY
    {
@@ -471 +502 @@
    */
    template <int N>
-   void CGrid::uncompressField(const CArray<double,N>& data, CArray<double,1>& outData) const
+   void CGrid::uncompressField(const CArray<double,N>& data, CArray<double,1>& outData)
    TRY
    {