Changeset 3164 for LMDZ6/branches


Ignore:
Timestamp:
Jan 29, 2018, 2:53:28 PM (7 years ago)
Author:
Laurent Fairhead
Message:

Update from IPSLCM6.0.15 Workflow tests
AC

Location:
LMDZ6/branches/IPSLCM6.0.15
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/IPSLCM6.0.15/DefLists/CMIP6_ping_atmos.xml

    r3160 r3164  
    150150   <field id="CMIP6_longitude"     field_ref="io_lon"              /> <!-- P1 (degrees_east) longitude : Longitude -->
    151151   <field id="CMIP6_lwsffluxaero"  field_ref="dummy_XY"         /> <!-- P2 (W m-2) longwave__flux__due_to_volcanic_aerosols_at_the_surface : downwelling longwave  flux  due to volcanic aerosols at the surface to be diagnosed through double radiation call -->
    152    <field id="CMIP6_lwsrfasdust"   field_ref="dummy_XY"         /> <!-- P1 (W m-2) surface_instantaneous_longwave_forcing_due_to_dust : Balkanski - LSCE -->
    153    <field id="CMIP6_lwsrfcsdust"   field_ref="dummy_XY"         /> <!-- P1 (W m-2) surface_instantaneous_longwave_forcing_due_to_dust_in_clearsky : Balkanski - LSCE -->
    154    <field id="CMIP6_lwtoaasdust"   field_ref="dummy_XY"         /> <!-- P1 (W m-2) toa_instantaneous_longwave_forcing : proposed name: toa_instantaneous_longwave_forcing_due_to_dust_ambient_aerosol -->
     152   <field id="CMIP6_lwsrfasdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) surface_instantaneous_longwave_forcing_due_to_dust : Balkanski - LSCE -->
     153   <field id="CMIP6_lwsrfcsdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) surface_instantaneous_longwave_forcing_due_to_dust_in_clearsky : Balkanski - LSCE -->
     154   <field id="CMIP6_lwtoaasdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) toa_instantaneous_longwave_forcing : proposed name: toa_instantaneous_longwave_forcing_due_to_dust_ambient_aerosol -->
    155155   <field id="CMIP6_lwtoacsaer"    field_ref="toplwad0"         /> <!-- P1 (W m-2) toa_instantaneous_longwave_forcing : proposed name: toa_instantaneous_longwave_forcing_due_to_ambient_aerosol_assuming_clear_sky -->
    156    <field id="CMIP6_lwtoacsdust"   field_ref="dummy_XY"         /> <!-- P1 (W m-2) toa_instantaneous_longwave_forcing_due_to_dust_in_clearsky : Balkanski - LSCE -->
     156   <field id="CMIP6_lwtoacsdust"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) toa_instantaneous_longwave_forcing_due_to_dust_in_clearsky : Balkanski - LSCE -->
    157157   <field id="CMIP6_lwtoafluxaerocs" field_ref="dummy_XY"       /> <!-- P1 (W m-2) longwave_flux_due_to_volcanic_aerosols_at_TOA_under_clear_sky : downwelling longwave flux due to volcanic aerosols at TOA under clear sky to be diagnosed through double radiation call -->
    158158   <field id="CMIP6_mc"            field_ref="mc"               /> <!-- P3 (kg m-2 s-1) atmosphere_net_upward_convective_mass_flux : The net mass flux should represent the difference between the updraft and downdraft components.  The flux is computed as the mass divided by the area of the grid cell. -->

  • LMDZ6/branches/IPSLCM6.0.15/DefLists/CMIP6_ping_atmosChem.xml

    r3146 r3164  
    3333   <field id="CMIP6_n2o"           field_ref="dummy_XYA"        /> <!-- P1 (mol mol-1) mole_fraction_of_nitrous_oxide_in_air : N2O volume mixing ratio -->
    3434   <field id="CMIP6_n2oglobal"     field_ref="N2O_ppb"         /> <!-- P1 (1e-09) mole_fraction_of_nitrous_oxide_in_air : Global mean Nitrous Oxide (N2O) -->
    35    <field id="CMIP6_o3"            field_ref="tro3/1.e9"        /> <!-- P1 (mol mol-1) mole_fraction_of_ozone_in_air : Ozone volume mixing ratio -->
     35   <field id="CMIP6_o3"            field_ref="tro3"> tro3/1.e9        </field> <!-- P1 (mol mol-1) mole_fraction_of_ozone_in_air : Ozone volume mixing ratio -->
    3636   <field id="CMIP6_oxloss"        field_ref="dummy_XYA"        /> <!-- P1 (mol m-3 s-1) tendency_of_mole_concentration_of_ozone_and_atomic_oxygen_and_1D_oxygen_atom_due_to_chemical_destruction : total chemical loss rate for o+o1d+o3 -->
    3737   <field id="CMIP6_oxprod"        field_ref="dummy_XYA"        /> <!-- P1 (mol m-3 s-1) tendency_of_mole_concentration_of_ozone_and_atomic_oxygen_and_1D_oxygen_atom_due_to_chemical_production_and_photolysis : total production rate of o+o1d+o3 including o2 photolysis and all o3 producing reactions -->

  • LMDZ6/branches/IPSLCM6.0.15/DefLists/context_lmdz.xml

    r3144 r3164  
    6363    <axis id="spectband" standard_name="Sensor Band Central Radiation Wavenumber" unit="m-1">
    6464    </axis>
     65    <axis id="axis_lat" standard_name="Latitude axis">
     66           <reduce_domain operation="average" direction="iDir" />
     67    </axis>
    6568
    6669<!-- Cosp axis definitions-->

  • LMDZ6/branches/IPSLCM6.0.15/libf/misc/wxios.F90

    r3003 r3164  
    286286        CALL xios_set_domain_attr_hdl(dom, nj_glo=nj_glo, jbegin=jbegin-1, nj=nj, data_dim=2)
    287287        CALL xios_set_domain_attr_hdl(dom, lonvalue_1d=io_lon(ibegin:iend), latvalue_1d=io_lat(jbegin:jend))
     288        !On definit un axe de latitudes pour les moyennes zonales
     289        IF (xios_is_valid_axis("axis_lat")) THEN
     290           CALL xios_set_axis_attr( "axis_lat", n_glo=nj_glo, n=nj, begin=jbegin-1, value=io_lat(jbegin:jend))
     291        ENDIF
     292
    288293        IF (.NOT.is_sequential) THEN
    289294            mask(:,:)=.TRUE.

  • LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/phys_output_ctrlout_mod.F90

    r3125 r3164  
    963963  TYPE(ctrl_out), SAVE :: o_rh2m = ctrl_out((/ 5, 5, 10, 10, 10, 10, 11, 11, 11, 11/), &
    964964    'rh2m', 'Relative humidity at 2m', '%', (/ ('', i=1, 10) /))
    965   TYPE(ctrl_out), SAVE :: o_rh2m_min = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11, 11/), &
    966     'rh2m_min', 'Min Relative humidity at 2m', '%',                        &
    967       (/ 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', &
    968          't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)' /))
    969   TYPE(ctrl_out), SAVE :: o_rh2m_max = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11, 11/), &
    970     'rh2m_max', 'Max Relative humidity at 2m', '%',                         &
    971       (/ 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', &
    972          't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)' /))
     965!  TYPE(ctrl_out), SAVE :: o_rh2m_min = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11, 11/), &
     966!    'rh2m_min', 'Min Relative humidity at 2m', '%',                        &
     967!      (/ 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', &
     968!         't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)' /))
     969!  TYPE(ctrl_out), SAVE :: o_rh2m_max = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11, 11/), &
     970!    'rh2m_max', 'Max Relative humidity at 2m', '%',                         &
     971!      (/ 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', &
     972!         't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)' /))
    973973  TYPE(ctrl_out), SAVE :: o_qsat2m = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11, 11/), &
    974974    'qsat2m', 'Saturant humidity at 2m', '%', (/ ('', i=1, 10) /))

  • LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/phys_output_write_mod.F90

    r3125 r3164  
    9898         o_cldemi, o_pr_con_l, o_pr_con_i, &
    9999         o_pr_lsc_l, o_pr_lsc_i, o_re, o_fl, &
    100          o_rh2m, o_rh2m_min, o_rh2m_max, &
     100         o_rh2m, &
    101101         o_qsat2m, o_tpot, o_tpote, o_SWnetOR, &
    102102         o_SWdownOR, o_LWdownOR, o_snowl, &
    … …  
    12201220       CALL histwrite_phy(o_rh2m, zx_tmp_fi2d)
    12211221
    1222        IF (vars_defined) THEN
    1223           DO i=1, klon
    1224              zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
    1225           ENDDO
    1226        ENDIF
    1227        CALL histwrite_phy(o_rh2m_min, zx_tmp_fi2d)
    1228 
    1229        IF (vars_defined) THEN
    1230           DO i=1, klon
    1231              zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
    1232           ENDDO
    1233        ENDIF
    1234        CALL histwrite_phy(o_rh2m_max, zx_tmp_fi2d)
     1222!       IF (vars_defined) THEN
     1223!          DO i=1, klon
     1224!             zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
     1225!          ENDDO
     1226!       ENDIF
     1227!       CALL histwrite_phy(o_rh2m_min, zx_tmp_fi2d)
     1228
     1229!       IF (vars_defined) THEN
     1230!          DO i=1, klon
     1231!             zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
     1232!          ENDDO
     1233!       ENDIF
     1234!       CALL histwrite_phy(o_rh2m_max, zx_tmp_fi2d)
    12351235
    12361236       CALL histwrite_phy(o_qsat2m, qsat2m)
Note: See TracChangeset for help on using the changeset viewer.