Changeset 156 for trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2

Timestamp:

Jun 13, 2011, 5:36:43 PM (13 years ago)

Author:

aslmd

Message:

MESOSCALE: changements pour compiler / faire tourner le LES sans recours a la physique martienne [doit normalement egalement fonctionner avec modele mesoscale, non teste cependant]. principalement ajout d'un dossier LESnewphys_, d'une option -x dans makemeso et d'un flag NOPHYS dans module_lmd_driver ainsi que solve_em ou assimiles. l'objectif est de preparer la realisation de cas universels idealises, par exemple couche de nuages sur Venus.

Location:

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2

Files:

• dyn_em/solve_em.F (modified) (1 diff)
• phys/module_lmd_driver.F (modified) (11 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F

@@ -881 +881 @@
      &        ,TAVE=grid%em_tave, TSTD=grid%em_tstd &
      &        ,HISTORY_INTERVAL=model_config_rec%history_interval(1)  &
+#ifndef NOPHYS
           !------------------!
           ! OUTPUT VARIABLES !
           !------------------!
 #include "module_lmd_driver_output4.inc"
+#endif
      &        ,SLPX=grid%slpx,SLPY=grid%slpy)
 ENDIF

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

@@ -48 +48 @@
         TAVE, TSTD, &
         HISTORY_INTERVAL, &
+#ifndef NOPHYS
 #include "module_lmd_driver_output1.inc"
+#endif
         SLPX,SLPY)
 ! NB: module_lmd_driver_output1.inc : output arguments generated from Registry
@@ -71 +73 @@
 !==================================================================
 
+#ifndef NOPHYS
 !! the only common needed is the one defining the physical grid
 !! -- path is hardcoded, but the structure is not subject to change
@@ -86 +89 @@
 include "../mars_lmd/libf/phymars/wrf_output_2d.h"
 include "../mars_lmd/libf/phymars/wrf_output_3d.h"
+#endif
 
 !==================================================================
@@ -142 +146 @@
 ! 2D : TSK, PSFC
 ! 3D : RTHBLTEN,RUBLTEN,RVBLTEN
+#ifndef NOPHYS
 #include "module_lmd_driver_output2.inc"
    REAL, DIMENSION(:,:), ALLOCATABLE :: output_tab2d
    REAL, DIMENSION(:,:,:), ALLOCATABLE :: output_tab3d
+#else
+   REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT)  :: PSFC,TSK
+   REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(OUT)  :: RTHBLTEN,RUBLTEN,RVBLTEN
+#endif
 !-------------------------------------------
 ! OUTPUT VARIABLES
@@ -337 +346 @@
 IF (elaps .eq. 0.) THEN
 firstcall=.true.  !! for continuity with GCM, physics are always called at the first WRF timestep
-      !firstcall=.false. ! just in case you'd want to get rid of the physics 
+  !firstcall=.false. !! just in case you'd want to get rid of the physics 
 test=0
 #ifdef SPECIAL_NEST_SAVE
@@ -565 +574 @@
 ALLOCATE(wpsi(ngrid))
 ALLOCATE(wtsurf(ngrid))
+#ifndef NOPHYS
 ALLOCATE(output_tab2d(ngrid,n2d))
 ALLOCATE(output_tab3d(ngrid,nlayer,n3d))
+#endif
 ALLOCATE(wco2ice(ngrid))
 ALLOCATE(wemis(ngrid))
@@ -1042 +1053 @@
 !!***********************!!
 IF (firstcall .EQV. .true.) THEN
+#ifndef NOPHYS
 print *, '** Mars ** LMD INITIALIZATION'
 #include "../call_meso_inifis.inc"
 !!! le # est important pour newphys
+#endif
 DEALLOCATE(aire_vec)
 DEALLOCATE(lat_vec)
@@ -1078 +1091 @@
 !    tracerdyn                 call tracer in dynamical part of GCM ?           !
 !-------------------------------------------------------------------------------!
-print *, '** Mars ** CALL TO LMD PHYSICS'
 pdpsrf(:)=0.
 pdu(:,:)=0.
@@ -1084 +1096 @@
 pdt(:,:)=0.
 pdq(:,:,:)=0.
+#ifndef NOPHYS
+print *, '** Mars ** CALL TO LMD PHYSICS'
 #include "../call_meso_physiq.inc" 
 !!! le # est important pour newphys
+#endif
 DEALLOCATE(pplev)
 DEALLOCATE(pplay)
@@ -1110 +1125 @@
 ! PHYSIQ OUTPUT IN THE WRF FILE !
 !-------------------------------!
+#ifndef NOPHYS
 DO j = jps,jpe
 DO i = ips,ipe
@@ -1131 +1147 @@
 DEALLOCATE(output_tab2d)
 DEALLOCATE(output_tab3d)
-
+#endif
 
 !!!!!! PATCH SPECIAL STORM