Changeset 14102

Timestamp:

2020-12-04T16:40:56+01:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.3_icb_speed_limit : bug fix.

File:

• NEMO/branches/UKMO/NEMO_4.0.3_icb_speed_limit/src/OCE/ICB/icbdyn.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.3_icb_speed_limit/src/OCE/ICB/icbdyn.F90

@@ -47 +47 @@
       REAL(wp) ::   zuvel4 , zvvel4 , zu4, zv4, zax4, zay4, zxi4 , zyj4
       REAL(wp) ::   zuvel_n, zvvel_n, zxi_n   , zyj_n
+      REAL(wp) ::   zspeed, zspeed_new, zloc_dx
       REAL(wp) ::   zdt, zdt_2, zdt_6, ze1, ze2
       TYPE(iceberg), POINTER ::   berg
@@ -150 +151 @@
          CALL icb_ground( zxi_n, zxi1, zuvel_n,   &
             &             zyj_n, zyj1, zvvel_n, ll_bounced )
+
+         IF( rn_speed_limit > 0._wp ) THEN       ! Limit speed of bergs based on a CFL criteria (if asked)
+            zspeed = SQRT( zuvel_n*zuvel_n + zvvel_n*zvvel_n )    ! Speed of berg
+            IF( zspeed > 0._wp ) THEN
+               zloc_dx = MIN( ze1, ze2 )                          ! minimum grid spacing
+               zspeed_new = zloc_dx / zdt * rn_speed_limit        ! Speed limit as a factor of dx / dt
+               IF( zspeed_new < zspeed ) THEN
+                  zuvel_n = zuvel_n * ( zspeed_new / zspeed )        ! Scale velocity to reduce speed
+                  zvvel_n = zvvel_n * ( zspeed_new / zspeed )        ! without changing the direction
+                  CALL icb_dia_speed()
+               ENDIF
+            ENDIF
+         ENDIF
 
          pt%uvel = zuvel_n                        !** save in berg structure
@@ -265 +279 @@
       REAL(wp) ::   zampl, zwmod, zCr, zLwavelength, zLcutoff, zLtop
       REAL(wp) ::   zlambda, zdetA, zA11, zA12, zaxe, zaye, zD_hi
-      REAL(wp) ::   zuveln, zvveln, zus, zvs, zspeed, zloc_dx, zspeed_new
+      REAL(wp) ::   zuveln, zvveln, zus, zvs
       !!----------------------------------------------------------------------
 
@@ -357 +371 @@
          !
       END DO      ! itloop
-
-      IF( rn_speed_limit > 0._wp ) THEN       ! Limit speed of bergs based on a CFL criteria (if asked)
-         zspeed = SQRT( zuveln*zuveln + zvveln*zvveln )    ! Speed of berg
-         IF( zspeed > 0._wp ) THEN
-            zloc_dx = MIN( pe1, pe2 )                          ! minimum grid spacing
-            zspeed_new = zloc_dx / pdt * rn_speed_limit        ! Speed limit as a factor of dx / dt
-            IF( zspeed_new < zspeed ) THEN
-               zuveln = zuveln * ( zspeed_new / zspeed )        ! Scale velocity to reduce speed
-               zvveln = zvveln * ( zspeed_new / zspeed )        ! without changing the direction
-               CALL icb_dia_speed()
-            ENDIF
-         ENDIF
-      ENDIF
       !                                      ! check the speed and acceleration limits
       IF (nn_verbose_level > 0) THEN
          IF( ABS( zuveln ) > pp_vel_lim   .OR. ABS( zvveln ) > pp_vel_lim   )   &
-            WRITE(numicb,'("pe=",i3,x,a)') narea,'Dump triggered by excessive velocity'
+              WRITE(numicb,'("pe=",i3,x,a)') narea,'Dump triggered by excessive velocity'
          IF( ABS( pax    ) > pp_accel_lim .OR. ABS( pay    ) > pp_accel_lim )   &
-            WRITE(numicb,'("pe=",i3,x,a)') narea,'Dump triggered by excessive acceleration'
+              WRITE(numicb,'("pe=",i3,x,a)') narea,'Dump triggered by excessive acceleration'
       ENDIF
       !