Changeset 2442 for XIOS2/trunk/src
- Timestamp:
- 12/13/22 11:32:58 (19 months ago)
- Location:
- XIOS2/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS2/trunk/src/test/generic_testcase.f90
r2440 r2442 1540 1540 jbegin=jbegin, nj=nj) 1541 1541 CALL xios_set_domain_attr(TRIM(domain_id), data_dim=2, lonvalue_1d=lon, latvalue_1d=lat, mask_1d=return_mask) 1542 CALL xios_set_domain_attr(TRIM(domain_id), bounds_lon_1d=bounds_lon, bounds_lat_1d=bounds_lat)1542 !CALL xios_set_domain_attr(TRIM(domain_id), bounds_lon_1d=bounds_lon, bounds_lat_1d=bounds_lat) 1543 1543 ENDIF 1544 1544 -
XIOS2/trunk/src/transformation/domain_algorithm_extract.cpp
r1852 r2442 135 135 if (!domainSrc_->bounds_lon_2d.isEmpty()) 136 136 { 137 domainDest_->bounds_lon_2d.resize(domain Dest_->nvertex, niDest, njDest);138 domainDest_->bounds_lon_2d.resize(domain Dest_->nvertex, niDest, njDest);137 domainDest_->bounds_lon_2d.resize(domainSrc_->bounds_lon_2d.shape()[0], niDest, njDest); 138 domainDest_->bounds_lon_2d.resize(domainSrc_->bounds_lon_2d.shape()[0], niDest, njDest); 139 139 } 140 140 else if (!domainSrc_->bounds_lon_1d.isEmpty()) 141 141 { 142 domainDest_->bounds_lon_1d.resize(domain Dest_->nvertex, niDest);143 domainDest_->bounds_lon_1d.resize(domain Dest_->nvertex, niDest);142 domainDest_->bounds_lon_1d.resize(domainSrc_->bounds_lon_1d.shape()[0], niDest); 143 domainDest_->bounds_lon_1d.resize(domainSrc_->bounds_lon_1d.shape()[0], niDest); 144 144 } 145 145 } … … 177 177 if (!domainSrc_->bounds_lon_2d.isEmpty()) 178 178 { 179 for (int n = 0; n < domainSrc_-> nvertex; ++n)179 for (int n = 0; n < domainSrc_->bounds_lon_2d.shape()[0]; ++n) 180 180 { 181 181 domainDest_->bounds_lon_2d(n,iDest,jDest) = domainSrc_->bounds_lon_2d(n,iSrc,jSrc); … … 185 185 else if (!domainSrc_->bounds_lon_1d.isEmpty()) 186 186 { 187 for (int n = 0; n < domainSrc_-> nvertex; ++n)187 for (int n = 0; n < domainSrc_->bounds_lon_1d.shape()[0]; ++n) 188 188 { 189 189 domainDest_->bounds_lon_1d(n,iDest) = domainSrc_->bounds_lon_1d(n,iSrc); -
XIOS2/trunk/src/transformation/domain_algorithm_interpolate.cpp
r1937 r2442 125 125 int niSrc = domainSrc_->ni.getValue(), njSrc = domainSrc_->nj.getValue(); 126 126 bool hasBoundSrc = domainSrc_->hasBounds; 127 if ( hasBoundSrc) nVertexSrc = domainSrc_->nvertex.getValue();127 if ((hasBoundSrc) && (!domainSrc_->nvertex.isEmpty())) nVertexSrc = domainSrc_->nvertex.getValue(); // default is constNVertex = 4 128 128 CArray<double,2> boundsLonSrc(nVertexSrc,localDomainSrcSize); 129 129 CArray<double,2> boundsLatSrc(nVertexSrc,localDomainSrcSize); … … 197 197 int niDest = domainDest_->ni.getValue(), njDest = domainDest_->nj.getValue(); 198 198 bool hasBoundDest = domainDest_->hasBounds; 199 if ( hasBoundDest) nVertexDest = domainDest_->nvertex.getValue();199 if ((hasBoundDest) && (!domainDest_->nvertex.isEmpty())) nVertexDest = domainDest_->nvertex.getValue(); // default is constNVertex = 4 200 200 CArray<double,2> boundsLonDest(nVertexDest,localDomainDestSize); 201 201 CArray<double,2> boundsLatDest(nVertexDest,localDomainDestSize); -
XIOS2/trunk/src/transformation/domain_algorithm_zoom.cpp
r1852 r2442 5 5 #include "grid_transformation_factory_impl.hpp" 6 6 #include "attribute_template.hpp" 7 #include "type.hpp" 7 8 8 9 namespace xios { … … 146 147 if (domainSrc_->hasBounds) 147 148 { 148 nvertex = domainSrc_->nvertex;149 nvertex = ( domainSrc_->type==CDomain::type_attr::rectilinear || domainSrc_->type==CDomain::type_attr::curvilinear) ? 4 : domainSrc_->nvertex ; 149 150 domainDest_->nvertex.setValue(nvertex); 150 151 if (!domainSrc_->bounds_lon_1d.isEmpty())
Note: See TracChangeset
for help on using the changeset viewer.