Changeset 485 for trunk/MESOSCALE/LMD_MM_MARS/SRC

Timestamp:

Dec 20, 2011, 6:08:32 PM (13 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/MESOSCALE/LMD_MM_MARS/SRC/WRFV2

Files:

• dyn_em/solve_em.F (modified) (2 diffs)
• phys/module_lmd_driver.F (modified) (1 diff)

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.