Changeset 2324

Timestamp:

May 15, 2020, 3:24:17 PM (5 years ago)

Author:

mvals

Message:

Mars GCM:
Follow-up of the last commit for the transport of the isotopic ratio: cleaning to help the user:
-initracer.F: hdo must be defined as an isotope (meaning its "father" has to be precised in traceur.def) and must be placed at the end of the list of
tracers in traceur.def.
-/deftank/traceur.def.isotopes: writing of traceur.def in the case of hdo=true has been simplified to match both the 3D and the 1D simulations.
-simpleclouds.F,hdo_surfex_mod.F,physiq_mod.F: thresholds of 1.e-16 have been replaced by the variable qperemin defined in tracer_mod.F.
MV

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• deftank/traceur.def.isotopes (modified) (1 diff)
• libf/phymars/hdo_surfex_mod.F (modified) (3 diffs)
• libf/phymars/initracer.F (modified) (1 diff)
• libf/phymars/physiq_mod.F (modified) (5 diffs)
• libf/phymars/simpleclouds.F (modified) (3 diffs)

trunk/LMDZ.MARS/README

@@ -3042 +3042 @@
 == 14/05/2020 == MV
 Follow-up of the last commit for the transport of the isotopic ratio: forgot the initialisation of zq0() in callsedim_mod.F !
+
+== 15/05/2020 == MV
+Follow-up of the last commit for the transport of the isotopic ratio: cleaning to help the user: 
+-initracer.F: hdo must be defined as an isotope (meaning its "father" has to be precised in traceur.def) and must be placed at the end of the list of tracers in traceur.def.
+-/deftank/traceur.def.isotopes: writing of traceur.def in the case of hdo=true has been simplified to match both the 3D and the 1D simulations.
+-simpleclouds.F,hdo_surfex_mod.F,physiq_mod.F: thresholds of 1.e-16 have been replaced by the variable qperemin defined in tracer_mod.F.
+

trunk/LMDZ.MARS/deftank/traceur.def.isotopes

@@ -1 +1 @@
 7
-10 10 co2 air
-10 10 h2o_ice air
-10 10 h2o_vap air
-10 10 dust_number air
-10 10 dust_mass air
-10 10 hdo_ice h2o_ice
-10 10 hdo_vap h2o_vap
+co2
+h2o_ice
+h2o_vap
+dust_number
+dust_mass
+hdo_ice h2o_ice
+hdo_vap h2o_vap

trunk/LMDZ.MARS/libf/phymars/hdo_surfex_mod.F

@@ -11 +11 @@
 
       use tracer_mod, only: igcm_h2o_vap, igcm_h2o_ice,
-     &                      igcm_hdo_vap, igcm_hdo_ice
-
+     &                      igcm_hdo_vap, igcm_hdo_ice,
+     &                      qperemin
       use surfdat_h, only: watercaptag
       use geometry_mod, only: longitude_deg,latitude_deg
@@ -70 +70 @@
             if (h2oflux(ig).le.0.) then
 
-               if (pqsurf(ig,igcm_h2o_ice).gt.1e-16) then
+               if (pqsurf(ig,igcm_h2o_ice).gt.qperemin) then
                 pdqsdif(ig,igcm_hdo_ice) =
      &            pdqsdif(ig,igcm_h2o_ice)*
@@ -111 +111 @@
                endif
 
-               if (old_h2o_vap(ig).gt.1.e-16) then
+               if (old_h2o_vap(ig).gt.qperemin) then
                          pdqsdif(ig,igcm_hdo_ice)=
      &                      alpha_c(ig)*pdqsdif(ig,igcm_h2o_ice)*

trunk/LMDZ.MARS/libf/phymars/initracer.F

@@ -433 +433 @@
            write(*,*) "Tracer H2O must be initialized before HDO"
            STOP
+        else if ((nqfils(igcm_h2o_ice).lt.1) 
+     &             .or. (nqfils(igcm_h2o_vap).lt.1)) then
+           write(*,*) "HDO must be transported as a son",
+     &                " of H2O: complete traceur.def"
+           STOP
+        else if ((igcm_hdo_ice.lt.nq-2) 
+     &             .or. (igcm_hdo_vap.lt.nq-2)) then
+           write(*,*) "The isotopes (HDO) must be placed at",
+     &                " the end of the list in traceur.def"
+           STOP
         endif
       endif

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -35 +35 @@
      &                      igcm_he, igcm_stormdust_mass,
      &                      igcm_stormdust_number, igcm_topdust_mass,
-     &                      igcm_topdust_number
+     &                      igcm_topdust_number,
+     &                      qperemin
       use comsoil_h, only: inertiedat, ! soil thermal inertia
      &                     tsoil, nsoilmx,!number of subsurface layers
@@ -2953 +2954 @@
             do l=1,nlayer
                 do ig=1,ngrid
-                if (zq(ig,l,igcm_h2o_vap).gt.1e-16) then 
+                if (zq(ig,l,igcm_h2o_vap).gt.qperemin) then 
                     DoH_vap(ig,l) = ( zq(ig,l,igcm_hdo_vap)/
      &              zq(ig,l,igcm_h2o_vap) )*1./(2.*155.76e-6)
@@ -2964 +2965 @@
             do l=1,nlayer
                 do ig=1,ngrid
-                if (zq(ig,l,igcm_h2o_ice).gt.1e-16) then
+                if (zq(ig,l,igcm_h2o_ice).gt.qperemin) then
                     DoH_ice(ig,l) = ( zq(ig,l,igcm_hdo_ice)/
      &                  zq(ig,l,igcm_h2o_ice) )/(2.*155.76e-6)
@@ -3590 +3591 @@
 C           Calculation of the D/H ratio
             do l=1,nlayer
-                if (zq(1,l,igcm_h2o_vap).gt.1e-16) then
+                if (zq(1,l,igcm_h2o_vap).gt.qperemin) then
                     DoH_vap(1,l) = 0.5*( zq(1,l,igcm_hdo_vap)/
      &                zq(1,l,igcm_h2o_vap) )/155.76e-6
@@ -3599 +3600 @@
 
             do l=1,nlayer
-                if (zq(1,l,igcm_h2o_ice).gt.1e-16) then
+                if (zq(1,l,igcm_h2o_ice).gt.qperemin) then
                     DoH_ice(1,l) = 0.5*( zq(1,l,igcm_hdo_ice)/
      &                  zq(1,l,igcm_h2o_ice) )/155.76e-6

trunk/LMDZ.MARS/libf/phymars/simpleclouds.F

@@ -6 +6 @@
       USE watersat_mod, ONLY: watersat
       use tracer_mod, only: igcm_h2o_vap, igcm_h2o_ice,
-     &                      igcm_hdo_vap, igcm_hdo_ice
+     &                      igcm_hdo_vap, igcm_hdo_ice,
+     &                      qperemin
       USE comcstfi_h
       use dimradmars_mod, only: naerkind
@@ -177 +178 @@
                 endif
                
-                if (zq0(ig,l,igcm_h2o_vap).gt.1.e-16) then
+                if (zq0(ig,l,igcm_h2o_vap).gt.qperemin) then
                   pdqcloud(ig,l,igcm_hdo_ice)= 
      &              pdqcloud(ig,l,igcm_h2o_ice)*alpha_c(ig,l)*
@@ -195 +196 @@
           else  ! sublimation
 
-             if (zq0(ig,l,igcm_h2o_ice).gt.1.e-16) then 
+             if (zq0(ig,l,igcm_h2o_ice).gt.qperemin) then 
                 pdqcloud(ig,l,igcm_hdo_ice)= 
      &               pdqcloud(ig,l,igcm_h2o_ice)*