Changeset 15759

Timestamp:

2022-03-18T12:36:32+01:00 (2 years ago)

Author:

smueller

Message:

Refined 'tracer.stat' output and replacement of a non-standard intrinsic function

Location:

NEMO/branches/NERC/dev_r4.0.4_MEDUSA_PSyclone/src

Files:

• OCE/stpctl.F90 (modified) (2 diffs)
• TOP/trcstp.F90 (modified) (2 diffs)

NEMO/branches/NERC/dev_r4.0.4_MEDUSA_PSyclone/src/OCE/stpctl.F90

@@ -28 +28 @@
 
    USE netcdf          ! NetCDF library
+   USE, INTRINSIC :: ieee_arithmetic
    IMPLICIT NONE
    PRIVATE
@@ -171 +172 @@
          &  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) ) .OR.  &   ! NaN encounter in the tests
+         &  ieee_is_nan( 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
          IF( ll_colruns ) THEN

NEMO/branches/NERC/dev_r4.0.4_MEDUSA_PSyclone/src/TOP/trcstp.F90

@@ -57 +57 @@
       INTEGER ::   jk, jn   ! dummy loop indices
       REAL(wp)::   ztrai    ! local scalar
+      REAL(wp),DIMENSION(jptra):: zztrai
       LOGICAL ::   ll_trcstat ! local logical
       CHARACTER (len=25) ::   charout   !
@@ -117 +118 @@
          ztrai = 0._wp                                                   !  content of all tracers
          DO jn = 1, jptra
-            ztrai = ztrai + glob_sum( 'trcstp', trn(:,:,:,jn) * cvol(:,:,:)   )
+            zztrai(jn) = glob_sum( 'trcstp', trn(:,:,:,jn) * cvol(:,:,:)   )
+            ztrai = ztrai + zztrai(jn)
          END DO
-         IF( lwm ) WRITE(numstr,9300) kt,  ztrai / areatot
-      ENDIF
-9300  FORMAT(i10,D23.16)
+         IF( lwm ) WRITE(numstr,9300) kt,  ztrai / areatot, zztrai(:) / areatot
+      ENDIF
+9300  FORMAT(i10,16D23.16)
       !
       IF( ln_timing )   CALL timing_stop('trc_stp')