Changeset 678 for trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys

Timestamp:

May 30, 2012, 1:29:56 AM (13 years ago)

Author:

aslmd

Message:

MESOSCALE : modifications for restart broke MMM or LES with old physics. now fixed.

File:

• trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F (modified) (13 diffs)

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

@@ -33 +33 @@
         MARS_TSOIL, &
         MARS_Q2, &
+        MARS_TSURF, &
+#ifdef NEWPHYS
         MARS_FLUXRAD, &
         MARS_WSTAR, &
-        MARS_TSURF, &
-#ifdef NEWPHYS
         MARS_ISOIL, &
         MARS_DSOIL, &
@@ -123 +123 @@
 REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT   )  :: &
      MARS_CICE,MARS_WICE, &
-     MARS_FLUXRAD,MARS_WSTAR,MARS_TSURF
+     MARS_TSURF
 ! 3D arrays 
 REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(IN ) :: &
@@ -142 +142 @@
 REAL, DIMENSION( ims:ime, jms:jme ), INTENT(IN   )  :: &
      MARS_Z0
+REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT   )  :: &
+     MARS_FLUXRAD,MARS_WSTAR
 #endif
 REAL, DIMENSION( ims:ime, 5, jms:jme ), INTENT(IN   )  :: &
@@ -197 +199 @@
    REAL :: zmea_val,zstd_val,zsig_val,zgam_val,zthe_val
    REAL :: theta_val, psi_val
-   REAL :: wstar_val,fluxrad_val
    LOGICAL :: firstcall,lastcall,tracerdyn
    REAL,DIMENSION(:),ALLOCATABLE :: q2_val, qsurf_val, tsoil_val
 #ifdef NEWPHYS
+   REAL :: wstar_val,fluxrad_val
    REAL,DIMENSION(:),ALLOCATABLE :: isoil_val, dsoil_val
    REAL :: z0_val
@@ -209 +211 @@
    REAL,DIMENSION(:),ALLOCATABLE :: wtheta, wpsi
    ! v--- can they be modified ?
-   REAL,DIMENSION(:),ALLOCATABLE :: wtsurf,wco2ice,wemis,wwstar,wfluxrad
+   REAL,DIMENSION(:),ALLOCATABLE :: wtsurf,wco2ice,wemis
    REAL,DIMENSION(:,:),ALLOCATABLE :: wq2,wqsurf,wtsoil 
 #ifdef NEWPHYS
+   REAL,DIMENSION(:),ALLOCATABLE :: wwstar,wfluxrad
    REAL,DIMENSION(:),ALLOCATABLE :: wz0tab
    REAL,DIMENSION(:,:),ALLOCATABLE :: wisoil,wdsoil
@@ -274 +277 @@
              save_tsurf_restart
       REAL, DIMENSION(:), ALLOCATABLE, SAVE :: &
-             save_fluxrad_restart
-      REAL, DIMENSION(:), ALLOCATABLE, SAVE :: &
              save_co2ice_restart
       REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
@@ -281 +282 @@
       REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
              save_qsurf_restart
+#ifdef NEWPHYS
       REAL, DIMENSION(:), ALLOCATABLE, SAVE :: &
              save_wstar_restart
+      REAL, DIMENSION(:), ALLOCATABLE, SAVE :: &
+             save_fluxrad_restart
+#endif
 
 !!!IDEALIZED IDEALIZED
@@ -432 +437 @@
 ! Restart save arrays
 ALLOCATE(save_tsoil_restart(ngrid,nsoil))
-ALLOCATE(save_fluxrad_restart(ngrid))
 ALLOCATE(save_co2ice_restart(ngrid))
 ALLOCATE(save_q2_restart(ngrid,nlayer+1))
 ALLOCATE(save_qsurf_restart(ngrid,nq))
-ALLOCATE(save_wstar_restart(ngrid))
 ALLOCATE(save_tsurf_restart(ngrid))
 save_tsoil_restart(:,:)=0.
-save_fluxrad_restart(:)=0.
 save_co2ice_restart(:)=0.
 save_q2_restart(:,:)=0.
 save_qsurf_restart(:,:)=0.
+save_tsurf_restart(:)=0.
+#ifdef NEWPHYS
+ALLOCATE(save_wstar_restart(ngrid))
+ALLOCATE(save_fluxrad_restart(ngrid))
 save_wstar_restart(:)=0.
-save_tsurf_restart(:)=0.
+save_fluxrad_restart(:)=0.
+#endif
 
 !! put here some general information you'd like to print just once
@@ -666 +673 @@
 ALLOCATE(wqsurf(ngrid,nq))       !!!!!
 ALLOCATE(wtsoil(ngrid,nsoil))    !!!!!
+#ifdef NEWPHYS
 ALLOCATE(wfluxrad(ngrid))
 ALLOCATE(wwstar(ngrid))
-#ifdef NEWPHYS
 ALLOCATE(wisoil(ngrid,nsoil))    !!!!!
 ALLOCATE(wdsoil(ngrid,nsoil))    !!!!!
@@ -1089 +1096 @@
 IF (.not. restart) THEN
    q2_val(:)=0.      !PBL wind variance
+#ifdef NEWPHYS
    fluxrad_val=0.
    wstar_val=0.
+#endif
 ELSE
    q2_val(:)=MARS_Q2(i,:,j)
+#ifdef NEWPHYS
    fluxrad_val=MARS_FLUXRAD(i,j)
    wstar_val=MARS_WSTAR(i,j)
+#endif
 ENDIF
 
@@ -1115 +1126 @@
 wemis(subs) = emis_val
 wq2(subs,:) = q2_val(:)
+wqsurf(subs,:) = qsurf_val(:)
+wtsoil(subs,:) = tsoil_val(:)
+#ifdef NEWPHYS
 wfluxrad(subs) = fluxrad_val
 wwstar(subs) = wstar_val
-wqsurf(subs,:) = qsurf_val(:)
-wtsoil(subs,:) = tsoil_val(:)
-#ifdef NEWPHYS
 wisoil(subs,:) = isoil_val(:)
 wdsoil(subs,:) = dsoil_val(:)
@@ -1343 +1354 @@
 #endif
 save_tsoil_restart(:,:)=wtsoil(:,:)
-save_fluxrad_restart(:)=wfluxrad(:)
 save_co2ice_restart(:)=wco2ice(:)
 save_q2_restart(:,:)=wq2(:,:)
 save_qsurf_restart(:,:)=wqsurf(:,:)
-save_wstar_restart(:)=wwstar(:)
 save_tsurf_restart(:)=wtsurf(:)
 DEALLOCATE(wtsoil)
-DEALLOCATE(wfluxrad)
 DEALLOCATE(wco2ice)
 DEALLOCATE(wq2)
 DEALLOCATE(wqsurf)
+DEALLOCATE(wtsurf)
+#ifdef NEWPHYS
+save_wstar_restart(:)=wwstar(:)
+save_fluxrad_restart(:)=wfluxrad(:)
+DEALLOCATE(wfluxrad)
 DEALLOCATE(wwstar)
-DEALLOCATE(wtsurf)
+#endif
 ENDIF call_physics
 
@@ -1439 +1452 @@
 ! Save key variables for restart !  
 !------------------------------------!
-
 MARS_TSOIL(i,:,j)=save_tsoil_restart(subs,:)
-MARS_FLUXRAD(i,j)=save_fluxrad_restart(subs)
 MARS_CICE(i,j)=save_co2ice_restart(subs)
 MARS_Q2(i,:,j)=save_q2_restart(subs,:)
 SELECT CASE (MARS_MODE)
    CASE (1,11,12)
-     MARS_WICE(i,j)=save_qsurf_restart(subs,2)
+     MARS_WICE(i,j)=save_qsurf_restart(subs,2)  !! see above Tracer at surface
 END SELECT
+MARS_TSURF(i,j)=save_tsurf_restart(subs)
+#ifdef NEWPHYS
 MARS_WSTAR(i,j)=save_wstar_restart(subs)
-MARS_TSURF(i,j)=save_tsurf_restart(subs)
+MARS_FLUXRAD(i,j)=save_fluxrad_restart(subs)
+#endif
 
 !---------!