Changeset 73 for trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/phys

Timestamp:

Feb 20, 2011, 12:20:51 PM (14 years ago)

Author:

aslmd

Message:

LMD_MM_MARS: corrections cycle de l'eau propagees a la nouvelle physique. + corrections readmeteo.F90 [version synchronisee precedemment n etait pas la plus a jour] + corrections api.F90 pour avoir cp, R comme GCM

File:

• trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F (modified) (4 diffs)

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

@@ -154 +154 @@
 !-------------------------------------------
    INTEGER ::    i,j,k,its,ite,jts,jte,ij
-   INTEGER ::    subs
+   INTEGER ::    subs,iii
 
    ! *** for LMD physics
@@ -623 +623 @@
     CASE(0)  !! NO TRACERS (mars=0)
       wtnom(nq) = 'co2'
+    CASE(1)
+      wtnom(1) = 'h2o_vap'  
+      wtnom(2) = 'h2o_ice'
+    CASE(2)
+      wtnom(1) = 'dust'      
     CASE(11) !! newwater mars==11 scalar:qh2o,qh2o_ice,qdust,qdust_number,qco2
       wtnom(nq) = 'co2'
@@ -665 +670 @@
 #ifdef NEWPHYS
 q_prof(:,1:nq) = SCALAR(i,kps:kpe,j,2:nq+1)  !! the names were set above !! one dummy tracer in WRF
-q_prof(:,nq) = 0.95 !! cas du CO2 !! TEMPORAIRE
+  !!! CAS DU CO2
+  DO iii=1,nq 
+   IF ( wtnom(iii) .eq. 'co2' ) q_prof(:,iii) = 0.95
+  ENDDO
 #else
 SELECT CASE (MARS_MODE)
@@ -790 +798 @@
 ! Tracer at surface !
 !-------------------!
-#ifdef NEWPHYS
-  !!! a faire !!!
-  PRINT *, 'WARNING WARNING no tracer at surface'
-  qsurf_val(:)=0.
-#else
 SELECT CASE (MARS_MODE)
     CASE(0)  !! NO TRACERS (mars=0)
     qsurf_val(:)=0.
     CASE(1)  !! WATER CYCLE (mars=1)
+#ifdef NEWPHYS    
+    qsurf_val(2)=MARS_WICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
+    qsurf_val(1)=0.
+#else
     qsurf_val(2)=MARS_WICE(i,j)    !! attention... H2O ice is tracer nqmx in qsurf in LMD physics
-    qsurf_val(1)=0.                
+    qsurf_val(1)=0.
+#endif    
     CASE(2)  !! DUST CYCLE (mars=2)
     qsurf_val(:)=0.
+#ifdef NEWPHYS
+    CASE(11)
+    qsurf_val(:)=0. !! provisoire        
+#endif
 END SELECT
-#endif
 
 !-------------------!