Changeset 1232 for XIOS/dev/XIOS_DEV_CMIP6/src/node/file.hpp

Timestamp:

07/31/17 17:59:25 (7 years ago)

Author:

mhnguyen

Message:

Fixing the blocking problem where there are more servers than the number of grid band distribution

+) Correct this problem not only for writing but also for reading
+) Allow "zero-size" domain, axis (i.e: domain, axis with ni = 0, and/or nj=0)

Test
+) On Curie
+) Work in both cases: Read and Write data

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/file.hpp (modified) (5 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/file.hpp

@@ -89 +89 @@
          void checkWriteFile(void);
          void checkReadFile(void);
-         void initFile(void);
+         void initWrite(void);
+         void initRead(void);
+         bool isEmptyZone();
 
          /// Mutateurs ///
@@ -97 +99 @@
 
          void createHeader(void);
-         void openInReadMode(MPI_Comm* readComm = NULL);
+         void openInReadMode(void);
          void close(void);
          void readAttributesOfEnabledFieldsInReadMode();
@@ -122 +124 @@
          void setContextClient(CContextClient* newContextClient);
          CContextClient* getContextClient();
+
+         void setReadContextClient(CContextClient* newContextClient);
+         CContextClient* getReadContextClient();
 
          // Send info to server         
@@ -162 +167 @@
          CDate lastSplit;
          int nbAxis, nbDomains;
-         bool isOpen;
-         bool allDomainEmpty;
+         bool isOpen;         
          MPI_Comm fileComm;
 
+      private:
+         void createSubComFile();
+         bool checkRead;
+         bool allZoneEmpty;
+         
       private :
          /// Propriétés privées ///
          CContextClient* client;
+         CContextClient* read_client; // Context client for reading (channel between server 1 and client)
          CFieldGroup* vFieldGroup;
          CVariableGroup* vVariableGroup;
@@ -175 +185 @@
          std::vector<CField*> enabledFields;
 
+
       public:
         //         virtual void toBinary  (StdOStream& os) const;