Changeset 8769

Timestamp:

2017-11-21T16:31:59+01:00 (6 years ago)

Author:

flavoni

Message:

add control ISNAN function, and fix in domain.F90 output domain file name

Location:

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/domain.F90 (modified) (1 diff)
• stpctl.F90 (modified) (2 diffs)

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -592 +592 @@
       !                       ! ============================= !
       !         
-      clnam = 'domcfg_out'  ! filename (configuration information)
+      clnam = cn_domcfg_out  ! filename (configuration information)
       CALL iom_open( TRIM(clnam), inum, ldwrt = .TRUE., kiolib = jprstlib )
       

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

@@ -91 +91 @@
       ENDIF
       !
-      IF ( zmax(1) > 10._wp .OR.   &                     ! too large sea surface height ( > 10 m)
-         & zmax(2) > 10._wp .OR.   &                     ! too large velocity ( > 10 m/s)
-         & zmax(3) >  0._wp ) THEN                       ! negative sea surface salinity
+      IF (  zmax(1) >  10._wp .OR.   &                     ! too large sea surface height ( > 10 m)
+         &  zmax(2) >  10._wp .OR.   &                     ! too large velocity ( > 10 m/s)
+         &  zmax(3) >=  0._wp .OR.   &                     ! negative or zero sea surface salinity
+         &  ISNAN( zmax(1) + zmax(2) + zmax(3) )  ) THEN   ! NaN encounter in the tests
          IF( lk_mpp ) THEN
             CALL mpp_maxloc( ABS(sshn)        , tmask(:,:,1), zzz, iih, ijh )
@@ -108 +109 @@
          IF(lwp) THEN
             WRITE(numout,cform_err)
-            WRITE(numout,*) ' stpctl: |ssh| > 10 m   or   |U| > 10 m/s   or   SSS < 0'
+            WRITE(numout,*) ' stpctl: |ssh| > 10 m   or   |U| > 10 m/s   or   SSS < 0   or   NaN encounter in the tests'
             WRITE(numout,*) ' ====== '
             WRITE(numout,9100) kt,   zmax(1), iih, ijh