Changeset 1083

Timestamp:

04/07/17 17:30:28 (7 years ago)

Author:

mhnguyen

Message:

Correcting the bug on expanding domain by using data read from file

+) Make sure that data_dim is taken account on expanding domain

Test
+) Add a new test: test_expand_domain
+) On Ubuntu 16.04
+) Work.

Location:

XIOS/trunk

Files:

• bld.cfg (modified) (1 diff)
• inputs/EXPAND_DOMAIN (added)
• inputs/EXPAND_DOMAIN/iodef.xml (added)
• src/test/test_expand_domain.f90 (added)
• src/transformation/domain_algorithm_expand.cpp (modified) (8 diffs)

XIOS/trunk/bld.cfg

@@ -33 +33 @@
 bld::target generate_fortran_interface.exe 
 bld::target xios_server.exe 
-bld::target test_remap.exe
-bld::target test_regular.exe
-bld::target test_new_features.exe test_unstruct_complete.exe 
+#bld::target test_remap.exe
+#bld::target test_regular.exe
+#bld::target test_expand_domain.exe
+#bld::target test_new_features.exe test_unstruct_complete.exe 
 bld::target test_client.exe test_complete.exe test_xios2_cmip6.exe
-bld::target test_connectivity_expand.exe
+#bld::target test_connectivity_expand.exe
 bld::exe_dep
 

XIOS/trunk/src/transformation/domain_algorithm_expand.cpp

@@ -57 +57 @@
 
   this->type_ = (ELEMENT_MODIFICATION_WITH_DATA);
+  // Make sure domain source have all valid attributes
+  // domainSource->checkAllAttributes();
   expandDomain->checkValid(domainDestination);
   if (!expandDomain->i_periodic.isEmpty()) isXPeriodic_ = expandDomain->i_periodic;
   if (!expandDomain->j_periodic.isEmpty()) isYPeriodic_ = expandDomain->j_periodic;
-
+  
   switch (expandDomain->type)
   {
@@ -164 +166 @@
   int niSrc = domainSource->ni, ibegin = domainSource->ibegin;
   int njSrc = domainSource->nj, jbegin = domainSource->jbegin;
+  int dataDimSrc = domainSource->data_dim;
   CArray<bool,1>& mask_1d_src = domainSource->mask_1d;
   CArray<int,1>& i_index_src = domainSource->i_index;
@@ -190 +193 @@
   int nVertex       = bounds_lon_src.shape()[0];
   int oldNbLocal = i_index_src.numElements();
-  int dataIindexBoundSrc = max(i_index_src) - min(i_index_src);
-  int dataJindexBoundSrc = max(j_index_src) - min(j_index_src);
+  // Calculate ni, nj by using i_index and j_index
+  int niSrcByIndex = max(i_index_src) - min(i_index_src) + 1;
+  int njSrcByIndex = max(j_index_src) - min(j_index_src) + 1;  
+  int dataIindexBoundSrc = (1 == dataDimSrc) ? (niSrcByIndex * njSrcByIndex) : niSrcByIndex;
+  int dataJindexBoundSrc = (1 == dataDimSrc) ? (niSrcByIndex * njSrcByIndex) : njSrcByIndex;
 
   // Uncompress data_i_index, data_j_index
@@ -203 +209 @@
     int dataIidx = data_i_index_src(idx) + data_i_begin_src;
     int dataJidx = data_j_index_src(idx) + data_j_begin_src;
-    if ((0 <= dataIidx) && (dataIidx <= dataIindexBoundSrc) &&
-        (0 <= dataJidx) && (dataJidx <= dataJindexBoundSrc))
+    if ((0 <= dataIidx) && (dataIidx < dataIindexBoundSrc) &&
+        (0 <= dataJidx) && (dataJidx < dataJindexBoundSrc))
     {
       data_i_index_src_full(nbUnMaskedPointOnLocalDomain) = dataIidx;
@@ -263 +269 @@
       j_index_dst(idx) = j + jbegin;
     }
-
  
 
@@ -409 +414 @@
   
   // Finally, update data_i_index, data_j_index
+  int dataDstDim = domainDestination->data_dim;
   data_i_index_dst.resize(nbUnMaskedPointOnExtendedPart);
   data_j_index_dst.resize(nbUnMaskedPointOnExtendedPart); 
@@ -418 +424 @@
     if ((0 <= dataIIndex) && (0 <= dataJIndex))
     {
-      data_i_index_dst(count) = i_index_dst(idx) - i_index_dst(0);
-      data_j_index_dst(count) = j_index_dst(idx) - j_index_dst(0);
+      data_i_index_dst(count) = (1 == dataDstDim) ? idx : i_index_dst(idx) - i_index_dst(0);
+      data_j_index_dst(count) = (1 == dataDstDim) ? 0   : j_index_dst(idx) - j_index_dst(0);
       ++count;
     }
@@ -425 +431 @@
 
   // Update data_ni, data_nj
-  domainDestination->data_ni.setValue(niDst);
-  domainDestination->data_nj.setValue(njDst);
+  
+  domainDestination->data_ni.setValue((1==dataDstDim) ? niDst * njDst : niDst);
+  domainDestination->data_nj.setValue((1==dataDstDim) ? niDst * njDst : njDst);  
   domainDestination->data_ibegin.setValue(0);
   domainDestination->data_jbegin.setValue(0);
-
 
   // Update longitude and latitude