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

Timestamp:

Jul 7, 2023, 6:32:57 PM (18 months ago)

Author:

jbclement

Message:

Minor fix of initialization of tracers indices + rework of atm_wat_profile. JBC

Location:

trunk/LMDZ.MARS/libf/phymars/dyn1d

Files:

• read_profile_mod.F90 (modified) (2 diffs)
• testphys1d.F (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/dyn1d/read_profile_mod.F90

@@ -39 +39 @@
 
   use infotrac, only: tname
-  use tracer_mod, only: igcm_co2
+  use tracer_mod, only: igcm_co2, igcm_h2o_vap, igcm_h2o_ice, &
+                        igcm_dust_number, igcm_dust_mass,     &
+                        igcm_ccn_number, igcm_ccn_mass
   implicit none
 !---------------------------------------------------------------------------------------------------------------------!
@@ -110 +112 @@
     if (ierr.eq.0) then
       read(91,*)qsurf(iq)
-      if (trim(name_tracer(iq)) == 'co2') then
-         igcm_co2 = iq
-      endif
+      if (trim(name_tracer(iq)) == 'co2') igcm_co2 = iq
+      if (trim(name_tracer(iq)) == 'h2o_vap') igcm_h2o_vap = iq
+      if (trim(name_tracer(iq)) == 'h2o_ice') igcm_h2o_ice = iq
+      if (trim(name_tracer(iq)) == 'dust_number') igcm_dust_number = iq
+      if (trim(name_tracer(iq)) == 'dust_mass') igcm_dust_mass = iq
+      if (trim(name_tracer(iq)) == 'ccn_number') igcm_ccn_number = iq
+      if (trim(name_tracer(iq)) == 'ccn_mass') igcm_ccn_mass = iq
       do ilayer = 1, nb_layer
         read(91,*)q(ilayer,iq)

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

@@ -196 +196 @@
       endif
 
-      write(*,*)'Do you want to start with a startfi and write 
-     &           a restartfi?'
+      write(*,*)'Do you want to start with a startfi and write
+     & a restartfi?'
       startfile_1D=.false.
       call getin("startfile_1D",startfile_1D)
@@ -885 +885 @@
       ENDDO
 
-c       Force atmospheric water if asked
-c       Added "atm_wat_profile" flag (JN)
-c       -------------------------------------
+!       Force atmospheric water if asked
+!       Added "atm_wat_profile" flag (JN)
+!       -------------------------------------
         call watersat(nlayer,temp,play,zqsat)
-        DO iq = 1, nq
-          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"
-            ENDDO! ilayer=1,nlayer
-          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)=min(zqsat(ilayer),atm_wat_profile)
-c             write(*,*) "atm_wat_profile wet"
-            ENDDO! ilayer=1,nlayer
-          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"
-            ENDDO! ilayer=1,nlayer
-          ENDIF  !((iq.eq.igcm_h2o_vap).and.(atm_wat_profile.eq.2)) THEN
-        ENDDO
-        CALL write_output('qsat',
-     &                         'qsat',
-     &                         'kg/kg',zqsat(:))
-
+        if (0. <= atm_wat_profile .and. atm_wat_profile <= 1.) then
+          q(:,igcm_h2o_vap) = min(zqsat(:),atm_wat_profile)
+!          write(*,*) "prescribed atm_wat_profile (wet if >0, dry if =0)"
+          q(:,igcm_h2o_ice) = 0.
+!          write(*,*) "atm_wat_profile: reset h2o ice"
+        endif
+!        CALL write_output('qsat',
+!     &                         'qsat',
+!     &                         'kg/kg',zqsat)
+!        CALL write_output('qvap',
+!     &                         'qvap',
+!     &                         'kg/kg',q(:,igcm_h2o_vap))