Changeset 4915

Timestamp:

Apr 22, 2024, 6:12:06 PM (8 months ago)

Author:

evignon

Message:

commit pour corriger definitivement le bug sur la fonte dans lscp
et supprimer la possibilite d'activer le bug via ok_bug_fonte_lscp

Location:

LMDZ6/trunk/libf/phylmd

Files:

• lmdz_lscp.F90 (modified) (4 diffs)
• lmdz_lscp_ini.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90

@@ -110 +110 @@
 USE lmdz_lscp_ini, ONLY : iflag_autoconversion, ffallv_con, ffallv_lsc, min_frac_th_cld
 USE lmdz_lscp_ini, ONLY : RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT, RD, RG
-USE lmdz_lscp_ini, ONLY : ok_poprecip, ok_bug_fonte_lscp
+USE lmdz_lscp_ini, ONLY : ok_poprecip
 
 IMPLICIT NONE
@@ -637 +637 @@
                     zrflcld(i)=zrflcld(i)+zmelt*ziflcld(i)
                     zrfl(i)=zrflclr(i)+zrflcld(i)
-                    IF (ok_bug_fonte_lscp) THEN
-                    ziflclr(i)=ziflclr(i)*(1.-zmelt)
-                    ziflcld(i)=ziflcld(i)*(1.-zmelt)
-                    zifl(i)=ziflclr(i)+ziflcld(i)
-                    ENDIF
                 ELSE
                     zrfl(i)=zrfl(i)+zmelt*zifl(i)
-                    IF (ok_bug_fonte_lscp) THEN
-                    zifl(i)=zifl(i)*(1.-zmelt)
-                    ENDIF
                 ENDIF
 
@@ -657 +649 @@
                 *RLMLT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))
                
-                IF (.NOT. ok_bug_fonte_lscp) THEN
                 IF (iflag_evap_prec.GE.4) THEN
                     ziflclr(i)=ziflclr(i)*(1.-zmelt)
@@ -664 +655 @@
                 ELSE
                     zifl(i)=zifl(i)*(1.-zmelt)
-                ENDIF
                 ENDIF
 

LMDZ6/trunk/libf/phylmd/lmdz_lscp_ini.F90

@@ -9 +9 @@
   !$OMP THREADPRIVATE(RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT, RD, RG, RPI)
   
-  LOGICAL, SAVE, PROTECTED :: ok_bug_fonte_lscp=.true. ! maintains bug on temperature adjustment associated with snow melting
-  !$OMP THREADPRIVATE(ok_bug_fonte_lscp)
-
   REAL, SAVE, PROTECTED :: seuil_neb=0.001      ! cloud fraction threshold: a cloud can precipitate when exceeded
   !$OMP THREADPRIVATE(seuil_neb)
@@ -319 +316 @@
     CALL getin_p('snow_fallspeed_clr',snow_fallspeed_clr)
     CALL getin_p('snow_fallspeed_cld',snow_fallspeed_cld)
-    CALL getin_p('ok_bug_fonte_lscp',ok_bug_fonte_lscp)
 
 
@@ -371 +367 @@
     WRITE(lunout,*) 'lscp_ini, snow_fallspeed_clr:', snow_fallspeed_clr
     WRITE(lunout,*) 'lscp_ini, snow_fallspeed_cld:', snow_fallspeed_cld
-    WRITE(lunout,*) 'lscp_ini, ok_bug_fonte_lscp:', ok_bug_fonte_lscp