Changeset 1212 for trunk/MESOSCALE/LMD_MM_MARS/SRC

Timestamp:

Mar 24, 2014, 9:46:50 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS + MESOSCALE

A quite major commit, at least for MESOSCALE.
In a word: any ngrid deserves to be free.

• no need to recompile when changing number of horizontal grid points or number of processors
• latest version of LMDZ.MARS physics can be used
• WARNING! Nesting is still yet to be fixed (since r1027)

Also some small bug fixes to LMDZ.MARS.

Changes in LMDZ.MARS

---

--> fixed a potential bug in thermal plume model because zlmax was computed both in thermcell_main_mars and calltherm_interface... so made it an OUT argument of calltherm_interface. also: changed the name to limz. and added precompiling flags to avoid the use of planetwide in MESOSCALE. in MESOSCALE we just go high enough (nlayer-5) and do not care about computational cost (although we certainly gain from not using MAXVAL).
--> moved allocations upward in inifis. does not change anything for GCM, but make MESOSCALE modifications simpler, and overall make inifis better organized: first allocations, then reading callphys.def file.
--> added precompiling flags around lines that are both useless for MESOSCALE (notably I/O) and recently adapted to parallel computations in the GCM
--> tidied up what is MESOSCALE vs. GCM in surfini

Changes in MESOSCALE

---

--> changed makemeso to allow dynamically set nx ny nprocs
--> changed makemeso to remove links to Fortran code adapted to parallel GCM and useless for mesoscale
--> changed ngridmx to ngrid in inifis includes

Location:

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2

Files:

• call_meso_inifis1.inc (modified) (1 diff)
• call_meso_inifis2.inc (modified) (2 diffs)
• call_meso_inifis3.inc (modified) (3 diffs)
• call_meso_inifis4.inc (modified) (4 diffs)
• call_meso_inifis5.inc (modified) (5 diffs)
• phys/module_lmd_driver.F (modified) (1 diff)

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/call_meso_inifis1.inc

@@ -5 +5 @@
 
 
-       CALL inifis(ngridmx,nlayer,         &
+       CALL inifis(ngrid,nlayer,         &
 #ifdef NEWPHYS
                nq,  &

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/call_meso_inifis2.inc

@@ -8 +8 @@
 
        CASE(1)
-       CALL inifis(ngridmx,nlayer, &
+       CALL inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -35 +35 @@
 
        CASE(2)
-       CALL d2_inifis(ngridmx,nlayer, &
+       CALL d2_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/call_meso_inifis3.inc

@@ -8 +8 @@
 
        CASE(1)
-       CALL inifis(ngridmx,nlayer, &
+       CALL inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -34 +34 @@
 
        CASE(2)
-       CALL d2_inifis(ngridmx,nlayer, &
+       CALL d2_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -60 +60 @@
 
        CASE(3)
-       CALL d3_inifis(ngridmx,nlayer, &
+       CALL d3_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/call_meso_inifis4.inc

@@ -8 +8 @@
 
        CASE(1)
-       CALL inifis(ngridmx,nlayer, &
+       CALL inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -34 +34 @@
 
        CASE(2)
-       CALL d2_inifis(ngridmx,nlayer, &
+       CALL d2_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -60 +60 @@
 
        CASE(3)
-       CALL d3_inifis(ngridmx,nlayer, &
+       CALL d3_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -86 +86 @@
 
        CASE(4)
-       CALL d4_inifis(ngridmx,nlayer, &
+       CALL d4_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/call_meso_inifis5.inc

@@ -8 +8 @@
 
        CASE(1)
-       CALL inifis(ngridmx,nlayer, &
+       CALL inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -34 +34 @@
 
        CASE(2)
-       CALL d2_inifis(ngridmx,nlayer, &
+       CALL d2_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -60 +60 @@
 
        CASE(3)
-       CALL d3_inifis(ngridmx,nlayer, &
+       CALL d3_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -86 +86 @@
 
        CASE(4)
-       CALL d4_inifis(ngridmx,nlayer, &
+       CALL d4_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &
@@ -112 +112 @@
 
        CASE(5)
-       CALL d5_inifis(ngridmx,nlayer, &
+       CALL d5_inifis(ngrid,nlayer, &
 #ifdef NEWPHYS
                nq,  &

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

@@ -388 +388 @@
 wappel_phys = RADT
 ptimestep = dt*wappel_phys            ! physical timestep (s)
-ngrid=(ipe-ips+1)*(jpe-jps+1)         ! size of the horizontal grid: ngridmx = wiim * wjjm
+ngrid=(ipe-ips+1)*(jpe-jps+1)         ! size of the horizontal grid
 nlayer = kpe-kps+1                    ! number of vertical layers: nlayermx
 nsoil = NUM_SOIL_LAYERS               ! number of soil layers: nsoilmx