Changeset 753


Ignore:
Timestamp:
10/21/15 16:56:23 (6 years ago)
Author:
mhnguyen
Message:

Updating pole processing for rectangular grid source

Test
+) On Curie
+) test_remap passes

Location:
XIOS/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/inputs/REMAP/iodef.xml

    r744 r753  
    3232     </file> 
    3333     <file id="output_src_regular_tmp" name="output_src_regular_tmp"> 
    34         <field field_ref="tmp_field"/> 
     34<!--        <field field_ref="tmp_field"/>--> 
    3535     </file> 
    3636   </file_definition> 
     
    4242   <domain_definition> 
    4343     <domain id="src_domain" /> 
    44      <domain id="dst_domain" domain_src="src_domain"> 
     44     <domain id="dst_domain" domain_src="src_domain_regular"> 
    4545       <interpolate_domain/> 
    4646     </domain> 
    4747     <domain id="dst_domain_regular_pole" domain_src="src_domain" ni_glo="180" nj_glo="90" type="rectilinear"> 
    48        <generate_rectilinear_domain bounds_lat_start="-90" bounds_lat_end="90" lon_start="2" lon_end="360"/> 
     48       <generate_rectilinear_domain lat_start="-90" lat_end="90" lon_start="2" lon_end="360"/> 
    4949       <interpolate_domain/> 
    5050     </domain> 
     
    5454     </domain> 
    5555     <domain id="src_domain_regular" ni_glo="180" nj_glo="90" type="rectilinear"> 
    56        <generate_rectilinear_domain bounds_lat_start="-90" bounds_lat_end="90" lon_start="2" lon_end="360" /> 
     56       <generate_rectilinear_domain lat_start="-90" lat_end="90" lon_start="2" lon_end="360" /> 
    5757     </domain> 
    5858   </domain_definition> 
  • XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

    r743 r753  
    7676  else // if domain source is rectilinear, not do anything now 
    7777  { 
     78    bool isNorthPole = false; 
     79    bool isSouthPole = false; 
     80    if (poleValue == std::abs(domainSrc_->lat_start)) isNorthPole = true; 
     81    if (poleValue == std::abs(domainSrc_->lat_end)) isSouthPole = true; 
     82 
    7883    nVertexSrc = constNVertex; 
    79     domainSrc_->fillInRectilinearBoundLonLat(boundsLonSrc, boundsLatSrc); 
    80   } 
    81  
    82   bool isNorthPole = false; 
    83   bool isSouthPole = false; 
     84    domainSrc_->fillInRectilinearBoundLonLat(boundsLonSrc, boundsLatSrc, isNorthPole, isSouthPole); 
     85  } 
     86 
    8487  std::map<int,std::vector<std::pair<int,double> > > interpMapValueNorthPole; 
    8588  std::map<int,std::vector<std::pair<int,double> > > interpMapValueSouthPole; 
     
    116119  else 
    117120  { 
     121    bool isNorthPole = false; 
     122    bool isSouthPole = false; 
    118123    if (poleValue == std::abs(domainDest_->lat_start)) isNorthPole = true; 
    119124    if (poleValue == std::abs(domainDest_->lat_end)) isSouthPole = true; 
Note: See TracChangeset for help on using the changeset viewer.