Changeset 13049

Timestamp:

2020-06-05T09:53:58+02:00 (5 years ago)

Author:

andmirek

Message:

Ticket #2482: fixes to build with PGI compiler

Location:

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU

Files:

• cfgs/METO_GO/cpp_METO_GO.fcm (copied) (copied from NEMO/branches/UKMO/dev_r10037_GPU/cfgs/METO_GO/cpp_METO_GO.fcm)
• src/OCE/DIA/diawri.F90 (modified) (1 diff)
• src/OCE/IOM/iom.F90 (modified) (1 diff)
• src/OCE/SBC/sbcdcy.F90 (modified) (1 diff)
• src/OCE/stpctl.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/DIA/diawri.F90

@@ -443 +443 @@
       !!----------------------------------------------------------------------
       ! 
+!no diagnostics without key_iomput
+      RETURN
+
       IF( ln_timing )   CALL timing_start('dia_wri')
       !

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/IOM/iom.F90

@@ -35 +35 @@
    USE ice      , ONLY :   jpl
 #endif
-   USE domngb          ! ocean space and time domain
-   USE phycst          ! physical constants
    USE dianam          ! build name of file
    USE xios
 # endif
+   USE domngb          ! ocean space and time domain
+   USE phycst          ! physical constants
    USE ioipsl, ONLY :  ju2ymds    ! for calendar
    USE crs             ! Grid coarsening

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/SBC/sbcdcy.F90

@@ -239 +239 @@
       END DO  
       !
-      IF( PRESENT(l_mask) .AND. l_mask ) THEN
-         zqsrout(:,:) = float(imask_night(:,:))
+      IF( PRESENT(l_mask) ) THEN
+        IF(l_mask) zqsrout(:,:) = float(imask_night(:,:))
       ENDIF
       !

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/stpctl.F90

@@ -26 +26 @@
    USE zdf_oce ,  ONLY : ln_zad_Aimp       ! ocean vertical physics variables
    USE wet_dry,   ONLY : ll_wd, ssh_ref    ! reference depth for negative bathy
-
+   USE ieee_arithmetic !Replacement for ISNAN function
    USE netcdf          ! NetCDF library
    IMPLICIT NONE
@@ -153 +153 @@
          &  zmax(4) >= 100._wp .OR.   &                    ! too large sea surface salinity ( > 100 )
          &  zmax(4) <    0._wp .OR.   &                    ! too large sea surface salinity (keep this line for sea-ice)
-         &  ISNAN( zmax(1) + zmax(2) + zmax(3) ) ) ) THEN   ! NaN encounter in the tests
+         &  IEEE_IS_NAN( zmax(1) + zmax(2) + zmax(3) ) ) ) THEN   ! NaN encounter in the tests
          IF( lk_mpp .AND. ln_ctl ) THEN
             CALL mpp_maxloc( 'stpctl', ABS(sshn)        , ssmask(:,:)  , zzz, ih  )