Changeset 4065 for LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

Timestamp:

Jan 26, 2022, 4:00:14 PM (2 years ago)

Author:

Laurent Fairhead

Message:

Corrections to r4059/r4062 so that phylmdiso compiles
LF

File:

• LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -73 +73 @@
     USE tracinca_mod, ONLY: config_inca
     USE tropopause_m,     ONLY: dyn_tropopause
+    USE ice_sursat_mod,  ONLY: flight_init, airplane
     USE vampir
     USE VERTICAL_LAYERS_MOD, ONLY: aps,bps, ap, bp
@@ -167 +168 @@
        ! [Variables internes non sauvegardees de la physique]
        ! Variables locales pour effectuer les appels en serie
-       t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,tr_seri, &
+       t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,tr_seri,rneb_seri, &
        ! Dynamic tendencies (diagnostics)
        d_t_dyn,d_q_dyn,d_ql_dyn,d_qs_dyn,d_u_dyn,d_v_dyn,d_tr_dyn,d_rneb_dyn, &
@@ -514 +515 @@
     INTEGER isol          ! indice de traceurs pour eau glace
     PARAMETER (isol=3)
+    INTEGER irneb         ! indice de traceurs pour fraction nuageuse LS (optional)
+    PARAMETER (irneb=4)   
     !
     !
@@ -1393 +1396 @@
        ENDIF
 
-       IF ((iflag_ice_sursat.GT.0).AND.(iflag_ice_thermo.EQ.0)) THEN
-          WRITE (lunout, *) ' iflag_ice_sursat=1 requires iflag_ice_thermo=1 as well'
+       IF (ok_ice_sursat.AND.(iflag_ice_thermo.EQ.0)) THEN
+          WRITE (lunout, *) ' ok_ice_sursat=y requires iflag_ice_thermo=1 as well'
           abort_message='see above'
           CALL abort_physic(modname,abort_message,1)
        ENDIF
 
-       IF ((iflag_ice_sursat.GT.0).AND.(nqo.NE.4)) THEN
-          WRITE (lunout, *) ' iflag_ice_sursat=1 requires 4 H2O tracers ', &
+       IF (ok_ice_sursat.AND.(nqo.NE.4)) THEN
+          WRITE (lunout, *) ' ok_ice_sursat=y requires 4 H2O tracers ', &
                '(H2Ov, H2Ol, H2Oi, rnebi) but nqo=', nqo, '. Might as well stop here.'
           abort_message='see above'
@@ -2403 +2406 @@
           ELSE IF (nqo.eq.3) THEN
              qs_seri(i,k) = qx(i,k,isol)
+          ELSE IF (nqo.eq.4) THEN
+             qs_seri(i,k) = qx(i,k,isol)
+             rneb_seri(i,k) = qx(i,k,irneb)
           ENDIF
        ENDDO
@@ -4620 +4626 @@
     IF (ok_new_lscp) THEN
 
-    CALL lscp(phys_tstep,missing_value,paprs,pplay, &
+    CALL lscp(phys_tstep,missing_val,paprs,pplay, &
          t_seri, q_seri,ptconv,ratqs, &
          d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, rneb_seri, & 
@@ -4628 +4634 @@
          prfl, psfl, rhcl,  &
          zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cld_th, &
-         iflag_ice_thermo, iflag_ice_sursat)
+         iflag_ice_thermo, ok_ice_sursat)
 
     ELSE