Changeset 1956 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.hpp

Timestamp:

10/08/20 13:10:29 (4 years ago)

Author:

ymipsl

Message:

Xios coupling

• fix problem when sending grid mask from client to server

• remove methods about grid compression, which will be managed in other ways

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.hpp (modified) (4 diffs)

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

@@ -88 +88 @@
          bool isWrittenCompressed(const StdString& filename) const;
          bool isDistributed(void) const;
-         bool isCompressible(void) const;
+        
+        public:
+        /*!
+            \brief return if the axis can be written or not in a compressed way.
+            ie if there are some masked or indexed point on the domain. Valid only on server side.
+            \return true if domain can be writtedn in a compressed way
+         */ 
+         bool isCompressible(void) { if (!isCompressibleComputed_) computeIsCompressible() ; return isCompressible_ ;} 
+        private:
+         bool isCompressible_ ; /** specify if the domain can be written in a compressed way */ 
+         bool isCompressibleComputed_=false ; /** Indicate if compressability has been computed*/
+         void computeIsCompressible() ;
+        
+        public:
 
          /// Mutateur ///
@@ -120 +133 @@
                                     CServerDistributionDescription::ServerDistributionType disType = CServerDistributionDescription::BAND_DISTRIBUTION);
 
-         void checkEligibilityForCompressedOutput();
          size_t getGlobalWrittenSize(void) ;
 
@@ -213 +225 @@
          std::set<StdString> relFiles, relFilesCompressed;
          TransMapTypes transformationMap_;         
-         //! True if and only if the data defined on the axis can be outputted in a compressed way
-         bool isCompressible_;
 
          std::map<int, map<int,int> > nbSenders; // Mapping of number of communicating client to a server
@@ -254 +264 @@
        public:
          void computeRemoteElement(CContextClient* client, EDistributionType) ;
-         void distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, const string& axisId="") ;
+         void distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, CScattererConnector* &scattererConnector,
+                                 const string& axisId="") ;
 
          static void recvAxisDistribution(CEventServer& event) ;