Changeset 2071 for trunk

Timestamp:

Jan 18, 2019, 2:18:01 PM (6 years ago)

Author:

aboissinot

Message:

Watersat subroutine is replaced by Psat_water in the thermal plume model.
cf. revision 1993 or 29/08/2018 JL comment.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/thermcell_env.F90 (modified) (3 diffs)
• libf/phystd/thermcell_plume.F90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/README

@@ -1442 +1442 @@
 - add comment in README for revisions 2066 and 2067
 - allocate f0 only if calltherm=true
-- remove useless flag "iflag_thermals_alim" in thermcell_alim, thermcell_mod and thermcell_plume 
+- remove useless flag "iflag_thermals_alim" in thermcell_alim, thermcell_mod and thermcell_plume
+- replace watersat subroutine by Psat_water in the thermal plume model, cf. revision 1993 or 29/08/2018 JL comment.

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

@@ -12 +12 @@
       USE print_control_mod, ONLY: prt_level
       USE thermcell_mod, ONLY: RKAPPA
-      USE watercommon_h, ONLY: RLvCp, RETV, watersat
+      USE watercommon_h, ONLY: RLvCp, RETV, Psat_water
       USE planete_mod, ONLY: preff
       
@@ -54 +54 @@
       INTEGER ig, ll
       
+      REAL dummy
+      
 !==============================================================================
 ! Initialization
@@ -75 +77 @@
       DO ll=1,nlay
          DO ig=1,ngrid
-            CALL watersat(pt(ig,ll), pplev(ig,ll), pqsat(ig,ll))
+            CALL Psat_water(pt(ig,ll), pplev(ig,ll), dummy, pqsat(ig,ll))
          ENDDO
       ENDDO

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

@@ -23 +23 @@
       USE ioipsl_getin_p_mod, ONLY : getin_p
       USE print_control_mod, ONLY: prt_level
-      USE watercommon_h, ONLY: RLvCp, RETV, watersat
+      USE watercommon_h, ONLY: RLvCp, RETV, Psat_water
       USE thermcell_mod
       
@@ -119 +119 @@
       REAL zltup                                ! useless here
       
+      REAL dummy
+      
       LOGICAL active(ngrid)                     ! if the plume is active at ig,l (speed and incoming mass flux > 0 or l=lmin)
       LOGICAL activetmp(ngrid)                  ! if the plus is active at ig,l (active=true and outgoing mass flux > 0)
@@ -239 +241 @@
          
          DO ig=1,ngrid
-            CALL watersat(ztemp(ig), pplev(ig,l), zqsat(ig))
+            CALL Psat_water(ztemp(ig), pplev(ig,l), dummy, zqsat(ig))
          ENDDO
          
@@ -431 +433 @@
          DO ig=1,ngrid
             IF (activetmp(ig)) THEN
-               CALL watersat(ztemp(ig), pplev(ig,l), zqsatth(ig,l))
+               CALL Psat_water(ztemp(ig), pplev(ig,l), dummy, zqsatth(ig,l))
             ENDIF
          ENDDO