Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/regr_pr_comb_coefoz_m.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/regr_pr_comb_coefoz_m.F90 (modified) (7 diffs)

LMDZ5/branches/testing/libf/phylmd/regr_pr_comb_coefoz_m.F90

@@ -40 +40 @@
 
     use dimphy, only: klon
+    use mod_grid_phy_lmdz, only: nbp_lev
 
     ! Variables local to the procedure:
-    include "dimensions.h"
 
     !---------------------------------------
@@ -49 +49 @@
     print *, "Call sequence information: alloc_coefoz"
     !$omp end master
-    allocate(c_Mob(klon, llm), a2(klon, llm), a4_mass(klon, llm))
-    allocate(a6_mass(klon, llm), r_het_interm(klon, llm))
+    allocate(c_Mob(klon, nbp_lev), a2(klon, nbp_lev), a4_mass(klon, nbp_lev))
+    allocate(a6_mass(klon, nbp_lev), r_het_interm(klon, nbp_lev))
 
   end subroutine alloc_coefoz
@@ -79 +79 @@
     use regr_pr_int_m, only: regr_pr_int
     use press_coefoz_m, only: press_in_edg, plev
+    use mod_grid_phy_lmdz, only: nbp_lev
 
     integer, intent(in):: julien ! jour julien, 1 <= julien <= 360
@@ -85 +86 @@
     ! (latitude on the partial "physics" grid, in degrees)
 
-    real, intent(in):: paprs(:, :) ! (klon, llm + 1)
+    real, intent(in):: paprs(:, :) ! (klon, nbp_lev + 1)
     ! (pression pour chaque inter-couche, en Pa)
 
-    real, intent(in):: pplay(:, :) ! (klon, llm)
+    real, intent(in):: pplay(:, :) ! (klon, nbp_lev)
     ! (pression pour le mileu de chaque couche, en Pa)
 
     ! Variables local to the procedure:
 
-    include "dimensions.h"
     integer ncid ! for NetCDF
 
-    real coefoz(klon, llm, 7)
+    real coefoz(klon, nbp_lev, 7)
     ! (temporary storage for 7 ozone coefficients)
     ! (On the partial "physics" grid.
@@ -102 +102 @@
     ! middle of layer "k".)
 
-    real a6(klon, llm)
+    real a6(klon, nbp_lev)
     ! (derivative of "P_net_Mob" with respect to column-density of ozone
     ! above, in cm2 s-1)
@@ -121 +121 @@
     call assert((/size(rlat), size(paprs, 1), size(pplay, 1)/) == klon, &
          "regr_pr_comb_coefoz klon")
-    call assert((/size(paprs, 2) - 1, size(pplay, 2)/) == llm, &
-         "regr_pr_comb_coefoz llm")
+    call assert((/size(paprs, 2) - 1, size(pplay, 2)/) == nbp_lev, &
+         "regr_pr_comb_coefoz nbp_lev")
 
     !$omp master
@@ -150 +150 @@
     r_het_interm = coefoz(:, :, 7)
     ! Heterogeneous chemistry is only at high latitudes:
-    forall (k = 1: llm)
+    forall (k = 1: nbp_lev)
        where (abs(rlat) <= 45.) r_het_interm(:, k) = 0.
     end forall