Changeset 1340 for XIOS/dev/XIOS_DEV_CMIP6

Timestamp:

11/21/17 14:08:25 (6 years ago)

Author:

ymipsl

Message:

Reduce the memory footprint on server level2.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• distribution_client.cpp (modified) (1 diff)
• distribution_client.hpp (modified) (1 diff)
• distribution_server.cpp (modified) (1 diff)
• distribution_server.hpp (modified) (1 diff)
• node/field.cpp (modified) (1 diff)
• node/grid.cpp (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/distribution_client.cpp

@@ -30 +30 @@
 CDistributionClient::~CDistributionClient()
 { /* Nothing to do */ }
+
+void CDistributionClient::partialClear()
+{
+  GlobalLocalMap void1 ;
+  GlobalLocalMap void2 ;
+  std::vector<int> void3 ;
+  std::vector<int> void4 ;
+
+  globalLocalDataSendToServerMap_.swap(void1) ;
+  globalDataIndex_.swap(void2) ;
+  localDataIndex_.swap(void3);
+  localMaskIndex_.swap(void4) ;
+}
 
 /*!

XIOS/dev/XIOS_DEV_CMIP6/src/distribution_client.hpp

@@ -56 +56 @@
                                      const int& dataDim, const int& ni, int& j);
     static int getAxisIndex(const int& dataIndex, const int& dataBegin, const int& ni);
+
+    void partialClear(void) ;  //! clear heavy sized attibutes
 
   protected:

XIOS/dev/XIOS_DEV_CMIP6/src/distribution_server.cpp

@@ -229 +229 @@
   return nZoomSize_;
 }
+
+void CDistributionServer::partialClear(void)
+{
+  GlobalLocalMap void1 ;
+  globalLocalIndexMap_.swap(void1) ;
+}
+  
 } // namespace xios

XIOS/dev/XIOS_DEV_CMIP6/src/distribution_server.hpp

@@ -50 +50 @@
     virtual void computeLocalIndex(CArray<size_t,1>& globalIndex);
     virtual void computeGlobalIndex(CArray<int,1>& indexes) const;
+    virtual void partialClear(void); //! clear heavy sized attibutes
 
   protected:

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

@@ -237 +237 @@
 
     this->setData(recv_data_tmp);
+    // delete incomming flux for server only
+    recvFoperationSrv.reset() ;
+    recvDataSrv.reset() ;
   }
 

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

@@ -18 +18 @@
 #include "grid_transformation.hpp"
 #include "grid_generate.hpp"
+#include "server.hpp"
 
 namespace xios {
@@ -826 +827 @@
          computeConnectedClients();
        }
+     }
+     if (CServer::serverLevel==2)
+     {
+       computeWrittenIndex() ;
+       if (serverDistribution_!=0) serverDistribution_->partialClear() ;
+       if (clientDistribution_!=0) clientDistribution_->partialClear() ;
+       outGlobalIndexFromClient.clear() ;
      }
    }
@@ -1250 +1258 @@
    }
 
+
   void CGrid::computeClientIndexScalarGrid()
   {