Changeset 14745

Timestamp:

2021-04-23T18:53:37+02:00 (3 years ago)

Author:

dancopsey

Message:

Remove check on V velocities

File:

• NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/stpctl.F90 (modified) (5 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/stpctl.F90

@@ -67 +67 @@
       REAL(wp)               ::   zzz                 ! local real 
       REAL(wp), DIMENSION(9) ::   zmax
-      LOGICAL                ::   ll_wrtstp, ll_colruns, ll_wrtruns, ll_chku
+      LOGICAL                ::   ll_wrtstp, ll_colruns, ll_wrtruns
       CHARACTER(len=20) :: clname
       !!----------------------------------------------------------------------
       !
-      ll_chku    = ( MOD( kt-nit000, 2 ) == 0 )
       ll_wrtstp  = ( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
       ll_colruns = ll_wrtstp .AND. ( ln_ctl .OR. sn_cfctl%l_runstat )
@@ -116 +115 @@
          zmax(1) = MAXVAL(  ABS( sshn(:,:) )  )                               ! ssh max
       ENDIF
-      IF( ll_chku ) THEN
-         zmax(2) = MAXVAL(  ABS( un(:,:,:) )  )                               ! velocity max (zonal on odd timesteps)
-      ELSE
-         zmax(2) = MAXVAL(  ABS( vn(:,:,:) )  )                               ! velocity max (meridional on even timesteps)
-      ENDIF
+      zmax(2) = MAXVAL(  ABS( un(:,:,:) )  )                                  ! velocity max (zonal only)
       zmax(3) = MAXVAL( -tsn(:,:,:,jp_sal) , mask = tmask(:,:,:) == 1._wp )   ! minus salinity max
       zmax(4) = MAXVAL(  tsn(:,:,:,jp_sal) , mask = tmask(:,:,:) == 1._wp )   !       salinity max
@@ -137 +132 @@
       !                                   !==  run statistics  ==!   ("run.stat" files)
       IF( ll_wrtruns ) THEN
-         IF(  ll_chku  ) THEN
-            WRITE(numrun,9500) kt, zmax(1), zmax(2), -zmax(3), zmax(4)
-         ELSE
-            WRITE(numrun,9501) kt, zmax(1), zmax(2), -zmax(3), zmax(4)
-         ENDIF
+         WRITE(numrun,9500) kt, zmax(1), zmax(2), -zmax(3), zmax(4)
          istatus = NF90_PUT_VAR( idrun, idssh, (/ zmax(1)/), (/kt/), (/1/) )
          istatus = NF90_PUT_VAR( idrun,   idu, (/ zmax(2)/), (/kt/), (/1/) )
@@ -165 +156 @@
          IF( lk_mpp .AND. ln_ctl ) THEN
             CALL mpp_maxloc( 'stpctl', ABS(sshn)        , ssmask(:,:)  , zzz, ih  )
-            IF(  ll_chku  ) THEN
-               CALL mpp_maxloc( 'stpctl', ABS(un)       , umask (:,:,:), zzz, iu  )
-            ELSE
-               CALL mpp_maxloc( 'stpctl', ABS(vn)       , vmask (:,:,:), zzz, iu  )
-            ENDIF
+            CALL mpp_maxloc( 'stpctl', ABS(un)          , umask (:,:,:), zzz, iu  )
             CALL mpp_minloc( 'stpctl', tsn(:,:,:,jp_sal), tmask (:,:,:), zzz, is1 )
             CALL mpp_maxloc( 'stpctl', tsn(:,:,:,jp_sal), tmask (:,:,:), zzz, is2 )
          ELSE
             ih(:)  = MAXLOC( ABS( sshn(:,:)   )                              ) + (/ nimpp - 1, njmpp - 1    /)
-            IF(  ll_chku  ) THEN
-               iu(:)  = MAXLOC( ABS( un  (:,:,:) )                           ) + (/ nimpp - 1, njmpp - 1, 0 /)
-            ELSE
-               iu(:)  = MAXLOC( ABS( vn  (:,:,:) )                           ) + (/ nimpp - 1, njmpp - 1, 0 /)
-            ENDIF
+            iu(:)  = MAXLOC( ABS( un  (:,:,:) )                              ) + (/ nimpp - 1, njmpp - 1, 0 /)
             is1(:) = MINLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /)
             is2(:) = MAXLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /)
          ENDIF
          
-         WRITE(ctmp1,*) ' stp_ctl: |ssh| > 20 m  or  |[U,V]| > 10 m/s  or  S <= 0  or  S >= 100  or  NaN encounter in the tests'
+         WRITE(ctmp1,*) ' stp_ctl: |ssh| > 20 m  or  |U| > 10 m/s  or  S <= 0  or  S >= 100  or  NaN encounter in the tests'
          WRITE(ctmp2,9100) kt,   zmax(1), ih(1) , ih(2)
-         IF(  ll_chku  ) THEN
-           WRITE(ctmp3,9200) kt,   zmax(2), iu(1) , iu(2) , iu(3)
-         ELSE
-           WRITE(ctmp3,9201) kt,   zmax(2), iu(1) , iu(2) , iu(3)
-         ENDIF
+         WRITE(ctmp3,9200) kt,   zmax(2), iu(1) , iu(2) , iu(3)
          WRITE(ctmp4,9300) kt, - zmax(3), is1(1), is1(2), is1(3)
          WRITE(ctmp5,9400) kt,   zmax(4), is2(1), is2(2), is2(3)
@@ -209 +188 @@
 9100  FORMAT (' kt=',i8,'   |ssh| max: ',1pg11.4,', at  i j  : ',2i5)
 9200  FORMAT (' kt=',i8,'   |U|   max: ',1pg11.4,', at  i j k: ',3i5)
-9201  FORMAT (' kt=',i8,'   |V|   max: ',1pg11.4,', at  i j k: ',3i5)
 9300  FORMAT (' kt=',i8,'   S     min: ',1pg11.4,', at  i j k: ',3i5)
 9400  FORMAT (' kt=',i8,'   S     max: ',1pg11.4,', at  i j k: ',3i5)
 9500  FORMAT(' it :', i8, '    |ssh|_max: ', D23.16, ' |U|_max: ', D23.16,' S_min: ', D23.16,' S_max: ', D23.16)
-9501  FORMAT(' it :', i8, '    |ssh|_max: ', D23.16, ' |V|_max: ', D23.16,' S_min: ', D23.16,' S_max: ', D23.16)
       !
    END SUBROUTINE stp_ctl