Changeset 14259

Timestamp:

2021-01-05T12:11:16+01:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.3_icb_speed_limit : Bug fix and extra write-outs for error trap in icbutl_bilin_e.

Location:

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

Files:

• icbdyn.F90 (modified) (5 diffs)
• icbutl.F90 (modified) (2 diffs)

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

@@ -97 +97 @@
             !                                         !**   A1 = A(X1,V1)
             CALL icb_accel( berg , zxi1, ze1, zuvel1, zuvel1, zax1,     &
-                 &                   zyj1, ze2, zvvel1, zvvel1, zay1, zdt_2 )
+                 &                 zyj1, ze2, zvvel1, zvvel1, zay1, zdt_2 )
             !
             zu1 = zuvel1 / ze1                           !**   V1 in d(i,j)/dt
@@ -119 +119 @@
             !                                         !**   A2 = A(X2,V2)
             CALL icb_accel( berg , zxi2, ze1, zuvel2, zuvel1, zax2,    &
-                 &                   zyj2, ze2, zvvel2, zvvel1, zay2, zdt_2 )
+                 &                 zyj2, ze2, zvvel2, zvvel1, zay2, zdt_2 )
             !
             zu2 = zuvel2 / ze1                           !**   V2 in d(i,j)/dt
@@ -140 +140 @@
             !                                         !**   A3 = A(X3,V3)
             CALL icb_accel( berg , zxi3, ze1, zuvel3, zuvel1, zax3,    &
-                 &                   zyj3, ze2, zvvel3, zvvel1, zay3, zdt )
+                 &                 zyj3, ze2, zvvel3, zvvel1, zay3, zdt )
             !
             zu3 = zuvel3 / ze1                           !**   V3 in d(i,j)/dt
@@ -153 +153 @@
             IF( rn_speed_limit > 0._wp ) THEN  ! Limit speed of bergs based on a CFL criteria (if asked)
                zuvel_rk4 = zuvel1 + 2.*(zuvel2 + zuvel3) + zuvel4
-               zvvel_rk4 = zvvel1 + 2.*(zvvel2 + zvvel3) + zuvel4
+               zvvel_rk4 = zvvel1 + 2.*(zvvel2 + zvvel3) + zvvel4
                CALL icb_speed_limit(ze1, ze2, zdt_6, zuvel_rk4, zvvel_rk4, rn_speed_limit, l_loop, zvel_factor, icount, 3)
                IF(l_loop) CYCLE
@@ -163 +163 @@
             !                                         !**   A4 = A(X4,V4)
             CALL icb_accel( berg , zxi4, ze1, zuvel4, zuvel1, zax4,    &
-                 &                   zyj4, ze2, zvvel4, zvvel1, zay4, zdt )
+                 &                 zyj4, ze2, zvvel4, zvvel1, zay4, zdt )
 
             zu4 = zuvel4 / ze1                           !**   V4 in d(i,j)/dt

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

@@ -422 +422 @@
       IF    ( ij < mjg( 1 ) ) THEN   ;   ij = 1       ; ierr = ierr + 1
       ELSEIF( ij > mjg(jpj) ) THEN   ;   ij = jpj     ; ierr = ierr + 1
-      ELSE                           ;   ij  = mj1(ij)
+      ELSE                           ;   ij = mj1(ij)
       ENDIF
       !
@@ -428 +428 @@
       IF( ij == jpj ) THEN ; ij = ij-1 ; ierr = ierr + 1 ; END IF
       !
-      IF ( ierr > 0 ) CALL ctl_stop('STOP','icb_utl_bilin_e: an icebergs coordinates is out of valid range (out of bound error)')
+      IF ( ierr > 0 ) THEN
+         WRITE(numicb,*) '>>>> Out of valid range crash <<<<'
+         WRITE(numicb,*) 'new global position estimate (pi,pj) = ',pi,pj 
+         WRITE(numicb,*) 'mig(1), mig(jpi) : ',mig(1),mig(jpi)
+         WRITE(numicb,*) 'mjg(1), mjg(jpj) : ',mjg(1),mjg(jpj)
+         WRITE(numicb,*) 'new local position estimate (ii,ij) = ',ii,ij 
+         WRITE(numicb,*) 'jpi, jpj : ',jpi,jpj
+         WRITE(numicb,*) 'nlei, nlej : ',nlei,nlej
+         CALL ctl_stop('STOP','icb_utl_bilin_e: an icebergs coordinates is out of valid range (out of bound error)')
+      ENDIF
       !
       IF(    0.0_wp <= zi .AND. zi < 0.5_wp   ) THEN