Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/regr_lat_time_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_lat_time_coefoz_m.F90 (modified) (11 diffs)

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

@@ -40 +40 @@
     ! when we regrid in pressure).
 
+    use mod_grid_phy_lmdz, ONLY : nbp_lat
     use regr1_step_av_m, only: regr1_step_av
     use regr3_lint_m, only: regr3_lint
@@ -45 +46 @@
          nf95_put_var, nf95_gw_var
     use netcdf, only: nf90_nowrite, nf90_get_var
+    use nrtype, only: pi
+    use regular_lonlat_mod, only: boundslat_reg, south
 
     ! Variables local to the procedure:
-
-    include "dimensions.h"
-    ! (for "jjm")
-    include "paramet.h"
-    include "comgeom2.h"
-    ! (for "rlatv")
-    include "comconst.h"
-    ! (for "pi")
 
     integer ncid_in, ncid_out ! NetCDF IDs for input and output files
@@ -164 +159 @@
     call nf95_inq_varid(ncid_in, "latitude", varid)
     call nf95_gw_var(ncid_in, varid, latitude)
-    ! Convert from degrees to rad, because "rlatv" is in rad:
+    ! Convert from degrees to rad, because "boundslat_reg" is in rad:
     latitude = latitude / 180. * pi
     n_lat = size(latitude)
@@ -200 +195 @@
 
     allocate(o3_par_in(n_lat, n_plev, 12))
-    allocate(v_regr_lat(jjm + 1, n_plev, 0:13))
-    allocate(o3_par_out(jjm + 1, n_plev, 360))
+    allocate(v_regr_lat(nbp_lat, n_plev, 0:13))
+    allocate(o3_par_out(nbp_lat, n_plev, 360))
 
     do i_v = 1, n_o3_param
@@ -214 +209 @@
        ! We average with respect to sine of latitude, which is
        ! equivalent to weighting by cosine of latitude:
-       v_regr_lat(jjm+1:1:-1, :, 1:12) = regr1_step_av(o3_par_in, &
-            xs=sin(lat_in_edg), xt=sin((/- pi / 2, rlatv(jjm:1:-1), pi / 2/)))
+       v_regr_lat(nbp_lat:1:-1, :, 1:12) = regr1_step_av(o3_par_in, &
+            xs=sin(lat_in_edg), xt=sin((/- pi / 2, boundslat_reg(nbp_lat-1:1:-1,south), pi / 2/)))
        ! (invert order of indices in "v_regr_lat" because "rlatu" is
        ! in descending order)
@@ -229 +224 @@
        ! Write to file:
        call nf95_put_var(ncid_out, varid_out(i_v), &
-            o3_par_out(jjm+1:1:-1, :, :))
+            o3_par_out(nbp_lat:1:-1, :, :))
        ! (The order of "rlatu" is inverted in the output file)
     end do
@@ -246 +241 @@
     ! dimensions and variables, and writes one of the coordinate variables.
 
+    use mod_grid_phy_lmdz, ONLY : nbp_lat
     use assert_eq_m, only: assert_eq
 
@@ -251 +247 @@
          nf95_put_att, nf95_enddef, nf95_copy_att, nf95_put_var
     use netcdf, only: nf90_clobber, nf90_float, nf90_copy_att, nf90_global
+    use nrtype, only: pi
+    use regular_lonlat_mod, only : lat_reg
 
     integer, intent(in):: ncid_in, varid_in(:), n_plev
@@ -257 +255 @@
 
     ! Variables local to the procedure:
-
-    include "dimensions.h"
-    ! (for "jjm")
-    include "paramet.h"
-    include "comgeom2.h"
-    ! (for "rlatu")
-    include "comconst.h"
-    ! (for "pi")
 
     integer ncerr
@@ -282 +272 @@
     call nf95_def_dim(ncid_out, "time", 360, dimid_time)
     call nf95_def_dim(ncid_out, "plev", n_plev, dimid_plev)
-    call nf95_def_dim(ncid_out, "rlatu", jjm + 1, dimid_rlatu)
+    call nf95_def_dim(ncid_out, "rlatu", nbp_lat, dimid_rlatu)
 
     ! Define coordinate variables:
@@ -332 +322 @@
 
     ! Write one of the coordinate variables:
-    call nf95_put_var(ncid_out, varid_rlatu, rlatu(jjm+1:1:-1) / pi * 180.)
+    call nf95_put_var(ncid_out, varid_rlatu, lat_reg(nbp_lat:1:-1) / pi * 180.)
     ! (convert from rad to degrees and sort in ascending order)