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

Timestamp:

Jan 25, 2011, 4:18:50 PM (15 years ago)

Author:

aslmd

Message:

LMD_MM_MARS: ancienne et nouvelle physique sur le mm coeur dynamique

File:

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

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

@@ -10 +10 @@
 !           - general cleaning of code and comments - October 2008 
 !           - additions for idealized cases - January 2009
+!           - additions for new soil model in physics - January 2010 
 !*******************************************************************************
 MODULE module_lmd_driver
@@ -29 +30 @@
         MARS_ALB,MARS_TI,MARS_CICE,MARS_EMISS, &
         MARS_TSOIL, &
+#ifdef NEWPHYS
+        MARS_ISOIL, &
+        MARS_DSOIL, &
+#endif
         MARS_GW, &
         NUM_SOIL_LAYERS, &
@@ -105 +110 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 REAL, DIMENSION( ims:ime, NUM_SOIL_LAYERS, jms:jme ), INTENT(IN   )  :: &
-     MARS_TSOIL         
+     MARS_TSOIL
+#ifdef NEWPHYS
+REAL, DIMENSION( ims:ime, NUM_SOIL_LAYERS, jms:jme ), INTENT(IN   )  :: &
+     MARS_ISOIL, MARS_DSOIL         
+#endif
 REAL, DIMENSION( ims:ime, 5, jms:jme ), INTENT(IN   )  :: &
      MARS_GW
@@ -147 +156 @@
    LOGICAL :: firstcall,lastcall,tracerdyn
    REAL,DIMENSION(:),ALLOCATABLE :: q2_val, qsurf_val, tsoil_val
+#ifdef NEWPHYS
+   REAL,DIMENSION(:),ALLOCATABLE :: isoil_val, dsoil_val
+#endif
    REAL,DIMENSION(:),ALLOCATABLE :: aire_vec,lat_vec,lon_vec
    REAL,DIMENSION(:),ALLOCATABLE :: walbedodat,winertiedat,wphisfi
@@ -153 +165 @@
    ! v--- can they be modified ?
    REAL,DIMENSION(:),ALLOCATABLE :: wtsurf,wco2ice,wemis
-   REAL,DIMENSION(:,:),ALLOCATABLE :: wq2,wqsurf,wtsoil 
+   REAL,DIMENSION(:,:),ALLOCATABLE :: wq2,wqsurf,wtsoil
+#ifdef NEWPHYS
+   REAL,DIMENSION(:,:),ALLOCATABLE :: wisoil,wdsoil
+#endif 
    ! ---------- 
    REAL,DIMENSION(:,:),ALLOCATABLE :: pplev,pplay,pphi,pu,pv,pt,pw
@@ -451 +466 @@
 ALLOCATE(qsurf_val(nq))
 ALLOCATE(tsoil_val(nsoil))
+#ifdef NEWPHYS
+ALLOCATE(isoil_val(nsoil))
+ALLOCATE(dsoil_val(nsoil))
+#endif
 ALLOCATE(wq2(ngrid,nlayer+1))
 ALLOCATE(wqsurf(ngrid,nq)) 
 ALLOCATE(wtsoil(ngrid,nsoil))
+#ifdef NEWPHYS
+ALLOCATE(wisoil(ngrid,nsoil))
+ALLOCATE(wdsoil(ngrid,nsoil))
+#endif
 ALLOCATE(pplev(ngrid,nlayer+1))
 ALLOCATE(pplay(ngrid,nlayer))
@@ -594 +617 @@
 tsoil_val = tsoil_val*0. + tsurf_val
 ENDIF
+#ifdef NEWPHYS
+isoil_val(:)=MARS_ISOIL(i,:,j)
+dsoil_val(:)=MARS_DSOIL(i,:,j)
+#endif
 
 !-------------------!
@@ -630 +657 @@
  PRINT *,'v_prof ',v_prof
  PRINT *,'tsoil ',tsoil_val
+#ifdef NEWPHYS
+ PRINT *,'isoil ',isoil_val
+ PRINT *,'dsoil ',dsoil_val
+#endif
 ENDIF
 
@@ -660 +691 @@
 wqsurf(subs,:) = qsurf_val(:)
 wtsoil(subs,:) = tsoil_val(:)
+#ifdef NEWPHYS
+wisoil(subs,:) = isoil_val(:)
+wdsoil(subs,:) = dsoil_val(:)
+#endif
 wtheta(subs) = theta_val
 wpsi(subs) = psi_val
@@ -680 +715 @@
 pplev(subs,1:nlayer) = p8w_prof(1:nlayer)  !! NB: last level: no data
 pplay(subs,:) = p_prof(:)
-pt(subs,:) = t_prof(:)  ! temperature
+pt(subs,:) = t_prof(:)
 pu(subs,:) = u_prof(:)
 pv(subs,:) = v_prof(:)
@@ -711 +746 @@
 DEALLOCATE(qsurf_val)
 DEALLOCATE(tsoil_val)
+#ifdef NEWPHYS
+DEALLOCATE(isoil_val)
+DEALLOCATE(dsoil_val)
+#endif
 DEALLOCATE(dz8w_prof)
 DEALLOCATE(z_prof)
@@ -738 +777 @@
 IF (firstcall .EQV. .true.) THEN
 print *, '** Mars ** LMD INITIALIZATION'
-include "../call_meso_inifis.inc"
+#include "../call_meso_inifis.inc"
+!!! le # est important pour newphys
 DEALLOCATE(aire_vec)
 DEALLOCATE(lat_vec)
@@ -777 +817 @@
 pdt(:,:)=0.
 pdq(:,:,:)=0.
-include "../call_meso_physiq.inc" 
+#include "../call_meso_physiq.inc" 
+!!! le # est important pour newphys
 DEALLOCATE(pplev)
 DEALLOCATE(pplay)
@@ -792 +833 @@
 DEALLOCATE(wqsurf)
 DEALLOCATE(wtsoil)
+#ifdef NEWPHYS
+DEALLOCATE(wisoil)
+DEALLOCATE(wdsoil)
+#endif