Changeset 70 for trunk/mesoscale/LMD_MM_MARS/SRC

Timestamp:

Feb 19, 2011, 1:40:07 AM (14 years ago)

Author:

aslmd

Message:

LMD_MM_MARS: ajout d'une option -DSPECIAL_NEST_SAVE qui reprend les modifications de la revision 67 pour runs de nest sur iDataplex avec IFORT+MPI. l'option doit rester inactive pour les runs nestes ferme planeto PGI+MPI car l experience montre que les modifications de la revision 67 (maintenant incluses dans l'option SPECIAL_NEST_SAVE dans module_lmd_driver.F) cassent le fonctionnement dans ce cas.

File:

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

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

@@ -209 +209 @@
 !**************************************************
 ! IMPORTANT: pour travailler avec grid nesting
-!  une dimension supplementaire liee au nest
+! --- deux comportements distincts du save
+! ... ex1: ferme planeto avec PGF+MPI: standard
+! ... ex2: iDataPlex avec IFORT+MPI: SPECIAL_NEST_SAVE 
 !**************************************************
+#ifdef SPECIAL_NEST_SAVE
+      !  une dimension supplementaire liee au nest
       REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
              dp_save
@@ -217 +221 @@
       REAL, DIMENSION(:,:,:,:), ALLOCATABLE, SAVE :: &
              dq_save      
+#else
+      REAL, DIMENSION(:), ALLOCATABLE, SAVE :: &
+             dp_save
+      REAL, DIMENSION(:,:), ALLOCATABLE, SAVE :: &
+             du_save, dv_save, dt_save
+      REAL, DIMENSION(:,:,:), ALLOCATABLE, SAVE :: &
+             dq_save      
+#endif
 
 !!!IDEALIZED IDEALIZED
@@ -327 +339 @@
       !firstcall=.false. ! just in case you'd want to get rid of the physics 
 test=0
-
+#ifdef SPECIAL_NEST_SAVE
 PRINT *, 'ALLOCATED dp_save ???', ALLOCATED( dp_save ), id
 IF( .NOT. ALLOCATED( dp_save  ) ) THEN
@@ -343 +355 @@
    dq_save(:,:,:,:)=0.
 ENDIF
-
+#else
+ALLOCATE(dp_save(ngrid)) !! here are the arrays that would be useful to save physics tendencies
+ALLOCATE(du_save(ngrid,nlayer))
+ALLOCATE(dv_save(ngrid,nlayer)) 
+ALLOCATE(dt_save(ngrid,nlayer))     
+ALLOCATE(dq_save(ngrid,nlayer,nq)) 
+dp_save(:)=0.    !! initialize these arrays ...
+du_save(:,:)=0.
+dv_save(:,:)=0.
+dt_save(:,:)=0.    
+dq_save(:,:,:)=0.
+#endif
 !! put here some general information you'd like to print just once
     print *, 'TILES: ', i_start,i_end, j_start, j_end  ! numbers for simple runs, arrays for parallel runs
@@ -507 +530 @@
 IF (test.NE.0) THEN
 print *,'** Mars ** NO CALL FOR PHYSICS, go to next step...',test
+#ifdef SPECIAL_NEST_SAVE
 pdpsrf(:)=dp_save(:,id)
 pdu(:,:)=du_save(:,:,id)
@@ -512 +536 @@
 pdt(:,:)=dt_save(:,:,id)
 pdq(:,:,:)=dq_save(:,:,:,id)
+#else
+pdpsrf(:)=dp_save(:)
+pdu(:,:)=du_save(:,:)
+pdv(:,:)=dv_save(:,:)
+pdt(:,:)=dt_save(:,:)
+pdq(:,:,:)=dq_save(:,:,:)
+#endif
 !!!
 !!! BIG LOOP : 2. calculate physical tendencies
@@ -1015 +1046 @@
 ! PHYSIQ TENDENCIES ARE SAVED TO BE SPLIT WITHIN INTERMEDIATE DYNAMICAL TIMESTEPS !
 !---------------------------------------------------------------------------------!
+#ifdef SPECIAL_NEST_SAVE
 dp_save(:,id)=pdpsrf(:)
 du_save(:,:,id)=pdu(:,:)
@@ -1020 +1052 @@
 dt_save(:,:,id)=pdt(:,:)
 dq_save(:,:,:,id)=pdq(:,:,:)
+#else
+dp_save(:)=pdpsrf(:)
+du_save(:,:)=pdu(:,:)
+dv_save(:,:)=pdv(:,:)
+dt_save(:,:)=pdt(:,:)
+dq_save(:,:,:)=pdq(:,:,:)
+#endif
 
 ENDIF call_physics