Changeset 688 for trunk/MESOSCALE/LMD_MM_MARS/SRC

Timestamp:

Jun 2, 2012, 1:27:00 AM (12 years ago)

Author:

aslmd

Message:

MESOSCALE. following additions for restart, nesting was not working in the latest few revisions. this is now fixed (it was a SPECIAL_NEST_SAVE issue). by the way, all restart instances in module_lmd_driver are now within precompiling flag #indef NORESTART, which means restart capabilities are on by default, but can be all switched off using -DNORESTART. NOTE: RESTART CAPABILITIES HAVE NOT BEEN TESTED WITH NESTED RUNS YET. also minor corrections: latest modifications for storm simulations added.

Location:

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2

Files:

• mars_lmd_new_storm/libf/phymars/STORM_JULIEN_LAST/my_callsedim.F (added)
• mars_lmd_new_storm/libf/phymars/STORM_JULIEN_LAST/my_dustlift.F (added)
• mars_lmd_new_storm/libf/phymars/callsedim.F (modified) (1 diff)
• mars_lmd_new_storm/libf/phymars/callsedim.F.link (added)
• mars_lmd_new_storm/libf/phymars/dustlift.F (modified) (1 diff)
• mars_lmd_new_storm/libf/phymars/dustlift.F.link (added)
• phys/module_lmd_driver.F (modified) (12 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new_storm/libf/phymars/callsedim.F

@@ -1 @@
-link callsedim.F.modified
+link STORM_JULIEN_LAST/my_callsedim.F

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new_storm/libf/phymars/dustlift.F

@@ -1 @@
-link ../../../mars_lmd_new/libf/phymars/dustlift.F
+link STORM_JULIEN_LAST/my_dustlift.F

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

@@ -262 +262 @@
       REAL, DIMENSION(:,:,:,:), ALLOCATABLE, SAVE :: &
              dq_save      
+#ifndef NORESTART
+      REAL, DIMENSION(:,:,:), ALLOCATABLE, SAVE :: &
+             save_tsoil_restart
+      REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
+             save_tsurf_restart
+      REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
+             save_co2ice_restart
+      REAL, DIMENSION(:,:,:), ALLOCATABLE, SAVE :: &
+             save_q2_restart
+      REAL, DIMENSION(:,:,:), ALLOCATABLE, SAVE :: &
+             save_qsurf_restart
+#ifdef NEWPHYS
+      REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
+             save_wstar_restart
+      REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
+             save_fluxrad_restart
+#endif
+#endif
 #else
       REAL, DIMENSION(:), ALLOCATABLE, SAVE :: &
@@ -269 +287 @@
       REAL, DIMENSION(:,:,:), ALLOCATABLE, SAVE :: &
              dq_save      
-#endif
-
+#ifndef NORESTART
 !! FOR RESTART
       REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
@@ -287 +304 @@
       REAL, DIMENSION(:), ALLOCATABLE, SAVE :: &
              save_fluxrad_restart
+#endif
+#endif
 #endif
 
@@ -415 +434 @@
    dt_save(:,:,:)=0.
    dq_save(:,:,:,:)=0.
+#ifndef NORESTART
+   ! Restart save arrays
+   ALLOCATE(save_tsoil_restart(ngrid,nsoil,max_dom))
+   ALLOCATE(save_co2ice_restart(ngrid,max_dom))
+   ALLOCATE(save_q2_restart(ngrid,nlayer+1,max_dom))
+   ALLOCATE(save_qsurf_restart(ngrid,nq,max_dom))
+   ALLOCATE(save_tsurf_restart(ngrid,max_dom))
+   save_tsoil_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,max_dom))
+   ALLOCATE(save_fluxrad_restart(ngrid,max_dom))
+   save_wstar_restart(:,:)=0.
+   save_fluxrad_restart(:,:)=0.
+#endif
+#endif
 ENDIF
 IF (id .lt. max_dom) THEN
@@ -433 +471 @@
 dq_save(:,:,:)=0.
 flag_first_restart=.false.
-#endif
-
+#ifndef NORESTART
 ! Restart save arrays
 ALLOCATE(save_tsoil_restart(ngrid,nsoil))
@@ -451 +488 @@
 save_wstar_restart(:)=0.
 save_fluxrad_restart(:)=0.
+#endif
+#endif
 #endif
 
@@ -1350 +1389 @@
 dt_save(:,:,id)=pdt(:,:)
 dq_save(:,:,:,id)=pdq(:,:,:)
+#ifndef NORESTART
+save_tsoil_restart(:,:,id)=wtsoil(:,:)
+save_co2ice_restart(:,id)=wco2ice(:)
+save_q2_restart(:,:,id)=wq2(:,:)
+save_qsurf_restart(:,:,id)=wqsurf(:,:)
+save_tsurf_restart(:,id)=wtsurf(:)
+#ifdef NEWPHYS
+save_wstar_restart(:,id)=wwstar(:)
+save_fluxrad_restart(:,id)=wfluxrad(:)
+#endif
+#endif
 #else
 dp_save(:)=pdpsrf(:)
@@ -1356 +1406 @@
 dt_save(:,:)=pdt(:,:)
 dq_save(:,:,:)=pdq(:,:,:)
-#endif
+#ifndef NORESTART
 save_tsoil_restart(:,:)=wtsoil(:,:)
 save_co2ice_restart(:)=wco2ice(:)
@@ -1362 +1412 @@
 save_qsurf_restart(:,:)=wqsurf(:,:)
 save_tsurf_restart(:)=wtsurf(:)
+#ifdef NEWPHYS
+save_wstar_restart(:)=wwstar(:)
+save_fluxrad_restart(:)=wfluxrad(:)
+#endif
+#endif
+#endif
 DEALLOCATE(wtsoil)
 DEALLOCATE(wco2ice)
@@ -1368 +1424 @@
 DEALLOCATE(wtsurf)
 #ifdef NEWPHYS
-save_wstar_restart(:)=wwstar(:)
-save_fluxrad_restart(:)=wfluxrad(:)
 DEALLOCATE(wfluxrad)
 DEALLOCATE(wwstar)
@@ -1456 +1510 @@
 ! Save key variables for restart !  
 !------------------------------------!
+#ifndef NORESTART
+#ifdef SPECIAL_NEST_SAVE
+MARS_TSOIL(i,:,j)=save_tsoil_restart(subs,:,id)
+MARS_CICE(i,j)=save_co2ice_restart(subs,id)
+MARS_Q2(i,kps:kpe+1,j)=save_q2_restart(subs,:,id)
+SELECT CASE (MARS_MODE)
+   CASE (1,11,12)
+     MARS_WICE(i,j)=save_qsurf_restart(subs,2,id)  !! see above Tracer at surface
+END SELECT
+MARS_TSURF(i,j)=save_tsurf_restart(subs,id)
+#ifdef NEWPHYS
+MARS_WSTAR(i,j)=save_wstar_restart(subs,id)
+MARS_FLUXRAD(i,j)=save_fluxrad_restart(subs,id)
+#endif
+#else
 MARS_TSOIL(i,:,j)=save_tsoil_restart(subs,:)
 MARS_CICE(i,j)=save_co2ice_restart(subs)
@@ -1467 +1536 @@
 MARS_WSTAR(i,j)=save_wstar_restart(subs)
 MARS_FLUXRAD(i,j)=save_fluxrad_restart(subs)
+#endif
+#endif
 #endif