Changeset 12841

Timestamp:

2020-05-01T12:52:40+02:00 (4 years ago)

Author:

cetlod

Message:

r4.0-HEAD : bugfix on BDY & TOP, see ticket #2389

Location:

NEMO/releases/r4.0/r4.0-HEAD/src

Files:

• OFF/nemogcm.F90 (modified) (4 diffs)
• TOP/MY_TRC/trcsms_my_trc.F90 (modified) (2 diffs)
• TOP/TRP/trctrp.F90 (modified) (2 diffs)
• TOP/trcbc.F90 (modified) (1 diff)
• TOP/trcini.F90 (modified) (1 diff)

NEMO/releases/r4.0/r4.0-HEAD/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)
@@ -312 +314 @@
 
                            CALL     sbc_init    ! Forcings : surface module
+                           CALL     bdy_init    ! Open boundaries initialisation                          
 
       !                                      ! Tracer physics
@@ -476 +479 @@
       USE zdf_oce,   ONLY : zdf_oce_alloc
       USE trc_oce,   ONLY : trc_oce_alloc
+      USE bdy_oce,   ONLY : bdy_oce_alloc
       !
       INTEGER :: ierr
@@ -485 +489 @@
       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 )

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/MY_TRC/trcsms_my_trc.F90

@@ -15 +15 @@
    USE trd_oce
    USE trdtrc
-   USE trcbc, only : trc_bc
 
    IMPLICIT NONE
@@ -54 +53 @@
       IF( l_trdtrc )  ALLOCATE( ztrmyt(jpi,jpj,jpk) )
 
-      CALL trc_bc ( kt )       ! tracers: surface and lateral Boundary Conditions
-
       ! add here the call to BGC model
 

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/TRP/trctrp.F90

@@ -24 +24 @@
    USE trcsbc          ! surface boundary condition          (trc_sbc routine)
    USE zpshde          ! partial step: hor. derivative       (zps_hde routine)
+   USE trcbc           ! Tracers boundary condtions          ( trc_bc routine)
    USE bdy_oce   , ONLY: ln_bdy
    USE trcbdy          ! BDY open boundaries
@@ -63 +64 @@
          IF( ln_trabbl )        CALL trc_bbl    ( kt )      ! advective (and/or diffusive) bottom boundary layer scheme
          IF( ln_trcdmp )        CALL trc_dmp    ( kt )      ! internal damping trends
+                                CALL trc_bc     ( kt )      ! BC for BDY
          IF( ln_bdy )           CALL trc_bdy_dmp( kt )      ! BDY damping trends
                                 CALL trc_adv    ( kt )      ! horizontal & vertical advection 

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/trcbc.F90

@@ -153 +153 @@
                IF(trcdta_bdy(jn,ib)%cn_obc == 'frs' .AND. nn_trcdmp_bdy(ib) /= 0 )  &
                    & CALL ctl_stop( 'trc_bc_ini: Use FRS OR relaxation' )
-               IF(  .NOT.( 0 < nn_trcdmp_bdy(ib)  .AND.  nn_trcdmp_bdy(ib) <= 2 )  )   &
+               IF(  .NOT.( 0 <= nn_trcdmp_bdy(ib)  .AND.  nn_trcdmp_bdy(ib) <= 2 )  )
                    & CALL ctl_stop( 'trc_bc_ini: Not a valid option for nn_trcdmp_bdy. Allowed: 0,1,2.' )
             END DO

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/trcini.F90

@@ -218 +218 @@
       IF( ln_trcdta )   CALL trc_dta_ini( jptra )      ! set initial tracers values
       !
-      IF( ln_my_trc )   CALL trc_bc_ini ( jptra )      ! set tracers Boundary Conditions
+      CALL trc_bc_ini ( jptra )      ! set tracers Boundary Conditions
       !
       !