Changeset 14200 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/TRA/trazdf.F90

Timestamp:

2020-12-17T15:36:44+01:00 (4 years ago)

Author:

mcastril

Message:

Merging r14117 through r14199 into dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

File:

• NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/TRA/trazdf.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/TRA/trazdf.F90

@@ -23 +23 @@
    USE trd_oce        ! trends: ocean variables
    USE trdtra         ! trends: tracer trend manager
+   USE eosbn2, ONLY: ln_SEOS, rn_b0
    !
    USE in_out_manager ! I/O manager
@@ -83 +84 @@
       ! 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_b0==0._wp)) ) THEN
+         WHERE( pts(A2D(0),:,jp_sal,Kaa) < 0._wp )   pts(A2D(0),:,jp_sal,Kaa) = 0.1_wp
+      ENDIF
 !!gm
 
@@ -97 +101 @@
                &          - ztrds(:,:,jk)
          END DO
-         ! NOTE: [tiling-comms-merge] The diagnostic results change along the north fold if this is removed
 !!gm this should be moved in trdtra.F90 and done on all trends
          CALL lbc_lnk_multi( 'trazdf', ztrdt, 'T', 1.0_wp , ztrds, 'T', 1.0_wp )