Changeset 3117


Ignore:
Timestamp:
Dec 8, 2017, 2:04:01 PM (7 years ago)
Author:
musat
Message:

Back to the 3111 svn for the moment..
Keep 2corrections in CMIP6_ping_atmos.xml
IM

Location:
LMDZ6/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/trunk/DefLists/CMIP6_ping_atmos.xml

    r3116 r3117  
    5858   <field id="CMIP6_clcalipsoice"  field_ref="clcalipsoice"     /> <!-- P1 (%) ice_cloud_area_fraction_in_atmosphere_layer : CALIPSO ice cloud Fraction -->
    5959   <field id="CMIP6_clcalipsoliq"  field_ref="clcalipsoice"     /> <!-- P1 (%) liquid_cloud_area_fraction_in_atmosphere_layer : CALIPSO liquid cloud Fraction -->
    60    <field id="CMIP6_cldicemxrat"   field_ref="cldicemxrat"        /> <!-- P3 (1.0) cloud_ice_mixing_ratio : Cloud ice mixing ratio -->
     60   <field id="CMIP6_cldicemxrat"   field_ref="dummy_XYA"        /> <!-- P3 (1.0) cloud_ice_mixing_ratio : Cloud ice mixing ratio -->
    6161   <field id="CMIP6_cldnci"        field_ref="dummy_XY"         /> <!-- P1 (m-3) number_concentration_of_ice_crystals_in_air_at_ice_cloud_top : Concentration 'as seen from space' over ice-cloud portion of grid cell.  This is the value from uppermost model layer with ice cloud or, if available, it is the sum over all ice cloud tops, no matter where they occur, as long as they are seen from the top of the atmosphere. Weight by total ice cloud top fraction (as seen from TOA) of each time sample when computing monthly mean. -->
    6262   <field id="CMIP6_cldncl"        field_ref="cldncl"         /> <!-- P1 (m-3) number_concentration_of_cloud_liquid_water_particles_in_air_at_liquid_water_cloud_top : Droplets are liquid only.  Report concentration 'as seen from space' over liquid cloudy portion of grid cell.  This is the value from uppermost model layer with liquid cloud or, if available, it is better to sum over all liquid cloud tops, no matter where they occur, as long as they are seen from the top of the atmosphere. Weight by total liquid cloud top fraction of  (as seen from TOA) each time sample when computing monthly mean. -->
    6363   <field id="CMIP6_cldnvi"        field_ref="cldnvi"           /> <!-- P1 (m-2) atmosphere_number_content_of_cloud_droplets : Droplets are liquid only.  Values are weighted by liquid cloud fraction in each layer when vertically integrating, and for monthly means the samples are weighted by total liquid cloud fraction (as seen from TOA). -->
    64    <field id="CMIP6_cldwatmxrat"   field_ref="cldwatmxrat"        /> <!-- P2 (1.0) cloud_liquid_water_mixing_ratio : Cloud water mixing ratio -->
     64   <field id="CMIP6_cldwatmxrat"   field_ref="dummy_XYA"        /> <!-- P2 (1.0) cloud_liquid_water_mixing_ratio : Cloud water mixing ratio -->
    6565   <field id="CMIP6_clhcalipso"    field_ref="pclhcalipso"       /> <!-- P1 (%) cloud_area_fraction_in_atmosphere_layer : Percentage cloud cover in layer centred on 220hPa -->
    6666   <field id="CMIP6_cli"           field_ref="iwcon"            /> <!-- P1 (kg kg-1) mass_fraction_of_cloud_ice_in_air : Includes both large-scale and convective cloud. This is calculated as the mass of cloud ice in the grid cell divided by the mass of air (including the water in all phases) in the grid cell. It includes precipitating hydrometeors ONLY if the precipitating hydrometeors affect the calculation of radiative transfer in model. -->
    67    <field id="CMIP6_clic"          field_ref="icc3dcon"        /> <!-- P2 (1.0) mass_fraction_of_convective_cloud_ice_in_air : Calculated as the mass of convective cloud ice  in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  This includes precipitating hydrometeors ONLY if the precipitating hydrometeors affect the calculation of radiative transfer in model. -->
     67   <field id="CMIP6_clic"          field_ref="dummy_XYA"        /> <!-- P2 (1.0) mass_fraction_of_convective_cloud_ice_in_air : Calculated as the mass of convective cloud ice  in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  This includes precipitating hydrometeors ONLY if the precipitating hydrometeors affect the calculation of radiative transfer in model. -->
    6868   <field id="CMIP6_climodis"      field_ref="climodis"         /> <!-- P1 (%) ice_cloud_area_fraction : MODIS Ice Cloud Area Percentage -->
    69    <field id="CMIP6_clis"          field_ref="icc3dstra"        /> <!-- P2 (1.0) mass_fraction_of_stratiform_cloud_ice_in_air : Calculated as the mass of stratiform cloud ice  in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  This includes precipitating hydrometeors ONLY if the precipitating hydrometeors affect the calculation of radiative transfer in model. -->
     69   <field id="CMIP6_clis"          field_ref="dummy_XYA"        /> <!-- P2 (1.0) mass_fraction_of_stratiform_cloud_ice_in_air : Calculated as the mass of stratiform cloud ice  in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  This includes precipitating hydrometeors ONLY if the precipitating hydrometeors affect the calculation of radiative transfer in model. -->
    7070   <field id="CMIP6_clisccp"       field_ref="clisccp2"         /> <!-- P1 (%) cloud_area_fraction_in_atmosphere_layer : Percentage cloud cover in optical depth categories. -->
    7171   <field id="CMIP6_clivi"         field_ref="iwp"              /> <!-- P1 (kg m-2) atmosphere_cloud_ice_content : mass of ice water in the column divided by the area of the column (not just the area of the cloudy portion of the column). Includes precipitating frozen hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model. -->
     
    168168   <field id="CMIP6_od550so4so"    field_ref="dummy_not_provided"         /> <!-- P1 (1.0) missing : Balkanski - LSCE -->
    169169   <field id="CMIP6_od865dust"     field_ref="dummy_not_provided"         /> <!-- P1 (1.0) atmosphere_optical_thickness_due_to_dust_ambient_aerosol_particles : Balkanski - LSCE -->
    170    <field id="CMIP6_parasolRefl_sea" field_ref="parasol_refl"> parasol_refl*fract_oce </field> <!-- P1 (1.0) toa_bidirectional_reflectance : Simulated reflectance from PARASOL as seen at the top of the atmosphere for 5 solar zenith angles. Valid only over ocean and for one viewing direction (viewing zenith angle of 30 degrees and relative azimuth angle 320 degrees). -->
    171    <field id="HomeCMIP6_parasolCRefl" field_ref="parasol_crefl" /> <!-- P4 (1.0) toa_bidirectional_reflectance (integral) : Simulated reflectance from PARASOL as seen at the top of the atmosphere integrated over all 5 solar zenith angles. -->
     170   <field id="CMIP6_parasolRefl_sea" field_ref="parasolRefl"> parasolRefl*fract_oce </field> <!-- P1 (1.0) toa_bidirectional_reflectance : Simulated reflectance from PARASOL as seen at the top of the atmosphere for 5 solar zenith angles. Valid only over ocean and for one viewing direction (viewing zenith angle of 30 degrees and relative azimuth angle 320 degrees). -->
    172171   <field id="CMIP6_pctisccp"      field_ref="ctpisccp"         /> <!-- P1 (Pa) air_pressure_at_cloud_top : ISCCP Mean Cloud Top Pressure. Time-means are weighted by the ISCCP Total Cloud Fraction {:cltisccp} - see  http://cfmip.metoffice.com/COSP.html -->
    173172   <field id="CMIP6_pfull"         field_ref="pres"             /> <!-- P1 (Pa) air_pressure : Air pressure on model levels -->
     
    231230   <field id="CMIP6_rsdscsafbnd"   field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) surface_downwelling_shortwave_flux_in_air_assuming_clean_clear_sky : Calculated in the absence of aerosols and clouds, following Ghan (2013, ACP). This requires a double-call in the radiation code with precisely the same meteorology. -->
    232231   <field id="CMIP6_rsdscsbnd"     field_ref="dummy_not_provided"         /> <!-- P1 (W m-2) surface_downwelling_shortwave_flux_in_air_assuming_clear_sky : Calculated with aerosols but without clouds. This is a standard clear-sky calculation -->
    233    <field id="CMIP6_rsdscsdiff"    field_ref="rsdscsdiff"         /> <!-- P1 (W m-2) surface_diffuse_downwelling_shortwave_flux_in_air_assuming_clear_sky : unset -->
    234    <field id="CMIP6_rsdsdiff"      field_ref="rsdsdiff"         /> <!-- P1 (W m-2) surface_diffuse_downwelling_shortwave_flux_in_air : unset -->
     232   <field id="CMIP6_rsdscsdiff"    field_ref="dummy_XY"         /> <!-- P1 (W m-2) surface_diffuse_downwelling_shortwave_flux_in_air_assuming_clear_sky : unset -->
     233   <field id="CMIP6_rsdsdiff"      field_ref="dummy_XY"         /> <!-- P1 (W m-2) surface_diffuse_downwelling_shortwave_flux_in_air : unset -->
    235234   <field id="CMIP6_rsdt"          field_ref="SWdnTOA"          /> <!-- P1 (W m-2) toa_incoming_shortwave_flux : Shortwave radiation incident at the top of the atmosphere -->
    236235   <field id="CMIP6_rss"           field_ref="sols"             /> <!-- P1 (W m-2) surface_net_downward_shortwave_flux : Net downward shortwave radiation at the surface -->
  • LMDZ6/trunk/DefLists/field_def_lmdz.xml

    r3113 r3117  
    568568        <field id="lcc3dcon"    long_name="Convective cloud liquid fraction"    unit="1" />
    569569        <field id="lcc3dstra"    long_name="Stratiform cloud liquid fraction"    unit="1" />
    570         <field id="cldwatmxrat"    long_name="Cloud Water Mixing Ratio"    unit="1" />
    571         <field id="icc3dcon"    long_name="Mass Fraction of Convective Cloud Ice"    unit="kg/kg" />
    572         <field id="icc3dstra"    long_name="Mass Fraction of Stratiform Cloud Ice "    unit="kg/kg" />
    573         <field id="cldicemxrat"    long_name="Cloud Ice Mixing Ratio"    unit="1" />
    574570        <field id="clwcon"    long_name="Convective Cloud Liquid water content"    unit="kg/kg" />
    575571        <field id="Ma"    long_name="undilute adiab updraft"    unit="kg/m2/s" />
     
    808804
    809805    <field_group id="fields_solbnd_3D" grid_ref="grid_glo_spectband" >
    810       <field id="solbnd"    long_name="Top-of-Atmosphere Solar Insolation for each band" unit="W m-2" />
    811       <field id="rsdsdiff"  long_name="Surface Diffuse Downwelling Shortwave Radiation"  unit="W m-2" />
    812       <field id="rsdscsdiff" long_name="Surface Diffuse Downwelling Clear Sky Shortwave Radiation" unit="W m-2" />
     806      <field id="solbnd"    long_name="Top-of-Atmosphere Solar Insolation for each band"    unit="W m-2" />
    813807    </field_group>
    814808
  • LMDZ6/trunk/DefLists/file_def_histday_lmdz.xml

    r3113 r3117  
    512512                <field field_ref="lcc3dcon" level="6" />
    513513                <field field_ref="lcc3dstra" level="6" />
    514                 <field field_ref="cldwatmxrat" level="2" />
    515                 <field field_ref="icc3dcon" level="6" />
    516                 <field field_ref="icc3dstra" level="6" />
    517                 <field field_ref="cldicemxrat" level="2" />
    518514                <field field_ref="clwcon" level="10" />
    519515                <field field_ref="Ma" level="10" />
     
    626622                <field field_ref="rldcs4co2" level="10" />
    627623            </field_group>
    628 
    629             <!-- VARS 3D -->
    630             <field_group operation="average" freq_op="1ts" grid_ref="grid_glo_spectband">
    631                 <field field_ref="solbnd" level="4" />
    632                 <field field_ref="rsdsdiff" level="4" />
    633                 <field field_ref="rsdscsdiff" level="4" />
    634             </field_group>
    635 
    636624        </file>
    637625    </file_group>
  • LMDZ6/trunk/DefLists/file_def_histmth_lmdz.xml

    r3113 r3117  
    554554                <field field_ref="lcc3dcon" level="2" />
    555555                <field field_ref="lcc3dstra" level="2" />
    556                 <field field_ref="cldwatmxrat" level="2" />
    557                 <field field_ref="icc3dcon" level="2" />
    558                 <field field_ref="icc3dstra" level="2" />
    559                 <field field_ref="cldicemxrat" level="2" />
    560556                <field field_ref="clwcon" level="4" />
    561557                <field field_ref="Ma" level="4" />
     
    672668            <field_group operation="average" freq_op="1ts" grid_ref="grid_glo_spectband">
    673669                <field field_ref="solbnd" level="4" />
    674                 <field field_ref="rsdsdiff" level="4" />
    675                 <field field_ref="rsdscsdiff" level="4" />
    676670            </field_group>
    677671
  • LMDZ6/trunk/libf/phylmd/newmicro.F90

    r3113 r3117  
    1010  USE dimphy
    1111  USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
    12     reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra, zfice
     12    reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra
    1313  USE phys_state_var_mod, ONLY: rnebcon, clwcon
    1414  USE icefrac_lsc_mod ! computes ice fraction (JBM 3/14)
     
    152152  REAL zrho(klon, klev) !--rho pour la couche
    153153  REAL dh(klon, klev) !--dz pour la couche
     154  REAL zfice(klon, klev)
    154155  REAL rad_chaud(klon, klev) !--rayon pour les nuages chauds
    155156  REAL rad_chaud_pi(klon, klev) !--rayon pour les nuages chauds pre-industriels
     
    585586        lcc3dstra(i, k) = lcc3dstra(i, k) - lcc3dcon(i, k) ! eau liquide stratiforme
    586587        lcc3dstra(i, k) = max(lcc3dstra(i,k), 0.0)
    587         !
    588         icc3dcon(i, k) = rnebcon(i, k)*(1-phase3d(i, k))*clwcon(i, k) ! glace
    589                                                                       ! convective
    590         icc3dstra(i, k) = pclc(i, k)*pqlwp(i, k)*(1-phase3d(i, k))
    591         icc3dstra(i, k) = icc3dstra(i, k) - icc3dcon(i, k) ! glace stratiforme
    592         icc3dstra(i, k) = max( icc3dstra(i, k), 0.0)
    593         !
    594588        ! Compute cloud droplet radius as above in meter
    595589        radius = 1.1*((pqlwp(i,k)*pplay(i,k)/(rd*t(i,k)))/(4./3*rpi*1000.* &
     
    632626        IF (lcc3dcon(i,k)<=0.0) lcc3dcon(i, k) = 0.0
    633627        IF (lcc3dstra(i,k)<=0.0) lcc3dstra(i, k) = 0.0
    634         IF (icc3dcon(i,k)<=0.0) icc3dcon(i, k) = 0.0
    635         IF (icc3dstra(i,k)<=0.0) icc3dstra(i, k) = 0.0
    636628      END DO
    637629      IF (reffclwtop(i)<=0.0) reffclwtop(i) = 0.0
  • LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90

    r3113 r3117  
    140140      REAL, SAVE, ALLOCATABLE :: ZFSDN0(:,:),  ZFSUP0(:,:)      ! diag
    141141      !$OMP THREADPRIVATE(ZFSDN0,ZFSUP0)
    142       REAL, SAVE, ALLOCATABLE :: PSFSWDIR(:,:), PSFSWDIF(:,:)
    143       !$OMP THREADPRIVATE(PSFSWDIR, PSFSWDIF)
    144142!
    145143      REAL, SAVE, ALLOCATABLE :: stratomask(:,:)
     
    171169      REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
    172170      !$OMP THREADPRIVATE(lcc3dstra)
    173       REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
    174       !$OMP THREADPRIVATE(icc3dstra)
    175       REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
    176       !$OMP THREADPRIVATE(icc3dcon)
    177       REAL, SAVE, ALLOCATABLE :: zfice(:,:)
    178       !$OMP THREADPRIVATE(zfice)
    179171      REAL, SAVE, ALLOCATABLE :: od443aer(:)
    180172      !$OMP THREADPRIVATE(od443aer)
     
    524516USE phys_state_var_mod
    525517
    526       IMPLICIT NONE
    527       include "clesphys.h"
     518IMPLICIT NONE
    528519      ALLOCATE(t_seri(klon,klev),q_seri(klon,klev),ql_seri(klon,klev),qs_seri(klon,klev))
    529520      ALLOCATE(u_seri(klon,klev),v_seri(klon,klev))
     
    573564      ALLOCATE(ZLWFT0_i(klon,klev+1),ZSWFT0_i(klon,klev+1),ZFLDN0(klon,klev+1))
    574565      ALLOCATE(ZFLUP0(klon,klev+1),ZFSDN0(klon,klev+1),ZFSUP0(klon,klev+1))
    575       ALLOCATE(PSFSWDIR(klon,NSW), PSFSWDIF(klon,NSW))
    576566!
    577567      ALLOCATE(topswad_aero(klon), solswad_aero(klon))
     
    603593      ALLOCATE(lcc3dcon(klon, klev))
    604594      ALLOCATE(lcc3dstra(klon, klev))
    605       ALLOCATE(icc3dcon(klon, klev))
    606       ALLOCATE(icc3dstra(klon, klev))
    607       ALLOCATE(zfice(klon, klev))
    608595      ALLOCATE(od443aer(klon))
    609596      ALLOCATE(od550aer(klon))
     
    858845      DEALLOCATE(d_u_lif,d_v_lif)
    859846      DEALLOCATE(d_ts, d_tr)
    860       DEALLOCATE(ZLWFT0_i,ZSWFT0_i,ZFLDN0)
    861       DEALLOCATE(ZFLUP0,ZFSDN0,ZFSUP0)
    862       DEALLOCATE(PSFSWDIR, PSFSWDIF)
    863847      DEALLOCATE(topswad_aero,solswad_aero)
    864848      DEALLOCATE(topswai_aero,solswai_aero)
     
    884868      DEALLOCATE(lcc3dcon)
    885869      DEALLOCATE(lcc3dstra)
    886       DEALLOCATE(icc3dcon)
    887       DEALLOCATE(icc3dstra)
    888       DEALLOCATE(zfice)
    889870      DEALLOCATE(od443aer)
    890871      DEALLOCATE(od550aer)
  • LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

    r3113 r3117  
    14471447  TYPE(ctrl_out), SAVE :: o_lcc3dstra = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    14481448    'lcc3dstra', 'Stratiform cloud liquid fraction', '1', (/ ('', i=1, 10) /))
    1449   TYPE(ctrl_out), SAVE :: o_icc3dcon = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    1450     'icc3dcon', 'Mass Fraction of Convective Cloud Ice', &
    1451     'kg kg-1', (/ ('', i=1, 10) /))
    1452   TYPE(ctrl_out), SAVE :: o_icc3dstra = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    1453     'icc3dstra', 'Mass Fraction of Stratiform Cloud Ice', &
    1454     'kg kg-1', (/ ('', i=1, 10) /))
    1455   TYPE(ctrl_out), SAVE :: o_cldicemxrat = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    1456     'cldicemxrat', 'Cloud Ice Mixing Ratio', &
    1457     '1', (/ ('', i=1, 10) /))
    1458   TYPE(ctrl_out), SAVE :: o_cldwatmxrat = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    1459     'cldwatmxrat', 'Cloud Water Mixing Ratio', &
    1460     '1', (/ ('', i=1, 10) /))
    14611449  TYPE(ctrl_out), SAVE :: o_solbnd = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    14621450    'solbnd', 'Top-of-Atmosphere Solar Insolation for each band', 'W m-2', (/ ('', i=1, 10) /))
    1463   TYPE(ctrl_out), SAVE :: o_rsdsdiff = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    1464     'rsdsdiff', 'Surface Diffuse Downwelling Shortwave Radiation', 'W m-2', (/ ('', i=1, 10) /))
    1465   TYPE(ctrl_out), SAVE :: o_rsdscsdiff = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    1466     'rsdscsdiff', 'Surface Diffuse Downwelling Clear Sky Shortwave Radiation', 'W m-2', (/ ('', i=1, 10) /))
    14671451  TYPE(ctrl_out), SAVE :: o_stratomask = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
    14681452    'stratomask', 'Stratospheric fraction', '1', (/ ('', i=1, 10) /))
  • LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

    r3113 r3117  
    120120         o_swtoacf_zero, o_swsrfcf_zero, &
    121121         o_topswai, o_solswai, o_toplwai, o_sollwai, o_scdnc, &
    122          o_cldncl, o_reffclws, o_reffclwc, o_solbnd, &
    123          o_rsdsdiff, o_rsdscsdiff, o_stratomask,&
     122         o_cldncl, o_reffclws, o_reffclwc, o_solbnd, o_stratomask,&
    124123         o_cldnvi, o_lcc, o_lcc3d, o_lcc3dcon, &
    125          o_lcc3dstra, o_icc3dcon, o_icc3dstra, &
    126          o_cldicemxrat, o_cldwatmxrat, o_reffclwtop, o_ec550aer, &
     124         o_lcc3dstra, o_reffclwtop, o_ec550aer, &
    127125         o_lwcon, o_iwcon, o_temp, o_theta, &
    128126         o_ovapinit, o_ovap, o_oliq, o_ocond, o_geop, &
     
    279277         toplwad_aero, toplwad0_aero, sollwad_aero, &
    280278         sollwad0_aero, toplwai_aero, sollwai_aero, &
    281          scdnc, cldncl, reffclws, reffclwc, cldnvi, &
    282          PSFSWDIR, PSFSWDIF, stratomask,&
    283          lcc, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra, &
    284          zfice, reffclwtop, &
     279         scdnc, cldncl, reffclws, reffclwc, cldnvi, stratomask,&
     280         lcc, lcc3d, lcc3dcon, lcc3dstra, reffclwtop, &
    285281         ec550aer, flwc, fiwc, t_seri, theta, q_seri, &
    286282         ql_seri, qs_seri, tr_seri, &
     
    14101406          CALL histwrite_phy(o_lcc3dcon, lcc3dcon)
    14111407          CALL histwrite_phy(o_lcc3dstra, lcc3dstra)
    1412           CALL histwrite_phy(o_icc3dcon, icc3dcon)
    1413           CALL histwrite_phy(o_icc3dstra, icc3dstra)
    1414           CALL histwrite_phy(o_cldicemxrat, zfice)
    1415           zx_tmp_fi3d(:,:)=1-zfice(:,:)
    1416           CALL histwrite_phy(o_cldwatmxrat, zx_tmp_fi3d)
    14171408          CALL histwrite_phy(o_reffclwtop, reffclwtop)
    14181409       ENDIF
     
    14411432#ifdef CPP_RRTM
    14421433      IF (iflag_rrtm.EQ.1) THEN
    1443 
    14441434       IF (vars_defined) THEN
    14451435        DO ISW=1, NSW
     
    14481438        CALL histwrite_phy(o_solbnd, zx_tmp_fi3dsp)
    14491439       ENDIF
    1450 
    1451        IF (vars_defined) THEN
    1452         CALL histwrite_phy(o_rsdscsdiff, PSFSWDIR)
    1453        ENDIF
    1454 
    1455        IF (vars_defined) THEN
    1456         CALL histwrite_phy(o_rsdsdiff, PSFSWDIF)
    1457        ENDIF
    1458 
    14591440      ENDIF
    14601441#endif
  • LMDZ6/trunk/libf/phylmd/physiq_mod.F90

    r3112 r3117  
    8080       ZLWFT0_i,ZSWFT0_i,ZFLDN0,  &
    8181       ZFLUP0,ZFSDN0,ZFSUP0,      &
    82        PSFSWDIR, PSFSWDIF, &
    8382       !
    8483       topswad_aero,solswad_aero,   &
     
    37933792                                !-end
    37943793               ZLWFT0_i, ZFLDN0, ZFLUP0, &
    3795                ZSWFT0_i, ZFSDN0, ZFSUP0, &
    3796                PSFSWDIR, PSFSWDIF)
     3794               ZSWFT0_i, ZFSDN0, ZFSUP0)
    37973795
    37983796          !lwoff=y, betalwoff=1. : offset LW CRE for radiation code and other
     
    38783876                                !-end
    38793877                     ZLWFT0_i, ZFLDN0, ZFLUP0, &
    3880                      ZSWFT0_i, ZFSDN0, ZFSUP0, &
    3881                      PSFSWDIR, PSFSWDIF)
     3878                     ZSWFT0_i, ZFSDN0, ZFSUP0)
    38823879          endif !ok_4xCO2atm
    38833880       ENDIF ! aerosol_couple
  • LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

    r3112 r3117  
    4242!-end
    4343   ZLWFT0_i, ZFLDN0, ZFLUP0,&
    44    ZSWFT0_i, ZFSDN0, ZFSUP0,&
    45    PSFSWDIR, PSFSWDIF)
     44   ZSWFT0_i, ZFSDN0, ZFSUP0)
    4645
    4746
Note: See TracChangeset for help on using the changeset viewer.