Changeset 2346 for LMDZ5/trunk/libf/phylmd/regr_pr_av_m.F90

Timestamp:

Aug 21, 2015, 5:13:46 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Physics/dynamics separation:

• remove all references to dimensions.h from physics. nbp_lon (==iim) , nbp_lat (==jjm+1) and nbp_lev (==llm) from mod_grid_phy_lmdz should be used instead.
• added module regular_lonlat_mod in phy_common to store information about the global (lon-lat) grid cell boundaries and centers.

EM

File:

• LMDZ5/trunk/libf/phylmd/regr_pr_av_m.F90 (modified) (5 diffs)

LMDZ5/trunk/libf/phylmd/regr_pr_av_m.F90

@@ -40 +40 @@
     use regr1_step_av_m, only: regr1_step_av
     use mod_phys_lmdz_mpi_data, only: is_mpi_root
-
+    use mod_grid_phy_lmdz, only: nbp_lon, nbp_lat, nbp_lev
     use mod_phys_lmdz_transfert_para, only: scatter2d
     ! (pack to the LMDZ horizontal "physics" grid and scatter)
@@ -63 +63 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
     integer varid, ncerr ! for NetCDF
 
-    real  v1(iim, jjm + 1, size(press_in_edg) - 1, size(name))
+    real  v1(nbp_lon, nbp_lat, size(press_in_edg) - 1, size(name))
     ! input fields at day "julien", on the global "dynamics" horizontal grid
     ! First dimension is for longitude.
@@ -84 +83 @@
     !--------------------------------------------
 
-    call assert(size(v3, 1) == klon, size(v3, 2) == llm, "regr_pr_av v3 klon")
+    call assert(size(v3, 1) == klon, size(v3, 2) == nbp_lev, "regr_pr_av v3 klon")
     n_var = assert_eq(size(name), size(v3, 3), "regr_pr_av v3 n_var")
-    call assert(shape(paprs) == (/klon, llm+1/), "regr_pr_av paprs")
+    call assert(shape(paprs) == (/klon, nbp_lev+1/), "regr_pr_av paprs")
 
     !$omp master
@@ -102 +101 @@
        ! Latitudes are in ascending order in the input file while
        ! "rlatu" is in descending order so we need to invert order:
-       v1(1, :, :, :) = v1(1, jjm+1:1:-1, :, :)
+       v1(1, :, :, :) = v1(1, nbp_lat:1:-1, :, :)
 
        ! Duplicate on all longitudes:
-       v1(2:, :, :, :) = spread(v1(1, :, :, :), dim=1, ncopies=iim-1)
+       v1(2:, :, :, :) = spread(v1(1, :, :, :), dim=1, ncopies=nbp_lon-1)
     end if
     !$omp end master
@@ -113 +112 @@
     ! Regrid in pressure at each horizontal position:
     do i = 1, klon
-       v3(i, llm:1:-1, :) = regr1_step_av(v2(i, :, :), press_in_edg, &
-            paprs(i, llm+1:1:-1))
+       v3(i, nbp_lev:1:-1, :) = regr1_step_av(v2(i, :, :), press_in_edg, &
+            paprs(i, nbp_lev+1:1:-1))
        ! (invert order of indices because "paprs" is in descending order)
     end do