Changeset 13077 for NEMO/branches/2020/r4.0-HEAD_ticket2425/src/OFF/nemogcm.F90

Timestamp:

2020-06-09T17:00:38+02:00 (4 years ago)

Author:

davestorkey

Message:

branches/2020/r4.0-HEAD_ticket2425: update to r13076 of r4.0-HEAD

File:

• NEMO/branches/2020/r4.0-HEAD_ticket2425/src/OFF/nemogcm.F90 (modified) (5 diffs)

NEMO/branches/2020/r4.0-HEAD_ticket2425/src/OFF/nemogcm.F90

@@ -27 +27 @@
    USE usrdef_nam     ! user defined configuration
    USE eosbn2         ! equation of state            (eos bn2 routine)
-   !              ! ocean physics
+   !                  ! ocean physics
+   USE bdy_oce,  ONLY : ln_bdy
+   USE bdyini         ! open boundary cond. setting       (bdy_init routine)
    USE ldftra         ! lateral diffusivity setting    (ldf_tra_init routine)
    USE ldfslp         ! slopes of neutral surfaces     (ldf_slp_init routine)
@@ -134 +136 @@
       IF( nstop /= 0 .AND. lwp ) THEN                 ! error print
          WRITE(ctmp1,*) '   ==>>>   nemo_gcm: a total of ', nstop, ' errors have been found'
-         CALL ctl_stop( ctmp1 )
+         WRITE(ctmp2,*) '           Look for "E R R O R" messages in all existing ocean_output* files'
+         CALL ctl_stop( ' ', ctmp1, ' ', ctmp2 )
       ENDIF
       !
@@ -312 +315 @@
 
                            CALL     sbc_init    ! Forcings : surface module
+                           CALL     bdy_init    ! Open boundaries initialisation                          
 
       !                                      ! Tracer physics
@@ -476 +480 @@
       USE zdf_oce,   ONLY : zdf_oce_alloc
       USE trc_oce,   ONLY : trc_oce_alloc
+      USE bdy_oce,   ONLY : bdy_oce_alloc
       !
       INTEGER :: ierr
@@ -485 +490 @@
       ierr = ierr + zdf_oce_alloc()          ! ocean vertical physics
       ierr = ierr + trc_oce_alloc()          ! shared TRC / TRA arrays
+      ierr = ierr + bdy_oce_alloc()    ! bdy masks (incl. initialization)
+      
       !
       CALL mpp_sum( 'nemogcm', ierr )