Changeset 2092 for trunk/LMDZ.GENERIC/libf/phystd/thermcell_flux.F90

Timestamp:

Feb 7, 2019, 11:33:33 AM (6 years ago)

Author:

aboissinot

Message:

Uncomment two "corrections" (or "bidouilles" ccording to the author) in thermcell_flux. They are used only if
iflag_thermals_optflux is set to 0

Remove useless parameter fact_shell in thermcell_mod.

File:

• trunk/LMDZ.GENERIC/libf/phystd/thermcell_flux.F90 (modified) (6 diffs)

trunk/LMDZ.GENERIC/libf/phystd/thermcell_flux.F90

@@ -159 +159 @@
          
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-! AB : I comment the correction and replace it by an uncompromising test.
+! AB : I remove the correction and replace it by an uncompromising test.
 !      According to the previous derivations, we MUST have positive mass flux
 !      everywhere! Indeed, as soon as fm becomes negative, the plume stops.
@@ -186 +186 @@
 ! Test sur fraca constante ou croissante au-dessus de lalim
 !------------------------------------------------------------------------------
-! AB : do we have to decree that?
-!         IF (iflag_thermals_optflux.eq.0) THEN
-!            DO ig=1,ngrid
-!               IF (l.ge.lalim(ig).and.l.le.lmax(ig).and.(zw2(ig,l+1).gt.1.e-10).and.(zw2(ig,l).gt.1.e-10) ) THEN
-!                  zzz = fm(ig,l) * rhobarz(ig,l+1) * zw2(ig,l+1)              &
-!                  &   / (rhobarz(ig,l) * zw2(ig,l))
-!                  
-!                  IF (fm(ig,l+1).gt.zzz) THEN
-!                     detr(ig,l) = detr(ig,l) + fm(ig,l+1) - zzz
-!                     fm(ig,l+1) = zzz
-!                     ncorecfm4  = ncorecfm4 + 1
-!                  ENDIF
-!               ENDIF
-!            ENDDO
-!         ENDIF
+! AB : Do we have to decree that? If so, set iflag_thermals_optflux to 0
+         IF (iflag_thermals_optflux==0) THEN
+            DO ig=1,ngrid
+               IF (l.ge.lalim(ig).and.l.le.lmax(ig).and.(zw2(ig,l+1).gt.1.e-10).and.(zw2(ig,l).gt.1.e-10) ) THEN
+                  zzz = fm(ig,l) * rhobarz(ig,l+1) * zw2(ig,l+1)              &
+                  &   / (rhobarz(ig,l) * zw2(ig,l))
+                  
+                  IF (fm(ig,l+1).gt.zzz) THEN
+                     detr(ig,l) = detr(ig,l) + fm(ig,l+1) - zzz
+                     fm(ig,l+1) = zzz
+                     ncorecfm4  = ncorecfm4 + 1
+                  ENDIF
+               ENDIF
+            ENDDO
+         ENDIF
          
 !------------------------------------------------------------------------------
 ! Test sur flux de masse constant ou decroissant au-dessus de lalim
 !------------------------------------------------------------------------------
-! AB : do we have to decree that?
-!         IF (iflag_thermals_optflux==0) THEN
-!            DO ig=1,ngrid
-!               IF ((fm(ig,l+1).gt.fm(ig,l)).and.(l.gt.lalim(ig))) then
-!                  f_old = fm(ig,l+1)
-!                  fm(ig,l+1) = fm(ig,l)
-!                  detr(ig,l) = detr(ig,l) + f_old - fm(ig,l+1)
-!                  ncorecfm5  = ncorecfm5 + 1
-!               ENDIF
-!            ENDDO
-!         ENDIF
+! AB : Do we have to decree that? If so, set iflag_thermals_optflux to 0
+         IF (iflag_thermals_optflux==0) THEN
+            DO ig=1,ngrid
+               IF ((fm(ig,l+1).gt.fm(ig,l)).and.(l.gt.lalim(ig))) then
+                  f_old = fm(ig,l+1)
+                  fm(ig,l+1) = fm(ig,l)
+                  detr(ig,l) = detr(ig,l) + f_old - fm(ig,l+1)
+                  ncorecfm5  = ncorecfm5 + 1
+               ENDIF
+            ENDDO
+         ENDIF
          
 !------------------------------------------------------------------------------
@@ -488 +488 @@
       
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-! AB : test added to avoid problem when lmax = 0, which is not a
-!      fortran array index.
+! AB : test added to avoid problem when lmax = 0, which is not a fortran index.
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       IF (lmax(ig).gt.0) THEN
@@ -505 +504 @@
       IF (prt_level.ge.1) THEN
          
-! AB : those tests were removed for their uselessness.
+! AB : those outputs are commented for their uselessness.
 !         IF (ncorecfm2.ge.1) THEN
 !            print *, 'WARNING: Outgoing mass flux has negative value(s)!'
@@ -511 +510 @@
 !         ENDIF
          
-! AB : those tests were removed because I don't know if we should decree them.
-!         IF (ncorecfm4.ge.1) THEN
-!            print *, 'WARNING: Deacreasing updraft fraction above lalim!'
-!            print *, 'in', ncorecfm4, 'point(s)'
-!         ENDIF
-!         IF (ncorecfm5.ge.1) THEN
-!            print *, 'WARNING: Increasing mass flux above lalim!'
-!            print *, 'in', ncorecfm5, 'point(s)'
-!         ENDIF
+         IF (ncorecfm4.ge.1) THEN
+            print *, 'WARNING: Deacreasing updraft fraction above lalim!'
+            print *, 'in', ncorecfm4, 'point(s)'
+         ENDIF
+         
+         IF (ncorecfm5.ge.1) THEN
+            print *, 'WARNING: Increasing mass flux above lalim!'
+            print *, 'in', ncorecfm5, 'point(s)'
+         ENDIF
          
          IF (ncorecfm6.ge.1) THEN
@@ -526 +525 @@
          ENDIF
          
-! AB : that test was removed because I don't know if we should decree it.
+! AB : those outputs are commented because corresponding test is also commented.
 !         IF (ncorecfm7.ge.1) THEN
 !            print *, 'WARNING: Detrainment is greater than mass flux!'