Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90

Timestamp:

2020-03-13T17:33:02+01:00 (4 years ago)

Author:

charris

Message:

Changes from GO6 package branch (GMED ticket 450):

svn merge -r 11035:11101 ​svn+ssh://charris@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_package

File:

• branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90

@@ -371 +371 @@
       ENDIF
       !                                      ! check the speed and acceleration limits
-      IF( ABS( zuveln ) > pp_vel_lim   .OR. ABS( zvveln ) > pp_vel_lim   )   &
-         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'
+      IF( ABS( zuveln ) > pp_vel_lim   .OR. ABS( zvveln ) > pp_vel_lim   ) THEN
+        IF(numicb.NE.-1) THEN
+           WRITE(numicb,'("pe=",i3,x,a)') narea,'Dump triggered by excessive velocity'
+           CALL flush(numicb)
+        ELSE
+           WRITE(*,'("pe=",i3,x,a)') narea,'Dump triggered by excessive velocity' 
+           CALL flush(6)
+        ENDIF
+      ENDIF
+      IF( ABS( pax    ) > pp_accel_lim .OR. ABS( pay    ) > pp_accel_lim ) THEN
+         IF(numicb.NE.-1) THEN
+            WRITE(numicb,'("pe=",i3,x,a)') narea,'Dump triggered by excessive acceleration'
+            CALL flush(numicb)
+         ELSE
+            WRITE(*,'("pe=",i3,x,a)') narea,'Dump triggered by excessive acceleration'
+            CALL flush(6)
+        ENDIF
+      ENDIF
       !
    END SUBROUTINE icb_accel