Changeset 12841 for NEMO/releases/r4.0/r4.0-HEAD/src/TOP

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/TOP

Files:

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

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
       !
       !