Changeset 1972
- Timestamp:
- 11/04/20 14:45:50 (3 years ago)
- Location:
- XIOS/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/node/domain.cpp
r1852 r1972 1823 1823 CATCH_DUMP_ATTR 1824 1824 1825 void CDomain::initLonLatValue(void) 1826 TRY 1827 { 1828 CContext* context=CContext::getCurrent() ; 1829 1830 if (context->hasClient) 1831 { 1832 this->completeLonLatClient(); 1833 } 1834 1835 } 1836 CATCH_DUMP_ATTR 1825 1837 /*! 1826 1838 Compute the connection of a client to other clients to determine which clients to send attributes to. -
XIOS/trunk/src/node/domain.hpp
r1639 r1972 125 125 126 126 void fillInLonLat(); 127 void initLonLatValue(); 127 128 bool distributionAttributesHaveValue() const; 128 129 -
XIOS/trunk/src/transformation/domain_algorithm_expand.cpp
r1970 r1972 64 64 // Make sure domain source have all valid attributes 65 65 // domainSource->checkAllAttributes(); 66 domainSource->initLonLatValue(); 66 67 expandDomain->checkValid(domainDestination); 67 68 if (!expandDomain->i_periodic.isEmpty()) isXPeriodic_ = expandDomain->i_periodic; … … 186 187 int data_i_begin_src = domainSource->data_ibegin; 187 188 int data_j_begin_src = domainSource->data_jbegin; 188 CArray<double,1>& lon_src = domainSource->lonvalue _1d;189 CArray<double,1>& lat_src = domainSource->latvalue _1d;189 CArray<double,1>& lon_src = domainSource->lonvalue; 190 CArray<double,1>& lat_src = domainSource->latvalue; 190 191 CArray<double,1> lon_g; 191 192 CArray<double,1> lat_g; … … 195 196 { 196 197 CArray<double,1> lon = lon_src(Range(0,niSrc-1)); 197 //CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-niSrc,niSrc)); 198 CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-1)); 198 CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-niSrc,niSrc)); 199 199 CArray<double,2>& bounds_lon_src = domainSource->bounds_lon_1d; 200 200 CArray<double,2>& bounds_lat_src = domainSource->bounds_lat_1d; … … 330 330 //Pack data 331 331 int dataIdx = 0; 332 //data[dataIdx] = lon_src(idx);++dataIdx;333 //data[dataIdx] = lat_src(idx);++dataIdx;332 data[dataIdx] = lon_src(idx);++dataIdx; 333 data[dataIdx] = lat_src(idx);++dataIdx; 334 334 for (int i = 0; i < nVertex; ++i) 335 335 { -
XIOS/trunk/xios_test_suite/TEST_SUITE/test_domain_algo/context_atm.xml
r1971 r1972 84 84 85 85 <grid id="grid2D_expand"> 86 <domain ni_glo="36" nj_glo="18" type="rectilinear" lon_start="-175" lon_end="175" lat_start="-85" lat_end="85">86 <domain domain_ref="domain"> 87 87 <expand_domain order="1" type="node"/> 88 88 </domain> … … 372 372 373 373 <file id="atm_output_domain_transformation_expand" output_freq="12ts" type="one_file" enabled="true"> 374 <field field_ref="field2D" />375 374 <field id="field2D_expand" field_ref="field2D" grid_ref="grid2D_expand" /> 376 375 </file>
Note: See TracChangeset
for help on using the changeset viewer.