Changeset 1972

Timestamp:

11/04/20 14:45:50 (3 years ago)

Author:

yushan

Message:

trunk : debug domain_expand

Location:

XIOS/trunk

Files:

• src/node/domain.cpp (modified) (1 diff)
• src/node/domain.hpp (modified) (1 diff)
• src/transformation/domain_algorithm_expand.cpp (modified) (4 diffs)
• xios_test_suite/TEST_SUITE/test_domain_algo/context_atm.xml (modified) (2 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -1823 +1823 @@
    CATCH_DUMP_ATTR
 
+   void CDomain::initLonLatValue(void)
+   TRY
+   {
+      CContext* context=CContext::getCurrent() ;
+
+      if (context->hasClient)
+      {
+        this->completeLonLatClient();
+      }
+
+   }
+   CATCH_DUMP_ATTR
   /*!
      Compute the connection of a client to other clients to determine which clients to send attributes to.

XIOS/trunk/src/node/domain.hpp

@@ -125 +125 @@
          
          void fillInLonLat();
+         void initLonLatValue();
          bool distributionAttributesHaveValue() const;
 

XIOS/trunk/src/transformation/domain_algorithm_expand.cpp

@@ -64 +64 @@
   // Make sure domain source have all valid attributes
   // domainSource->checkAllAttributes();
+  domainSource->initLonLatValue();
   expandDomain->checkValid(domainDestination);
   if (!expandDomain->i_periodic.isEmpty()) isXPeriodic_ = expandDomain->i_periodic;
@@ -186 +187 @@
   int data_i_begin_src = domainSource->data_ibegin;
   int data_j_begin_src = domainSource->data_jbegin;
-  CArray<double,1>& lon_src = domainSource->lonvalue_1d;
-  CArray<double,1>& lat_src = domainSource->latvalue_1d;
+  CArray<double,1>& lon_src = domainSource->lonvalue;
+  CArray<double,1>& lat_src = domainSource->latvalue;
   CArray<double,1> lon_g;
   CArray<double,1> lat_g;
@@ -195 +196 @@
   {
     CArray<double,1> lon = lon_src(Range(0,niSrc-1));
-    //CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-niSrc,niSrc));
-    CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-1));
+    CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-niSrc,niSrc));
     CArray<double,2>& bounds_lon_src = domainSource->bounds_lon_1d;
     CArray<double,2>& bounds_lat_src = domainSource->bounds_lat_1d;
@@ -330 +330 @@
     //Pack data
     int dataIdx = 0;
-    //data[dataIdx] = lon_src(idx);++dataIdx;
-    //data[dataIdx] = lat_src(idx);++dataIdx;
+    data[dataIdx] = lon_src(idx);++dataIdx;
+    data[dataIdx] = lat_src(idx);++dataIdx;
     for (int i = 0; i < nVertex; ++i)
     {

XIOS/trunk/xios_test_suite/TEST_SUITE/test_domain_algo/context_atm.xml

@@ -84 +84 @@
 
     <grid id="grid2D_expand">
-      <domain ni_glo="36" nj_glo="18" type="rectilinear" lon_start="-175" lon_end="175" lat_start="-85" lat_end="85">
+      <domain domain_ref="domain">
       <expand_domain order="1" type="node"/>
       </domain> 
@@ -372 +372 @@
 
    <file id="atm_output_domain_transformation_expand" output_freq="12ts" type="one_file" enabled="true">
-       <field field_ref="field2D" />
        <field id="field2D_expand" field_ref="field2D" grid_ref="grid2D_expand" />
     </file>