Changeset 2208

Timestamp:

Jan 7, 2020, 10:32:52 PM (5 years ago)

Author:

aslmd

Message:

MESOSCALE: adapted what was proposed in r2123. created a mode mars=42 for water vapour used in dynamics (what was proposed in r2123). moved back the default behaviour for Mars that was removed in r2123.

Location:

trunk/MESOSCALE/LMD_MM_MARS/SRC

Files:

• LES/modif_mars/Registry.EM.newphys (modified) (4 diffs)
• WRFV2/phys/module_lmd_driver.F.new (modified) (3 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/Registry.EM.newphys

@@ -133 +133 @@
 ####
 state  real  -         ikjftb  scalar  1  -  -                         -
-state  real  QH2O      ikjftb  scalar  1  -  i01rusdf=(bdy_interp:dt) "QH2O"       "Water vapor mixing ratio"   "kg kg-1"
-state  real  QH2O_ICE  ikjftb  scalar  1  -  i01rusdf=(bdy_interp:dt) "QH2O_ICE"   "Water ice mixing ratio"     "kg kg-1"
+state  real  QH2O      ikjftb  scalar  1  -  i01rhusdf=(bdy_interp:dt) "QH2O"       "Water vapor mixing ratio"   "kg kg-1"
+state  real  QH2O_ICE  ikjftb  scalar  1  -  i01rhusdf=(bdy_interp:dt) "QH2O_ICE"   "Water ice mixing ratio"     "kg kg-1"
 state  real  qdust     ikjftb  scalar  1  -  i01rhusdf=(bdy_interp:dt) "QDUST"      "Dust mixing ratio"          "kg kg-1"
 state  real  qdustn    ikjftb  scalar  1  -  i01rhusdf=(bdy_interp:dt) "QDUSTN"     "Dust number density"        " m-3 "
@@ -1047 +1047 @@
 state    real  CDA              ij      misc        1         -      r        "CDA"                   "DRAG COEFF AT LOWEST MODEL LVL"                      ""
 state    real  UST              ij      misc        1         -      r        "UST"                   "U* IN SIMILARITY THEORY"                      "m s-1"    
-state    real  USTM             ij      misc        1         -      r       "USTM"                  "U* IN SIMILARITY THEORY WITHOUT VCONV"        "m s-1"    #SAVEMARS2 ustar
+state    real  USTM             ij      misc        1         -      rh       "USTM"                  "U* IN SIMILARITY THEORY WITHOUT VCONV"        "m s-1"    #SAVEMARS2 ustar
 i1       real  HOL              ij      misc        1         -      -        "HOL"                   "PBL HEIGHT OVER MONIN-OBUKHOV LENGTH"         ""
 state    real  RMOL             ij      misc        1         -      r        "RMOL"                  "1./Monin Ob. Length"                      ""
@@ -1544 +1544 @@
 ##
 package   default      mars==0                      -              -
-package   water        mars==1                      -              scalar:qh2o,qh2o_ice;moist:qv,qc
+package   water        mars==1                      -              scalar:qh2o,qh2o_ice
 package   dust1        mars==2                      -              scalar:qdust
 package   dust2eq      mars==3                      -              scalar:qdust,qdustn
@@ -1552 +1552 @@
 package   radioac      mars==20                     -              scalar:qtrac1
 package   VenusPC      mars==34                     -              scalar:qco2,qco,qh2,qh2o,qo1d,qo,qo2,qo2dg,qo3,qh,qoh,qho2,qh2o2,qcl,qclo,qcl2,qhcl,qhocl,qclco,qclco3,qcocl2,qss,qso,qso2,qso3,qs2o2,qocs,qhso3,qh2so4,qs2,qclso2,qoscl,qh2oliq,qh2so4liq
+package   waterdyn     mars==42                     -              scalar:qh2o,qh2o_ice;moist:qv,qc
 ##### MARS OPTIONS
 ##### MARS OPTIONS

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

@@ -495 +495 @@
 IF (MARS_MODE .EQ. 0) THEN
     q_prof(:,1)=0.95
-ELSE
+ELSE IF (MARS_MODE .EQ. 42) THEN
     q_prof(:,1) = moist(i,kps:kpe,j,P_QV) !! the names were set above !! one dummy tracer in WRF
     q_prof(:,2) = SCALAR(i,kps:kpe,j,3) !! the names were set above !! one dummy tracer in WRF  
+ELSE
+    q_prof(:,1:nq) = SCALAR(i,kps:kpe,j,2:nq+1)  !! the names were set above !! one dummy tracer in WRF
 ENDIF
 
@@ -512 +514 @@
   ENDIF
 ENDIF
-
 
 IF (firstcall .EQV. .true.) THEN
@@ -805 +806 @@
       SCALAR(i,kps:kpe,j,2) = SCALAR(i,kps:kpe,j,2)*exp(-dt/tau_decay)
       SCALAR(i,1,j,2) = SCALAR(i,1,j,2) + 1. !! this tracer is emitted in the surface layer
-    CASE DEFAULT
+    CASE(42)
       moist(i,kps:kpe,j,P_QV)=moist(i,kps:kpe,j,P_QV)+zdqfi_omp(subs,kps:kpe,1)*dt  !!! here dt is needed
       scalar(i,kps:kpe,j,3)=scalar(i,kps:kpe,j,3)+zdqfi_omp(subs,kps:kpe,2)*dt  !!! here dt is needed
+    CASE DEFAULT
+      SCALAR(i,kps:kpe,j,2:nq+1)=SCALAR(i,kps:kpe,j,2:nq+1)+zdqfi_omp(subs,kps:kpe,1:nq)*dt !!! here dt is needed
   END SELECT
-    
+
 ENDDO
 ENDDO