Changeset 4003

Timestamp:

Nov 9, 2021, 5:26:20 PM (3 years ago)

Author:

Laurent Fairhead

Message:

Resolving some isotope issues introduced by r3999
LF

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• lscp_mod.F90 (added)
• lscp_tools_mod.F90 (added)
• phys_local_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

@@ -557 +557 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: cldemi, cldfra, cldtau, fiwc, fl, re, flwc
 !$OMP THREADPRIVATE(cldemi, cldfra, cldtau, fiwc, fl, re, flwc)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith
+!$OMP THREADPRIVATE(qlth, qith)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ref_liq, ref_ice, theta, zphi
 !$OMP THREADPRIVATE(ref_liq, ref_ice, theta, zphi)
@@ -898 +900 @@
       ALLOCATE(rain_lsc(klon))
       ALLOCATE(rain_num(klon))
+      ALLOCATE(qlth(klon,klev), qith(klon,klev))
+      !
 #ifdef ISO
       ALLOCATE(xtevap(ntraciso,klon))
@@ -1268 +1272 @@
       DEALLOCATE(rain_lsc)
       DEALLOCATE(rain_num)
+      DEALLOCATE(qlth, qith)
 !
       DEALLOCATE(sens_x, sens_w)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -75 +75 @@
     USE VERTICAL_LAYERS_MOD, ONLY: aps,bps, ap, bp
     USE write_field_phy
+    USE lscp_mod, ONLY : lscp
 
     !USE cmp_seri_mod
@@ -1059 +1060 @@
     !IM cf. AM 081204 BEG
     LOGICAL ptconvth(klon,klev)
+
+    REAL picefra(klon,klev)
     !IM cf. AM 081204 END
     !
@@ -4562 +4565 @@
 !ISO
 
+    picefra(:,:)=0.
+
+    IF (ok_new_lscp) THEN
+
+    CALL lscp(phys_tstep,paprs,pplay, &
+         t_seri, q_seri,ptconv,ratqs, &
+         d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, cldliq, picefra, &
+         rain_lsc, snow_lsc, &
+         pfrac_impa, pfrac_nucl, pfrac_1nucl, &
+         frac_impa, frac_nucl, beta_prec_fisrt, &
+         prfl, psfl, rhcl,  &
+         zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cld_th, &
+         iflag_ice_thermo)
+
+    ELSE
     CALL fisrtilp(phys_tstep,paprs,pplay, &
          t_seri, q_seri,ptconv,ratqs, &
@@ -4576 +4594 @@
 #endif      
      &   )
+    ENDIF
     !
     WHERE (rain_lsc < 0) rain_lsc = 0.
@@ -5295 +5314 @@
           ENDIF
           CALL newmicro (flag_aerosol, ok_cdnc, bl95_b0, bl95_b1, &
-               paprs, pplay, t_seri, cldliq, cldfra, &
+               paprs, pplay, t_seri, cldliq, picefra, cldfra, &
                cldtau, cldemi, cldh, cldl, cldm, cldt, cldq, &
                flwp, fiwp, flwc, fiwc, &
@@ -5303 +5322 @@
        ELSE
           CALL nuage (paprs, pplay, &
-               t_seri, cldliq, cldfra, cldtau, cldemi, &
+               t_seri, cldliq, picefra, cldfra, cldtau, cldemi, &
                cldh, cldl, cldm, cldt, cldq, &
                ok_aie, &