Changeset 2098 for LMDZ5/trunk/libf/phylmd/physiq.F90

Timestamp:

Jul 22, 2014, 12:51:23 PM (10 years ago)

Author:

lguez

Message:

Replaced 360 in calbeta_clim by length of current year according to
chosen calendar. Length of current year is given by
ioget_year_len. Since we already need this for ozone, moved the call
to ioget_year_len from physiq to phys_cal_mod and created variable
year_len of module phys_cal_mod.

Control the output from minmaxqfi.

Non-ASCII characters in comments are not always rendered properly and
they risk being lost. See revision 1740.

File:

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

LMDZ5/trunk/libf/phylmd/physiq.F90

@@ -11 +11 @@
 
   USE ioipsl, only: histbeg, histvert, histdef, histend, histsync, &
-       histwrite, ju2ymds, ymds2ju, ioget_year_len, getin
+       histwrite, ju2ymds, ymds2ju, getin
   USE comgeomphy
-  USE phys_cal_mod
+  USE phys_cal_mod, only: year_len, mth_len, days_elapsed, jh_1jan, year_cur, &
+       mth_cur, phys_cal_update
   USE write_field_phy
   USE dimphy
@@ -1576 +1577 @@
      ! Ozone from a file
      ! Update required ozone index:
-     ro3i = int((days_elapsed + jh_cur - jh_1jan) / ioget_year_len(year_cur) &
-          * 360.) + 1
+     ro3i = int((days_elapsed + jh_cur - jh_1jan) / year_len * 360.) + 1
      if (ro3i == 361) ro3i = 360
      ! (This should never occur, except perhaps because of roundup