Changeset 657 for XIOS/trunk/src/config/domain_attribute.conf

Timestamp:

07/28/15 13:37:07 (9 years ago)

Author:

mhnguyen

Message:

Making changes in domain to make sure unstructed grid work with new method of index distribution

+) Change the way define i_index and j_index of a domain
+) Remove some redundant attributes of domain
+) Adjust the way to calculate index distribution on server side

Test
+) Make some minor change to test_unstruct_complete to work with new XIOS
+) On Curie
+) All test pass and correct

File:

• XIOS/trunk/src/config/domain_attribute.conf (modified) (3 diffs)

XIOS/trunk/src/config/domain_attribute.conf

@@ -13 +13 @@
 /* LOCAL */
 DECLARE_ATTRIBUTE(int             , ibegin)
-DECLARE_ATTRIBUTE(int             , iend)
 DECLARE_ATTRIBUTE(int             , ni)
 
 /* LOCAL */
 DECLARE_ATTRIBUTE(int             , jbegin)
-DECLARE_ATTRIBUTE(int             , jend)
 DECLARE_ATTRIBUTE(int             , nj)
 
 
-DECLARE_ARRAY(int,2             , i_index)
-DECLARE_ARRAY(int,2             , j_index)
+DECLARE_ARRAY(int,1             , i_index)
+DECLARE_ARRAY(int,1             , j_index)
 
 /* LOCAL */
+DECLARE_ARRAY(bool, 1 , mask_1D)
+DECLARE_ARRAY(bool, 2 , mask_2D)
 DECLARE_ARRAY(bool, 2 , mask)
 
@@ -36 +36 @@
 DECLARE_ATTRIBUTE(int             , data_ibegin)
 DECLARE_ATTRIBUTE(int             , data_jbegin)
-
-/* GLOBAL */
-DECLARE_ATTRIBUTE(int             , zoom_ni)
-DECLARE_ATTRIBUTE(int             , zoom_nj)
-DECLARE_ATTRIBUTE(int             , zoom_ibegin)
-DECLARE_ATTRIBUTE(int             , zoom_jbegin)
-
-/* LOCAL */
-DECLARE_ATTRIBUTE(int             , zoom_ni_loc)
-DECLARE_ATTRIBUTE(int             , zoom_nj_loc)
-DECLARE_ATTRIBUTE(int             , zoom_ibegin_loc)
-DECLARE_ATTRIBUTE(int             , zoom_jbegin_loc)
 
 /* LOCAL */
@@ -62 +50 @@
 DECLARE_ARRAY(double, 2, area)
 
-DECLARE_ENUM3(type,regular,curvilinear,unstructured)
+DECLARE_ENUM3(type,regular,curvilinear,unstructured) //rectilinear
 DECLARE_ATTRIBUTE(StdString, domain_ref)