Changeset 2790 for trunk/LMDZ.MARS/libf/phymars/dyn1d

Timestamp:

Sep 1, 2022, 5:22:23 PM (2 years ago)

Author:

jnaar

Message:

Minor change of 1d flag "atm_wat_profile" which can now be used to prescribe directly the desired MMR profile for water vapor. JN

File:

• trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -131 +131 @@
       Logical paleomars
 c   JN : Force atmospheric water profiles
-      INTEGER atm_wat_profile
+      REAL atm_wat_profile
       REAL,ALLOCATABLE :: zqsat(:) ! useful for (atm_wat_profile=2)
 
@@ -692 +692 @@
       call getin("atm_wat_profile",atm_wat_profile)
       write(*,*) "atm_wat_profile = ", atm_wat_profile
-      if (atm_wat_profile.EQ.0) then
+      if (atm_wat_profile.EQ.-1) then
         write(*,*) "Free atmospheric water vapor profile"
-      else if (atm_wat_profile.EQ.1) then
+        write(*,*) "Total water is conserved on the column"
+      else if (atm_wat_profile.EQ.0) then
         write(*,*) "Dry atmospheric water vapor profile"
-      else if (atm_wat_profile.EQ.2) then
-        write(*,*) "Wet atmospheric water vapor profile"
+      else if ((atm_wat_profile.GT.0).and.(atm_wat_profile.LE.1)) then
+        write(*,*) "Prescribed atmospheric water vapor MMR profile"
+        write(*,*) "Unless it reaches saturation (maximal value)"
+        write(*,*) "MMR chosen : ", atm_wat_profile
       endif 
 
@@ -769 +772 @@
         call watersat(nlayer,temp,play,zqsat)
         DO iq = 1, nq
-          IF ((iq.eq.igcm_h2o_vap).and.(atm_wat_profile.eq.1)) THEN
+          IF ((iq.eq.igcm_h2o_vap).and.(atm_wat_profile.eq.0)) THEN
             DO ilayer=1,nlayer
              q(ilayer,igcm_h2o_vap)=0.
 c             write(*,*) "atm_wat_profile dry"
-c             write(*,*) "iq (igcm_h2o_vap)", iq
             ENDDO! ilayer=1,nlayer
-          ELSE IF((iq.eq.igcm_h2o_vap).and.(atm_wat_profile.eq.2)) THEN
+          ELSE IF((iq.eq.igcm_h2o_vap).and.(atm_wat_profile.gt.0)
+     &             .and.(atm_wat_profile.le.1)) THEN
             DO ilayer=1,nlayer
-             q(ilayer,igcm_h2o_vap)=zqsat(ilayer)*0.7
+             q(ilayer,igcm_h2o_vap)=min(zqsat(ilayer),atm_wat_profile)
 c             write(*,*) "atm_wat_profile wet"
-c             write(*,*) "iq (igcm_h2o_vap)", iq
-c             q(ilayer,igcm_h2o_vap)=zqsat(ilayer)-0.9*zqsat(ilayer)
             ENDDO! ilayer=1,nlayer
-          ELSE IF ((iq.eq.igcm_h2o_ice).and.(atm_wat_profile.ne.0)) THEN
+          ELSE IF ((iq.eq.igcm_h2o_ice).and.
+     &                  (atm_wat_profile.ne.-1)) THEN
             DO ilayer=1,nlayer
              q(ilayer,igcm_h2o_ice)=0.
 c             write(*,*) "atm_wat_profile : reset ice"
-c             write(*,*) "iq (igcm_h2o_ice)", iq
             ENDDO! ilayer=1,nlayer
           ENDIF  !((iq.eq.igcm_h2o_vap).and.(atm_wat_profile.eq.2)) THEN
         ENDDO
+        CALL WRITEDIAGFI(ngrid,'qsat',
+     &                         'qsat',
+     &                         'kg/kg',1,zqsat)
+