Changeset 485

Timestamp:

Dec 20, 2011, 6:08:32 PM (14 years ago)

Author:

aslmd

Message:

LMDZ.MARS: added keyword tituscap. MESOSCALE: corrected a nasty bug in initializing surface deposits (no effect thus far because is set to 0 in surfini). also corrected mars=12 for ccn tracers NOT to be passed through boundaries. UTIL/PYTHON minor fix for redope.

Location:

trunk

Files:

• LMDZ.MARS/README (modified) (1 diff)
• LMDZ.MARS/libf/phymars/callkeys.h (modified) (2 diffs)
• LMDZ.MARS/libf/phymars/inifis.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/physiq.F (modified) (2 diffs)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F (modified) (2 diffs)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F (modified) (1 diff)
• UTIL/PYTHON/planetoplot.py (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -1356 +1356 @@
 >> new option in newstart: 'ini_h2osurf', water ice surface initialisation to keep seasonal frost 
    but get rid of polar cap positive or negative values.
+
+== 20/12/2011 == AS
+>> new option possible in callphys.def: tituscap [logical]
+.true. will call functions geticecover to yield a nice evolving CO2 cap as measured by Titus (mostly useful for mesoscale)
+.false. is the default option, so this change is transparent to the casual user

trunk/LMDZ.MARS/libf/phymars/callkeys.h

@@ -13 +13 @@
      &   ,lifting,callddevil,scavenging,sedimentation,activice,water    &
      &   ,microphys,caps,photochem,calltherm,outptherm,callrichsl       &
-     &   ,callslope
+     &   ,callslope,tituscap
      
       COMMON/callkeys_i/iradia,iaervar,iddist,ilwd,ilwb,ilwn,ncouche    &
@@ -25 +25 @@
      &   ,callnirco2,callnlte,callthermos,callconduct,                  &
      &    calleuv,callmolvis,callmoldiff,thermochem,thermoswater        &
-     &   ,calltherm,outptherm,callrichsl,callslope
+     &   ,calltherm,outptherm,callrichsl,callslope,tituscap
 
 

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

@@ -504 +504 @@
      &            frost_albedo_threshold
 
+! call Titus crocus line -- DEFAULT IS NONE
+         write(*,*) "Titus crocus line ?"
+         tituscap=.false.  ! default value
+         call getin("tituscap",tituscap)
+         write(*,*) "tituscap",tituscap
+
 !!!!!!!!!!!!!!!! TEMP !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!     

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

@@ -904 +904 @@
 c   -------------------------------------------
 
-#ifdef MESOSCALE
-      !!! get the actual co2 seasonal cap from Titus observations
-      CALL geticecover( ngrid, 180.*zls/pi,
+      IF (tituscap) THEN
+         !!! get the actual co2 seasonal cap from Titus observations
+         CALL geticecover( ngrid, 180.*zls/pi,
      .                  180.*long/pi, 180.*lati/pi, co2ice )
-      co2ice = co2ice * 10000.
-#endif
+         co2ice = co2ice * 10000.
+      ENDIF
 
       IF (callcond) THEN
@@ -1664 +1664 @@
      &                      'kg.m-2',2,
      &                       qsurf(1:ngridmx,igcm_h2o_ice))
+            if (photochem) then
+              do iq = 1,nq
+               call writediagfi( ngrid,trim(noms(iq)),
+     $                           'mix rat','units',
+     $                           3,zq(1:ngridmx,1:nlayermx,iq) )
+              enddo
+            endif
 #endif
 

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F

@@ -2709 +2709 @@
 ! .OR. ( (config_flags%mars .eq. 11) .AND. (is .EQ. 2) ) &    !! 11  pass only water vapor
  .OR. (  config_flags%mars .eq. 11                    ) &    !! 11  pass EVERYTHING
- .OR. (  config_flags%mars .eq. 12                    ) &    !! 12  pass EVERYTHING
+ .OR. (  (config_flags%mars .eq. 12) .AND. (is .LE. 5) ) &    !! 12  pass EVERYTHING except 2 ccn tracers
  .OR. config_flags%nested ) THEN                             !! *   pass all tracers if nested
          CALL relax_bdy_scalar ( scalar_tend(ims,kms,jms,is),            &
@@ -2770 +2770 @@
 !IF (      ((config_flags%mars .eq. 1 ) .and. (is .ne. 2))  &   
 !     .OR. ((config_flags%mars .eq. 11) .and. (is .ne. 2))  ) THEN
-IF ( config_flags%mars .gt. 50 ) THEN
+IF  ( ((config_flags%mars .eq. 12 ) .and. (is .ge. 6)) &
+      .OR. ( config_flags%mars .gt. 50 ) ) THEN
 
      !!! YOU HAVE TO ADD A CONDITION HERE IF YOU ADD A mars OPTION in REGISTRY  !!!

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F

@@ -927 +927 @@
     CASE(3)
     qsurf_val(:)=0.                !!! temporaire, a definir            
-    CASE(11-12) 
+    CASE(11) 
     qsurf_val(1)=0.
     qsurf_val(2)=MARS_WICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
     qsurf_val(3)=0.                !! not coupled with lifting for the moment [non remobilise]
+    qsurf_val(4)=0.
+    CASE(12)    
+    qsurf_val(1)=0.
+    qsurf_val(2)=MARS_WICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
+    qsurf_val(3)=0.                !! not coupled with lifting for the moment [non remobilise]
+    qsurf_val(4)=0.
+    qsurf_val(5)=0.
+    qsurf_val(6)=0.
     CASE(20)
     qsurf_val(:)=0.

trunk/UTIL/PYTHON/planetoplot.py

@@ -487 +487 @@
             ### dans le nouveau systeme time=ls,sol,lt cette ligne pourrait ne servir a rien (ou deplacer au dessus)
             if addchar and indextime is not None:   [addchar,gogol,gogol2] = getlschar ( all_namefile[index_f] )  ;  plottitle = plottitle + addchar
-            if ltst is not None and ( (mapmode == 0) or (proj in ["lcc","laea","merc","nsper"]) ):  plottitle = plottitle + "_LT" + str(ltst)
+            ### en fait redope is None doit etre remplace par : n'est ni maxt ni mint
+            if redope is None and ltst is not None and ( (mapmode == 0) or (proj in ["lcc","laea","merc","nsper"]) ):  plottitle = plottitle + "_LT" + str(ltst)
        else:
             if fileref is not None: