Changeset 11186

Timestamp:

2019-06-26T17:02:07+02:00 (5 years ago)

Author:

kingr

Message:

Merging changes from AMM15_v3_6_STABLE_package_collate r10728:11063

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO

Files:

• OPA_SRC/DYN/dynkeg.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcnam_trp.F90 (modified) (4 diffs)
• TOP_SRC/TRP/trcsbcssr.F90 (added)
• TOP_SRC/TRP/trctrp.F90 (modified) (3 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -132 +132 @@
          ENDIF 
       ENDDO  
+!CEOD ADD
+      CALL lbc_lnk( un,'U',-1. )
+      CALL lbc_lnk( vn,'V',-1. )
+!CEOD ADD
 #endif       
 

branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90

@@ -16 +16 @@
    USE in_out_manager      ! ocean dynamics and active tracers variables
    USE lib_mpp           ! distributed memory computing library
+   USE fldread
 
    IMPLICIT NONE
@@ -52 +53 @@
    INTEGER , PUBLIC ::   nn_zdmp_tr    ! = 0/1/2 flag for damping in the mixed layer
    CHARACTER(LEN=200) , PUBLIC :: cn_resto_tr    !File containing restoration coefficient
+   CHARACTER(LEN=200) , PUBLIC :: cn_dir_chldmp = './'    !: Directory containing chlorophyll file
+   INTEGER , PUBLIC ::    nn_chldmp = 0    !: = 0/1/2 flag for surface chlorophyll damping
+   REAL(wp), PUBLIC ::    rn_chldmp = 0.0  !: chlorophyll damping coefficient
+   TYPE(FLD_N), PUBLIC :: sn_chldmp        !: informations about the fields to be read
 
    !!----------------------------------------------------------------------
@@ -77 +82 @@
       NAMELIST/namtrc_zdf/ ln_trczdf_exp  , nn_trczdf_exp
       NAMELIST/namtrc_rad/ ln_trcrad
-      NAMELIST/namtrc_dmp/ nn_zdmp_tr , cn_resto_tr
+      NAMELIST/namtrc_dmp/ nn_zdmp_tr , cn_resto_tr, cn_dir_chldmp, nn_chldmp, &
+         &                 sn_chldmp  , rn_chldmp
       !!----------------------------------------------------------------------
 
@@ -179 +185 @@
          WRITE(numout,*) '      mixed layer damping option     nn_zdmp_tr = ', nn_zdmp_tr, '(zoom: forced to 0)'
          WRITE(numout,*) '      Restoration coeff file    cn_resto_tr = ', cn_resto_tr
+         WRITE(numout,*) '      Surface chlorophyll damping     nn_chldmp = ', nn_chldmp
+         WRITE(numout,*) '      Damping coefficient             rn_chldmp = ', rn_chldmp
+         WRITE(numout,*) '      Chlorophyll directory       cn_dir_chldmp = ', cn_dir_chldmp
       ENDIF
       !

branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -29 +29 @@
    USE trcbdy          ! BDY open boundaries
    USE bdy_par, only: lk_bdy
+   USE trcsbcssr
 
 #if defined key_agrif
@@ -66 +67 @@
       IF( .NOT. lk_c1d ) THEN
          !
+         IF( nn_chldmp > 0 )    CALL trc_sbc_ssr( kstp )        ! add Chl damping term
                                 CALL trc_sbc( kstp )            ! surface boundary condition
          IF( lk_trabbl )        CALL trc_bbl( kstp )            ! advective (and/or diffusive) bottom boundary layer scheme
@@ -93 +95 @@
          !
       ELSE                                               ! 1D vertical configuration
+         IF( nn_chldmp > 0 )    CALL trc_sbc_ssr( kstp )        ! add Chl damping term
                                 CALL trc_sbc( kstp )            ! surface boundary condition
          IF( .NOT. lk_offline .AND. lk_zdfkpp )    &