Changeset 10853

Timestamp:

2019-04-09T11:04:31+02:00 (4 years ago)

Author:

andmirek

Message:

ticket #2197 bugfix and change in NaN detection

Location:

NEMO/branches/UKMO/dev_r10037_GPU/src/OCE

Files:

• SBC/sbcdcy.F90 (modified) (1 diff)
• stpctl.F90 (modified) (2 diffs)

NEMO/branches/UKMO/dev_r10037_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/dev_r10037_GPU/src/OCE/stpctl.F90

@@ -25 +25 @@
    USE lib_mpp         ! distributed memory computing
    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
@@ -127 +127 @@
          &  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 ) THEN
             CALL mpp_maxloc( ABS(sshn)        , ssmask(:,:)  , zzz, iih , ijh        )