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

Timestamp:

Mar 18, 2016, 12:09:23 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2434:2457 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -41 +41 @@
 
     use mod_grid_phy_lmdz, ONLY : nbp_lat
-    use regr1_step_av_m, only: regr1_step_av
+    use regr1_conserv_m, only: regr1_conserv
     use regr3_lint_m, only: regr3_lint
     use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, handle_err, &
@@ -162 +162 @@
     latitude = latitude / 180. * pi
     n_lat = size(latitude)
-    ! We need to supply the latitudes to "regr1_step_av" in
+    ! We need to supply the latitudes to "regr1_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:
-       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/)))
+       call regr1_conserv(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))
        ! (invert order of indices in "v_regr_lat" because "rlatu" is
        ! in descending order)