Changeset 1642 for XIOS/dev/branch_openmp/src/node/domain.hpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/node/domain.hpp (modified) (11 diffs)

XIOS/dev/branch_openmp/src/node/domain.hpp

@@ -17 +17 @@
 #include "transformation_enum.hpp"
 #include "server_distribution_description.hpp"
-#include "mpi_std.hpp"
 #include "mesh.hpp"
 
@@ -50 +49 @@
          {
            EVENT_ID_INDEX, EVENT_ID_LON, EVENT_ID_LAT, 
-           EVENT_ID_AREA, EVENT_ID_MASK,
+           EVENT_ID_AREA,
            EVENT_ID_DATA_INDEX, EVENT_ID_SERVER_ATTRIBUT
          } ;
@@ -143 +142 @@
          CArray<double, 1> areavalue;
 
-         CArray<size_t,1> localIndexToWriteOnServer;         
+         CArray<int,1> localIndexToWriteOnServer;
 
          CArray<bool, 1> domainMask; // mask_1d, mask_2d -> domainMask
@@ -152 +151 @@
          bool hasLonLat;
          bool hasPole ;
+         bool hasLatInReadFile_ ; // specify if latitude is defined on read file, so it can be read later when grid distribution will be defined
+         bool hasBoundsLatInReadFile_ ; // specify if latitude boundarues are defined on read file, so it can be read later when grid distribution will be defined
+         bool hasLonInReadFile_ ; // specify if longitude is defined on read file, so it can be read later when grid distribution will be defined
+         bool hasBoundsLonInReadFile_ ; // specify if longitude boundaries are defined on read file, so it can be read later when grid distribution will be defined
 
          void computeLocalMask(void) ;
@@ -166 +169 @@
          void checkArea(void);
          void checkLonLat();
-         void checkZoom(void);
 
          void setTransformations(const TransMapTypes&);         
@@ -173 +175 @@
          void sendIndex();
          void sendDistributionAttributes();
-         void sendMask();
          void sendArea();
          void sendLonLat();         
@@ -184 +185 @@
          static void recvDistributionAttributes(CEventServer& event);
          static void recvIndex(CEventServer& event);
-         static void recvIndexZoom(CEventServer& event);
-         static void recvMask(CEventServer& event);         
          static void recvLon(CEventServer& event);
          static void recvLat(CEventServer& event);
@@ -192 +191 @@
          void recvDistributionAttributes(CBufferIn& buffer);                  
          void recvIndex(std::map<int, CBufferIn*>& rankBuffers);         
-         void recvMask(std::map<int, CBufferIn*>& rankBuffers);
          void recvLon(std::map<int, CBufferIn*>& rankBuffers);
          void recvLat(std::map<int, CBufferIn*>& rankBuffers);
@@ -201 +199 @@
          void computeConnectedClients();    
 
-       private:
+       private:         
 
 /** Clients that have to send a domain. There can be multiple clients in case of secondary server, otherwise only one client. */
@@ -207 +205 @@
          std::set<CContextClient*> clientsSet;
 
-         bool doZoomByIndex_;
          bool isChecked, computedWrittenIndex_;
          std::set<StdString> relFiles, relFilesCompressed;
@@ -234 +231 @@
        private:
          static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m);
-         static bool initializeTransformationMap();
-         static std::map<StdString, ETranformationType> *transformationMapList_ptr;
-         #pragma omp threadprivate(transformationMapList_ptr)
+         static std::map<StdString, ETranformationType> transformationMapList_;
          static bool _dummyTransformationMapList;
-         #pragma omp threadprivate(_dummyTransformationMapList)
 
          DECLARE_REF_FUNC(Domain,domain)