Changeset 2774 for LMDZ5/trunk

Timestamp:

Jan 25, 2017, 1:24:12 PM (8 years ago)

Author:

lguez

Message:

Added option -ftz for Ada because of a bug of version 17.0 of ifort,
which stops on underflow with -fpe-all=0. Intel announces that the bug
should be corrected in version 17.3.

Fixing a bug from revision 2661: when read_climoz = -1, we want to use ozonecm.

Location:

LMDZ5/trunk

Files:

• arch/arch-X64_ADA.fcm (modified) (1 diff)
• libf/phylmd/physiq_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/arch/arch-X64_ADA.fcm

@@ -8 +8 @@
 %PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2
 %DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
-%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug
+%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug -ftz
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -1127 +1127 @@
 
     ! Quick check on pressure levels:
-    do i = 1, klon
-       call assert(paprs(i, nbp_lev + 1) < paprs(i, nbp_lev), &
+    call assert(paprs(:, nbp_lev + 1) < paprs(:, nbp_lev), &
             "physiq_mod paprs bad order")
-    end do
 
     IF (first) THEN 
@@ -1953 +1951 @@
     ! Update ozone if day change
     IF (MOD(itap-1,lmt_pas) == 0) THEN
-      IF (read_climoz == 0) THEN
-       ! Once per day, update ozone from Royer:
-        IF (solarlong0<-999.) then
-           ! Generic case with evolvoing season
-           zzz=real(days_elapsed+1)
-        ELSE IF (abs(solarlong0-1000.)<1.e-4) then
-           ! Particular case with annual mean insolation
-           zzz=real(90) ! could be revisited
-           IF (read_climoz/=-1) THEN
-              abort_message ='read_climoz=-1 is recommended when ' &
-                   // 'solarlong0=1000.'
-              CALL abort_physic (modname,abort_message,1)
-           ENDIF
-        ELSE
-          ! Case where the season is imposed with solarlong0
-          zzz=real(90) ! could be revisited
-        ENDIF
-
-        wo(:,:,1)=ozonecm(latitude_deg, paprs,read_climoz,rjour=zzz)
-      ELSE
-        ro3i = int((days_elapsed + jh_cur - jh_1jan) / year_len * 360.) + 1   
-        IF (ro3i == 361) ro3i = 360
-        IF (read_climoz == 1) THEN
-           CALL regr_pr_av(ncid_climoz, (/"tro3"/), julien=ro3i, &
-                press_in_edg=press_climoz, paprs=paprs, v3=wo)
-        ELSE
-           ! read_climoz == 2
-           CALL regr_pr_av(ncid_climoz, (/"tro3         ", &
-                "tro3_daylight"/), julien=ro3i, press_in_edg=press_climoz, &
-                paprs=paprs, v3=wo)
-        ENDIF
-        ! Convert from mole fraction of ozone to column density of ozone in a
-        ! cell, in kDU:
-        FORALL (l = 1: read_climoz) wo(:, :, l) = wo(:, :, l) * rmo3 / rmd &
-             * zmasse / dobson_u / 1e3
-        ! (By regridding ozone values for LMDZ only once every 360th of
-        ! year, we have already neglected the variation of pressure in one
-        ! 360th of year. So do not recompute "wo" at each time step even if
-        ! "zmasse" changes a little.)
-     
-      ENDIF
+       IF (read_climoz <= 0) THEN
+          ! Once per day, update ozone from Royer:
+          IF (solarlong0<-999.) then
+             ! Generic case with evolvoing season
+             zzz=real(days_elapsed+1)
+          ELSE IF (abs(solarlong0-1000.)<1.e-4) then
+             ! Particular case with annual mean insolation
+             zzz=real(90) ! could be revisited
+             IF (read_climoz/=-1) THEN
+                abort_message ='read_climoz=-1 is recommended when ' &
+                     // 'solarlong0=1000.'
+                CALL abort_physic (modname,abort_message,1)
+             ENDIF
+          ELSE
+             ! Case where the season is imposed with solarlong0
+             zzz=real(90) ! could be revisited
+          ENDIF
+
+          wo(:,:,1)=ozonecm(latitude_deg, paprs,read_climoz,rjour=zzz)
+       ELSE
+          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
+          ! error. See documentation.)
+
+          IF (read_climoz == 1) THEN
+             CALL regr_pr_av(ncid_climoz, (/"tro3"/), julien=ro3i, &
+                  press_in_edg=press_climoz, paprs=paprs, v3=wo)
+          ELSE
+             ! read_climoz == 2
+             CALL regr_pr_av(ncid_climoz, (/"tro3         ", &
+                  "tro3_daylight"/), julien=ro3i, press_in_edg=press_climoz, &
+                  paprs=paprs, v3=wo)
+          ENDIF
+          ! Convert from mole fraction of ozone to column density of ozone in a
+          ! cell, in kDU:
+          FORALL (l = 1: read_climoz) wo(:, :, l) = wo(:, :, l) * rmo3 / rmd &
+               * zmasse / dobson_u / 1e3
+          ! (By regridding ozone values for LMDZ only once per day, we
+          ! have already neglected the variation of pressure in one
+          ! day. So do not recompute "wo" at each time step even if
+          ! "zmasse" changes a little.)
+       ENDIF
     ENDIF
     !