Changeset 2839 for LMDZ5/branches/testing/libf/phylmd/regr_lat_time_coefoz_m.F90

Timestamp:

Mar 30, 2017, 4:16:38 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/regr_lat_time_coefoz_m.F90 (modified) (5 diffs)

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

@@ -41 +41 @@
 
     use mod_grid_phy_lmdz, ONLY : nbp_lat
-    use regr1_conserv_m, only: regr1_conserv
-    use regr3_lint_m, only: regr3_lint
+    use regr_conserv_m, only: regr_conserv
+    use regr_lint_m, only: regr_lint
     use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, handle_err, &
          nf95_put_var, nf95_gw_var
@@ -84 +84 @@
     ! Last dimension is month number.)
 
-    real, allocatable:: o3_par_out(:, :, :) ! (jjm + 1, n_plev, 360)
+    real, allocatable:: o3_par_out(:, :, :) ! (jjm + 1, n_plev, ndays)
     ! (regridded ozone parameter)
     ! ("o3_par_out(j, l, day)" is at latitude "rlatu(j)", pressure
@@ -162 +162 @@
     latitude = latitude / 180. * pi
     n_lat = size(latitude)
-    ! We need to supply the latitudes to "regr1_conserv" in
+    ! We need to supply the latitudes to "regr_conserv" in
     ! ascending order, so invert order if necessary:
     desc_lat = latitude(1) > latitude(n_lat)
@@ -209 +209 @@
        ! We average with respect to sine of latitude, which is
        ! equivalent to weighting by cosine of latitude:
-       call regr1_conserv(o3_par_in, xs = sin(lat_in_edg), &
+       call regr_conserv(1, o3_par_in, xs = sin(lat_in_edg), &
             xt = (/-1., sin((/boundslat_reg(nbp_lat-1:1:-1,south)/)), 1./), &
             vt = v_regr_lat(nbp_lat:1:-1, :, 1:12))
@@ -221 +221 @@
 
        ! Regrid in time by linear interpolation:
-       o3_par_out = regr3_lint(v_regr_lat, tmidmonth, tmidday)
+       call regr_lint(3, v_regr_lat, tmidmonth, tmidday, o3_par_out)
 
        ! Write to file: