New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 9860 – NEMO

Changeset 9860


Ignore:
Timestamp:
2018-06-29T15:20:17+02:00 (4 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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

    r6486 r9860  
    210210      ! 
    211211      REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ztemp2d  ! temporary array to read ahmcoef file 
     212      LOGICAL ::  tempmask( jpi,jpj)   ! Temporary mask to avoid Cray compiler bug at cce 8.3.4 
    212213      !!---------------------------------------------------------------------- 
    213214      ! 
     
    252253         zemax = MAXVAL ( e1t(:,:) * e2t(:,:), tmask(:,:,1) .GE. 0.5 ) 
    253254         zemin = MINVAL ( e1t(:,:) * e2t(:,:), tmask(:,:,1) .GE. 0.5 ) 
    254          zeref = MAXVAL ( e1t(:,:) * e2t(:,:),   & 
    255              &   tmask(:,:,1) .GE. 0.5 .AND. ABS(gphit(:,:)) .GT. 50. ) 
     255         tempmask(:,:) = .FALSE. 
     256         ! Pre calculate mask for zeref since embedding the following 
     257         ! term in the MAXVAL operation offends the Cray compiler for no  
     258         ! justifiable reason under certain conditions.  
     259         tempmask(:,:) = (tmask(:,:,1) .GE. 0.5) .AND. (ABS(gphit(:,:)) .GT. 50.) 
     260         zeref = MAXVAL ( e1t(:,:) * e2t(:,:), tempmask(:,:) ) 
    256261  
    257262         DO jj = 1, jpj 
  • branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r8400 r9860  
    11781178 
    11791179   SUBROUTINE sbc_ice_cice ( kt, ksbc )     ! Dummy routine 
     1180      IMPLICIT NONE 
     1181      INTEGER, INTENT(in) ::   kt    ! ocean time-step index 
     1182      INTEGER, INTENT(in) ::   ksbc    ! surface forcing type 
    11801183      WRITE(*,*) 'sbc_ice_cice: You should not have seen this print! error?', kt 
    11811184   END SUBROUTINE sbc_ice_cice 
    11821185 
    11831186   SUBROUTINE cice_sbc_init (ksbc)    ! Dummy routine 
     1187      IMPLICIT NONE 
     1188      INTEGER, INTENT(in) ::   ksbc    ! surface forcing type 
    11841189      WRITE(*,*) 'cice_sbc_init: You should not have seen this print! error?' 
    11851190   END SUBROUTINE cice_sbc_init 
    11861191 
    11871192   SUBROUTINE cice_sbc_final     ! Dummy routine 
     1193      IMPLICIT NONE 
    11881194      WRITE(*,*) 'cice_sbc_final: You should not have seen this print! error?' 
    11891195   END SUBROUTINE cice_sbc_final 
  • branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90

    r6486 r9860  
    330330CONTAINS 
    331331   SUBROUTINE trc_sms_c14b( kt )       ! Empty routine 
     332      IMPLICIT NONE 
     333      INTEGER, INTENT(in) ::   kt    ! ocean time-step index 
    332334      WRITE(*,*) 'trc_freons: You should not have seen this print! error?', kt 
    333335   END SUBROUTINE trc_sms_c14b 
  • branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90

    r7771 r9860  
    5151      !! 
    5252      !!----------------------------------------------------------------------   
     53      IMPLICIT NONE 
    5354      INTEGER, INTENT( in ) ::   kt   ! ocean time-step  
    5455      CHARACTER (len=22) :: charout 
    5556      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) ::   ztrtrd 
     57      INTEGER :: jn                   ! Local loop index 
    5658      !!---------------------------------------------------------------------- 
    5759      ! 
     
    108110CONTAINS 
    109111   SUBROUTINE trc_bbl( kt )              ! Empty routine 
     112      IMPLICIT NONE 
     113      INTEGER, INTENT(in) ::   kt    ! ocean time-step index 
    110114      WRITE(*,*) 'tra_bbl: You should not have seen this print! error?', kt 
    111115   END SUBROUTINE trc_bbl 
Note: See TracChangeset for help on using the changeset viewer.