Changeset 1129 for XIOS/dev/dev_olga/src/node/grid.hpp

Timestamp:

05/11/17 18:25:20 (7 years ago)

Author:

mhnguyen

Message:

Updating two-level server.
Each client now can play the role of server: It can forward data to other clients or write data like a server.
Each client must combine all data received from other client(s) before forward them or write them on files

+) Correct some bugs of exchange data_index in domain and axis
+) Reorder some functions in context.cpp to make sure that all necessary attributes are available before computing index
+) Add the mapping index for client to write data.

Test
+) On Curie
+) test_client and test_complete
+) Mode:

• Only one level: Correct
• Two levels: Work if using ddt (bug)

+) Only zoom is tested but other transformations should work
+) No reading test

File:

• XIOS/dev/dev_olga/src/node/grid.hpp (modified) (6 diffs)

XIOS/dev/dev_olga/src/node/grid.hpp

@@ -140 +140 @@
          void computeIndexScalarGrid();
          void computeCompressedIndex();
+         void computeWrittenIndex();
 
          void solveDomainRef(bool checkAtt);
@@ -224 +225 @@
          std::vector<map<int,int> > nbSenders;
 
-         map<int, CArray<size_t, 1> > outIndexFromClient, compressedOutIndexFromClient;
+         map<int, CArray<size_t, 1> > outIndexFromClient, compressedOutIndexFromClient, outGlobalIndexFromClient;
+
+         // A client receives global index from other clients (via recvIndex)
+         // then does mapping these index into local index of STORE_CLIENTINDEX
+         // In this way, store_clientIndex can be used as an input of a source filter
+         // Maybe we need a flag to determine whether a client wants to write. TODO
+         map<int, CArray<size_t, 1> > outLocalIndexStoreOnClient; 
+
+         // If a client wants to write out data, it'll use this index.
+         // A client receives global index of data from other clients (via recvIndex),
+         // then does remapping these index into local index to WRITE into a file
+         CArray<size_t,1> localIndexToWriteOnClient, localIndexToWriteOnServer;
+
          CArray<size_t,1> indexFromClients;
          void checkMask(void);
          void createMask(void);
-         void modifyMask(const CArray<int,1>& indexToModify);
+         void modifyMask(const CArray<int,1>& indexToModify, bool valueToModify = false);
+         void modifyMaskSize(const std::vector<int>& newDimensionSize, bool newValue = false);
 
          void computeGridGlobalDimension(const std::vector<CDomain*>& domains,
@@ -243 +257 @@
                           bool createMask = false);
         template<int N>
-        void modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify);
+        void modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify, bool valueToModify);
+
+        template<int N>
+        void modifyGridMaskSize(CArray<bool,N>& gridMask, const std::vector<int>& eachDimSize, bool newValue);
 
         void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);
@@ -285 +302 @@
         std::set<std::string> relFilesCompressed;
 
-        bool isTransformed_;
-        bool isGenerated_;
+        bool isTransformed_, isGenerated_;
+        bool computedWrittenIndex_;
         std::vector<int> axisPositionInGrid_;
         CGridTransformation* transformations_;
@@ -416 +433 @@
    }
 
+   template<int N>
+   void CGrid::modifyGridMaskSize(CArray<bool,N>& gridMask,
+                                  const std::vector<int>& eachDimSize,
+                                  bool newValue)
+   {
+      if (N != eachDimSize.size())
+      {
+        // ERROR("CGrid::modifyGridMaskSize(CArray<bool,N>& gridMask,
+        //                                  const std::vector<int>& eachDimSize,
+        //                                  bool newValue)",
+        //       << "Dimension size of the mask is different from input dimension size." << std::endl
+        //       << "Mask dimension is " << N << "." << std::endl
+        //       << "Input dimension is " << eachDimSize.size() << "." << std::endl
+        //       << "Grid = " << this->GetName())
+      }
+      CArrayBoolTraits<CArray<bool,N> >::resizeArray(gridMask,eachDimSize);
+      gridMask = newValue;
+   }
+                                 
+
    /*!
      Modify the current mask of grid, the local index to be modified will take value false
@@ -422 +459 @@
    */
    template<int N>
-   void CGrid::modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify)
-   {
-     bool valueToModify = false;
+   void CGrid::modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify, bool valueToModify)
+   {     
      int num = indexToModify.numElements();
      for (int idx = 0; idx < num; ++idx)