Changeset 14127 for NEMO/trunk/src

Timestamp:

2020-12-08T09:03:03+01:00 (3 years ago)

Author:

jchanut

Message:

#2537, remove checks/corrections if salinity is a passive tracer

Location:

NEMO/trunk/src/OCE

Files:

• TRA/trazdf.F90 (modified) (1 diff)
• stpctl.F90 (modified) (4 diffs)

NEMO/trunk/src/OCE/TRA/trazdf.F90

@@ -83 +83 @@
       ! JMM avoid negative salinities near river outlet ! Ugly fix
       ! JMM : restore negative salinities to small salinities:
-      WHERE( pts(A2D(0),:,jp_sal,Kaa) < 0._wp )   pts(A2D(0),:,jp_sal,Kaa) = 0.1_wp
+!!jc: discard this correction in case salinity is not used in eos
+      IF ( .NOT.(ln_seos.AND.(rn_lambda2==0._wp)) ) THEN
+         WHERE( pts(A2D(0),:,jp_sal,Kaa) < 0._wp )   pts(A2D(0),:,jp_sal,Kaa) = 0.1_wp
+      ENDIF
 !!gm
 

NEMO/trunk/src/OCE/stpctl.F90

@@ -26 +26 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp         ! distributed memory computing
+   USE eosbn2
+   !
    USE netcdf          ! NetCDF library
-
    IMPLICIT NONE
    PRIVATE
@@ -65 +66 @@
       INTEGER , DIMENSION(9)          ::   iareasum, iareamin, iareamax
       INTEGER , DIMENSION(3,4)        ::   iloc                                  ! min/max loc indices
-      REAL(wp)                        ::   zzz                                   ! local real 
+      REAL(wp)                        ::   zzz, zminsal, zmaxsal                 ! local real 
       REAL(wp), DIMENSION(9)          ::   zmax, zmaxlocal
       LOGICAL                         ::   ll_wrtstp, ll_colruns, ll_wrtruns, ll_0oce
@@ -71 +72 @@
       CHARACTER(len=20)               ::   clname
       !!----------------------------------------------------------------------
-      !
       IF( nstop > 0 .AND. ngrdstop > -1 )   RETURN   !   stpctl was already called by a child grid
       !
@@ -180 +180 @@
          END DO
          IF( kt == nitend )   istatus = NF90_CLOSE(nrunid)
-      ENDIF
+      END IF
       !                                   !==               error handling               ==!
       !                                   !==  done by all processes at every time step  ==!
       !
+      IF ( ln_seos.AND.(rn_lambda2==0._wp) ) THEN        ! Discard checks on salinity
+         zmaxsal = +1.e38                                ! if not used in eos
+         zminsal = -1.e38 
+      ELSE
+         zmaxsal = 100._wp
+         zminsal =   0._wp
+      ENDIF 
+      ! 
       IF(  zmax(1) >   20._wp .OR.   &                   ! too large sea surface height ( > 20 m )
          & zmax(2) >   10._wp .OR.   &                   ! too large velocity ( > 10 m/s)
-         & zmax(3) <=   0._wp .OR.   &                   ! negative or zero sea surface salinity
-         & 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)
+         & zmax(3) <= zminsal .OR.   &                   ! negative or zero sea surface salinity
+         & zmax(4) >= zmaxsal .OR.   &                   ! too large sea surface salinity ( > 100 )
+         & zmax(4) <  zminsal .OR.   &                   ! too large sea surface salinity (keep this line for sea-ice)
          & ISNAN( zmax(1) + zmax(2) + zmax(3) ) .OR.   &               ! NaN encounter in the tests
          & ABS(   zmax(1) + zmax(2) + zmax(3) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests