Ignore:
Timestamp:
2015-06-15T23:17:23+02:00 (5 years ago)
Author:
hadcv
Message:

Undo the change to scalar output made at [5145]; it does not work for some cases, including XIOS parallel write

Location:
branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/CONFIG/SHARED/domain_def.xml

    r5409 r5425  
    55    <!--   My zoom: example of hand defined zoom   --> 
    66         <domain id="myzoom" zoom_ibegin="10" zoom_jbegin="10" zoom_ni="5" zoom_nj="5" /> 
     7         <domain id="1point" zoom_ibegin="10" zoom_jbegin="10" zoom_ni="1" zoom_nj="1" /> 
    78         <domain id="ptr" zoom_ibegin="0000"  zoom_jbegin="1" zoom_ni="1" zoom_nj="0000" /> 
    89         <!--   Eq section   --> 
     
    169170      </domain_group> 
    170171 
    171       <domain_group id="scalarpoint" long_name="scalar" zoom_ibegin="1" zoom_jbegin="1" zoom_ni="1" zoom_nj="1"> 
    172          <domain id="1point"/> 
    173          <domain id="globalscalar" /> 
     172      <domain_group id="scalarpoint"> 
     173         <domain id="scalarpoint" long_name="scalar"/> 
     174         <!-- 
     175         <domain id="1point" zoom_ibegin="1" zoom_jbegin="1" zoom_ni="1" zoom_nj="1" /> 
     176         --> 
    174177      </domain_group> 
    175178 
  • branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/CONFIG/SHARED/field_def.xml

    r5409 r5425  
    451451      <!-- scalar variables available with key_diaar5 --> 
    452452 
    453       <field_group id="scalar"  domain_ref="globalscalar" > 
     453      <field_group id="scalar"  domain_ref="1point" > 
    454454         <field id="voltot"     long_name="global total volume"                          standard_name="sea_water_volume"                               unit="m3"   /> 
    455455         <field id="sshtot"     long_name="global mean ssh"                              standard_name="global_average_sea_level_change"                unit="m"    /> 
     
    459459         <field id="temptot"    long_name="global mean temperature"                      standard_name="sea_water_potential_temperature"                unit="degC" /> 
    460460         <field id="saltot"     long_name="global mean salinity"                         standard_name="sea_water_salinity"                             unit="1e-3" /> 
    461          <field id="fram_trans" long_name="Sea Ice Mass Transport Through Fram Strait"   standard_name="sea_ice_transport_across_line"                  unit="kg/s"   domain_ref="1point" /> 
     461         <field id="fram_trans" long_name="Sea Ice Mass Transport Through Fram Strait"   standard_name="sea_ice_transport_across_line"                  unit="kg/s" /> 
    462462 
    463463          <!-- available with ln_diahsb --> 
     
    480480      <!-- LIM3 scalar variables --> 
    481481 
    482       <field_group id="SBC_scalar"  domain_ref="globalscalar" > 
     482      <field_group id="SBC_scalar"  domain_ref="1point" > 
    483483         <!-- available with ln_limdiaout --> 
    484484         <field id="ibgvoltot"    long_name="global mean ice volume"                                 unit="km3"        /> 
     
    881881     </field_group> 
    882882 
    883      <field_group id="PISCES_scalar"  domain_ref="globalscalar" > 
     883     <field_group id="PISCES_scalar"  domain_ref="1point" > 
    884884       <field id="pno3tot"         long_name="global mean nitrate concentration"                  unit="mol/m3"   /> 
    885885       <field id="psiltot"         long_name="global mean silicate concentration"                 unit="mol/m3"   /> 
  • branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r5413 r5425  
    11021102      CHARACTER(LEN=*), INTENT(in) ::   cdname 
    11031103      REAL(wp)        , INTENT(in) ::   pfield0d 
     1104      REAL(wp)        , DIMENSION(jpi,jpj) ::   zz     ! masson 
    11041105#if defined key_iomput 
    1105       CALL xios_send_field(cdname, (/pfield0d/))  
     1106     zz(:,:)=pfield0d 
     1107     CALL xios_send_field(cdname, zz) 
     1108      !CALL xios_send_field(cdname, (/pfield0d/))  
    11061109#else 
    11071110      IF( .FALSE. )   WRITE(numout,*) cdname, pfield0d   ! useless test to avoid compilation warnings 
     
    14161419      !! 
    14171420      !!---------------------------------------------------------------------- 
    1418       REAL(wp), DIMENSION(1)   ::   zz = 0. 
    1419       REAL(wp), DIMENSION(4,1) ::   z_lat, z_lon 
     1421      REAL(wp), DIMENSION(1)   ::   zz = 1. 
    14201422      !!---------------------------------------------------------------------- 
    14211423      CALL iom_set_domain_attr('scalarpoint', ni_glo=jpnij, nj_glo=1, ibegin=narea, jbegin=1, ni=1, nj=1) 
    1422       CALL iom_set_domain_attr('scalarpoint', data_dim=2, data_ibegin = 0, data_ni = 1, data_jbegin = 0, data_nj = 1) 
     1424      CALL iom_set_domain_attr('scalarpoint', data_dim=2, data_ibegin = 1, data_ni = 1, data_jbegin = 1, data_nj = 1) 
    14231425       
    1424       z_lon(1,:) = MINVAL(glamt) ; z_lon(2,:) = MAXVAL(glamt) ; z_lon(3,:) = MAXVAL(glamt) ; z_lon(4,:) = MINVAL(glamt) 
    1425       z_lat(1,:) = MINVAL(gphit) ; z_lat(2,:) = MINVAL(gphit) ; z_lat(3,:) = MAXVAL(gphit) ; z_lat(4,:) = MAXVAL(gphit) 
    1426  
    1427       IF( lk_mpp ) THEN 
    1428          CALL mpp_min( z_lon(1,1) ) ; CALL mpp_min( z_lon(4,1) ) ; CALL mpp_max( z_lon(2,1) ) ; CALL mpp_max( z_lon(3,1) ) 
    1429          CALL mpp_min( z_lat(1,1) ) ; CALL mpp_min( z_lat(2,1) ) ; CALL mpp_max( z_lat(3,1) ) ; CALL mpp_max( z_lat(4,1) ) 
    1430       ENDIF 
    1431  
    1432       CALL iom_set_domain_attr('globalscalar', lonvalue=zz, latvalue=zz, bounds_lon=z_lon, bounds_lat=z_lat, nvertex=4) 
    1433  
    14341426      zz=REAL(narea,wp) 
    1435       CALL iom_set_domain_attr('1point', lonvalue=zz, latvalue=zz) 
     1427      CALL iom_set_domain_attr('scalarpoint', lonvalue=zz, latvalue=zz) 
    14361428 
    14371429   END SUBROUTINE set_scalar 
Note: See TracChangeset for help on using the changeset viewer.