Changeset 2720 for LMDZ5/branches/testing/libf/phylmd/fisrtilp.F90

Timestamp:

Nov 30, 2016, 1:28:41 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2664:2719 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/fisrtilp.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/fisrtilp.F90

@@ -15 +15 @@
   USE icefrac_lsc_mod ! compute ice fraction (JBM 3/14)
   USE print_control_mod, ONLY: prt_level, lunout
+  USE cloudth_mod 
+  USE ioipsl_getin_p_mod, ONLY : getin_p
   IMPLICIT none
   !======================================================================
@@ -145 +147 @@
   !$OMP THREADPRIVATE(appel1er)
   !
+! iflag_oldbug_fisrtilp=0 enleve le BUG par JYG : tglace_min -> tglace_max
+! iflag_oldbug_fisrtilp=1 ajoute le BUG
+  INTEGER,SAVE :: iflag_oldbug_fisrtilp=0 !=0 sans bug
+  !$OMP THREADPRIVATE(iflag_oldbug_fisrtilp)
   !---------------------------------------------------------------
   !
@@ -188 +194 @@
   if (prt_level>9)write(lunout,*)'NUAGES4 A. JAM'
   IF (appel1er) THEN
+     CALL getin_p('iflag_oldbug_fisrtilp',iflag_oldbug_fisrtilp)
+     write(lunout,*)' iflag_oldbug_fisrtilp =',iflag_oldbug_fisrtilp 
      !
      WRITE(lunout,*) 'fisrtilp, ninter:', ninter
@@ -574 +582 @@
            if (iflag_cld_th>=5) then
 
-              call cloudth(klon,klev,k,ztv, &
+              if (iflag_cloudth_vert<=2) then
+               call cloudth(klon,klev,k,ztv, &
                    zq,zqta,fraca, &
                    qcloud,ctot,zpspsk,paprs,ztla,zthl, &
                    ratqs,zqs,t)
-
+              elseif (iflag_cloudth_vert==3) then
+               call cloudth_v3(klon,klev,k,ztv, &
+                   zq,zqta,fraca, &
+                   qcloud,ctot,zpspsk,paprs,ztla,zthl, &
+                   ratqs,zqs,t)
+              endif
               do i=1,klon
                  rneb(i,k)=ctot(i,k)
@@ -624 +638 @@
                     zdelta = MAX(0.,SIGN(1.,t_glace_min_old-Tbef(i)))
                     else if (iflag_t_glace.ge.1) then
-                    zdelta = MAX(0.,SIGN(1.,t_glace_max-Tbef(i)))
-! BUG corrige par JYG   zdelta = MAX(0.,SIGN(1.,t_glace_min-Tbef(i)))
+                       if (iflag_oldbug_fisrtilp.EQ.0) then
+                          zdelta = MAX(0.,SIGN(1.,t_glace_max-Tbef(i)))
+                       else
+!avec bug : zdelta = MAX(0.,SIGN(1.,t_glace_min-Tbef(i)))
+                          zdelta = MAX(0.,SIGN(1.,t_glace_min-Tbef(i)))
+                       endif
                     endif
                  endif