Changeset 2820 for LMDZ5/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Mar 10, 2017, 5:46:08 PM (7 years ago)

Author:

dcugnet

Message:

Fix and cleaning/improvements over the previous commit:

• Old style climoz files are handled without trouble.
• New style climoz (monthly with 14 records or daily) are handled

with the same read_climoz key values (1 or 2).

• Daily files reading activation is done using the same key

used in ce0l to create them: ok_daily_climoz=y. This key is now
put to FALSE by default (old style 360 days files are not considered
as daily).

File:

• LMDZ5/trunk/libf/phylmd/physiq_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -1670 +1670 @@
        !$omp single
        IF (read_climoz >= 1) CALL open_climoz(ncid_climoz, press_cen_climoz,   &
-                                         press_edg_climoz, time_climoz)
+           press_edg_climoz, time_climoz, ok_daily_climoz, adjust_tropopause)
        !$omp end single
        !
@@ -1975 +1975 @@
 
           wo(:,:,1)=ozonecm(latitude_deg, paprs,read_climoz,rjour=zzz)
-       ELSE IF(ANY([1,2]==read_climoz)) THEN
-          ro3i = REAL(INT((days_elapsed+jh_cur-jh_1jan)/year_len*360.))
-          IF(INT(ro3i) == 360) ro3i = 359.
-          ! (This should never occur, except perhaps because of roundup
-          ! error. See documentation.)
-          WRITE(*,*)' >> Using 360 records ozone files (old method).'
-          CALL regr_pr_time_av(ncid_climoz, vars_climoz(1:read_climoz),      &
-                               ro3i+1., press_edg_climoz, paprs, wo)
-          FORALL (l = 1: read_climoz) wo(:, :, l) = wo(:, :, l) * rmo3 / rmd &
-               * zmasse / dobson_u / 1e3
        ELSE
+          !--- ro3i = elapsed days number since current year 1st january, 0h
+          ro3i=days_elapsed+jh_cur-jh_1jan
+          !--- scaling for old style files (360 records)
+          IF(SIZE(time_climoz)==360.AND..NOT.ok_daily_climoz) ro3i=ro3i*360./year_len
           IF(adjust_tropopause) THEN
-            WRITE(*,*)' >> Adjusting O3 field to match gcm tropopause.'
-            CALL dyn_tropopause(t_seri, ztsol, paprs, pplay, presnivs, rot,  &
-                 pr_tropopause)
-            CALL regr_pr_time_av(ncid_climoz, vars_climoz(1:read_climoz-2),  &
-                 days_elapsed+jh_cur-jh_1jan, press_edg_climoz, paprs, wo,   &
-                 time_climoz,  latitude_deg,  press_cen_climoz, pr_tropopause)
+             CALL dyn_tropopause(t_seri, ztsol, paprs, pplay, presnivs, rot, &
+                  pr_tropopause)
+             CALL regr_pr_time_av(ncid_climoz, vars_climoz(1:read_climoz),   &
+                      ro3i,  press_edg_climoz,  paprs,   wo, time_climoz,    &
+                           latitude_deg,  press_cen_climoz,  pr_tropopause)
           ELSE
-            WRITE(*,*)' >> Interpolating O3 field directly on gcm levels.'
-            CALL regr_pr_time_av(ncid_climoz, vars_climoz(1:read_climoz-2),  &
-                 days_elapsed+jh_cur-jh_1jan, press_edg_climoz, paprs, wo,   &
-                 time_climoz)
+             CALL regr_pr_time_av(ncid_climoz, vars_climoz(1:read_climoz),   &
+                      ro3i,  press_edg_climoz,  paprs,  wo,  time_climoz)
           END IF
           ! Convert from mole fraction of ozone to column density of ozone in a