Changeset 9860

Timestamp:

2018-06-29T15:20:17+02:00 (5 years ago)

Author:

frrh

Message:

Fixes to non-standard code necessary for portability.
Also an annoying fix made necessary to avoid a Cray
compiler bug.

Location:

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO

Files:

• OPA_SRC/LDF/ldfdyn_c3d.h90 (modified) (2 diffs)
• OPA_SRC/SBC/sbcice_cice.F90 (modified) (1 diff)
• TOP_SRC/C14b/trcsms_c14b.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcbbl.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

@@ -210 +210 @@
       !
       REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ztemp2d  ! temporary array to read ahmcoef file
+      LOGICAL ::  tempmask( jpi,jpj)   ! Temporary mask to avoid Cray compiler bug at cce 8.3.4
       !!----------------------------------------------------------------------
       !
@@ -252 +253 @@
          zemax = MAXVAL ( e1t(:,:) * e2t(:,:), tmask(:,:,1) .GE. 0.5 )
          zemin = MINVAL ( e1t(:,:) * e2t(:,:), tmask(:,:,1) .GE. 0.5 )
-         zeref = MAXVAL ( e1t(:,:) * e2t(:,:),   &
-             &   tmask(:,:,1) .GE. 0.5 .AND. ABS(gphit(:,:)) .GT. 50. )
+         tempmask(:,:) = .FALSE.
+         ! Pre calculate mask for zeref since embedding the following
+         ! term in the MAXVAL operation offends the Cray compiler for no 
+         ! justifiable reason under certain conditions. 
+         tempmask(:,:) = (tmask(:,:,1) .GE. 0.5) .AND. (ABS(gphit(:,:)) .GT. 50.)
+         zeref = MAXVAL ( e1t(:,:) * e2t(:,:), tempmask(:,:) )
  
          DO jj = 1, jpj

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -1178 +1178 @@
 
    SUBROUTINE sbc_ice_cice ( kt, ksbc )     ! Dummy routine
+      IMPLICIT NONE
+      INTEGER, INTENT(in) ::   kt    ! ocean time-step index
+      INTEGER, INTENT(in) ::   ksbc    ! surface forcing type
       WRITE(*,*) 'sbc_ice_cice: You should not have seen this print! error?', kt
    END SUBROUTINE sbc_ice_cice
 
    SUBROUTINE cice_sbc_init (ksbc)    ! Dummy routine
+      IMPLICIT NONE
+      INTEGER, INTENT(in) ::   ksbc    ! surface forcing type
       WRITE(*,*) 'cice_sbc_init: You should not have seen this print! error?'
    END SUBROUTINE cice_sbc_init
 
    SUBROUTINE cice_sbc_final     ! Dummy routine
+      IMPLICIT NONE
       WRITE(*,*) 'cice_sbc_final: You should not have seen this print! error?'
    END SUBROUTINE cice_sbc_final

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90

@@ -330 +330 @@
 CONTAINS
    SUBROUTINE trc_sms_c14b( kt )       ! Empty routine
+      IMPLICIT NONE
+      INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       WRITE(*,*) 'trc_freons: You should not have seen this print! error?', kt
    END SUBROUTINE trc_sms_c14b

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90

@@ -51 +51 @@
       !!
       !!----------------------------------------------------------------------  
+      IMPLICIT NONE
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step 
       CHARACTER (len=22) :: charout
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) ::   ztrtrd
+      INTEGER :: jn                   ! Local loop index
       !!----------------------------------------------------------------------
       !
@@ -108 +110 @@
 CONTAINS
    SUBROUTINE trc_bbl( kt )              ! Empty routine
+      IMPLICIT NONE
+      INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       WRITE(*,*) 'tra_bbl: You should not have seen this print! error?', kt
    END SUBROUTINE trc_bbl