Changeset 567 for XIOS/trunk/src/node/file.cpp

Timestamp:

03/10/15 10:49:02 (9 years ago)

Author:

mhnguyen

Message:

Implementing a grid formed by only one axis or group of axis

+) Add several new attributes to axis. From now on, each axis can be distributed on client side
+) Modify mask of grid to make it more flexible to different dimension
+) Fix some bugs relating to calculation of local data index on client
+) Clean some redundant codes

Test
+) On Curie, only test_new_features.f90
+) Test cases:

• Grid composed of: 1 domain and 1 axis, 3 axis, 1 axis
• Mode: Attached and connected
• No of client-server: 6-2(Connected), 2 (Attached)

+) All tests passed and results are correct

File:

• XIOS/trunk/src/node/file.cpp (modified) (3 diffs)

XIOS/trunk/src/node/file.cpp

@@ -212 +212 @@
 
       allDomainEmpty=true ;
+
       set<CDomain*> setDomain ;
 
@@ -218 +219 @@
       {
          CField* field = *it;
-         allDomainEmpty&=field->grid->domain->isEmpty() ;
-         setDomain.insert(field->grid->domain) ;
+//         allDomainEmpty&=field->grid->domain->isEmpty() ;
+         allDomainEmpty&=(!field->grid->doGridHaveDataToWrite());
+         std::vector<CDomain*> vecDomain = field->grid->getDomains();
+         for (int i = 0; i < vecDomain.size(); ++i)
+            setDomain.insert(vecDomain[i]);
+//            setDomain.insert(field->grid->domain) ;
       }
       nbDomain=setDomain.size() ;
@@ -320 +325 @@
 
         bool append = !this->append.isEmpty() && this->append.getValue();
-        
+
          bool useClassicFormat = !format.isEmpty() && format == format_attr::netcdf4_classic;