Changeset 2536 for trunk/LMDZ.GENERIC


Ignore:
Timestamp:
Jun 10, 2021, 1:02:31 PM (4 years ago)
Author:
adelavois
Message:

Physics is now allowed to run with water cycle but without radiatively active h2o clouds
callsedim previoulsy stopped if iaero_h2o=O and water=true

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/LMDZ.GENERIC/libf/phystd/callsedim.F

    r1764 r2536  
    7474        firstcall=.false.
    7575        ! add some tests on presence of required tracers/aerosols:
    76         if (water) then
    77           if (igcm_h2o_ice.eq.0) then
     76        if (water.and.(igcm_h2o_ice.eq.0)) then
    7877            write(*,*) "callsedim error: water=.true.",
    7978     &                 " but igcm_h2o_ice=0"
    8079          stop
    81           endif
    82           if (iaero_h2o.eq.0) then
    83             write(*,*) "callsedim error: water=.true.",
    84      &                 " but iaero_ho2=0"
    85           stop
    86           endif
    8780        endif
    8881      ENDIF ! of IF (firstcall)
     
    122115!======================================================================
    123116! Water         
    124           if (water.and.(iq.eq.igcm_h2o_ice)) then
     117       if (water.and.(iaero_h2o.ne.0).and.(iq.eq.igcm_h2o_ice)) then
    125118            ! compute radii for h2o_ice
    126119             call h2o_reffrad(ngrid,nlay,zqi(1,1,igcm_h2o_ice),zt,
     
    132125
    133126! General Case
    134           else
     127       else
    135128             call newsedim(ngrid,nlay,1,ptimestep,
    136129     &            pplev,masse,epaisseur,zt,radius(iq),rho_q(iq),
    137130     &            zqi(1,1,iq),wq)
    138           endif
     131       endif
    139132
    140133!=======================================================================
Note: See TracChangeset for help on using the changeset viewer.