Changeset 485 for trunk/LMDZ.MARS/libf

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/LMDZ.MARS/libf/phymars

Files:

• callkeys.h (modified) (2 diffs)
• inifis.F (modified) (1 diff)
• physiq.F (modified) (2 diffs)

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