Changeset 10104 for NEMO

Timestamp:

2018-09-07T15:20:38+02:00 (6 years ago)

Author:

cbricaud

Message:

clean trcadv_crs.F90 and add ubs scheme for coarsenig

Location:

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO

Files:

• OPA_SRC/TRA/traadv_ubs_crs.F90 (added)
• TOP_SRC/TRP/trcadv_crs.F90 (modified) (2 diffs)
• TOP_SRC/oce_trc.F90 (modified) (1 diff)

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv_crs.F90

@@ -18 +18 @@
    USE trc             ! ocean passive tracers variables
    USE trcnam_trp      ! passive tracers transport namelist variables
-   USE traadv_cen2     ! 2nd order centered scheme (tra_adv_cen2   routine)
    USE traadv_tvd_crs  ! TVD      scheme           (tra_adv_tvd    routine)
-   USE traadv_muscl    ! MUSCL    scheme           (tra_adv_muscl  routine)
-   USE traadv_muscl2   ! MUSCL2   scheme           (tra_adv_muscl2 routine)
-   USE traadv_ubs      ! UBS      scheme           (tra_adv_ubs    routine)
-   USE traadv_qck      ! QUICKEST scheme           (tra_adv_qck    routine)
-   USE traadv_eiv      ! eddy induced velocity     (tra_adv_eiv    routine)
+   USE traadv_ubs_crs  ! TVD      scheme           (tra_adv_tvd    routine)
    USE ldftra_oce      ! lateral diffusion coefficient on tracers
    USE prtctl_trc      ! Print control
@@ -108 +103 @@
       zwn(:,:,jpk) = 0.e0                                 ! no transport trough the bottom
 
-      IF( lk_traldf_eiv .AND. .NOT. ln_traldf_grif )   &  ! add the eiv transport (if necessary)
-         &              CALL tra_adv_eiv( kt, nittrc000, zun, zvn, zwn, 'TRC' )
       !
       SELECT CASE ( nadv )                            !==  compute advection trend and add it to general trend  ==!
       CASE ( 2 )   ;    CALL tra_adv_tvd_crs   ( kt, nittrc000, 'TRC', r2dt, zun, zvn, zwn, trb, trn, tra, jptra )   !  TVD 
+      CASE ( 5 )   ;    CALL tra_adv_ubs_crs   ( kt, nittrc000, 'TRC', r2dt, zun, zvn, zwn, trb, trn, tra, jptra )   !  UBS 
       !
       CASE (-1 )                                      !==  esopa: test all possibility with control print  ==!

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

@@ -195 +195 @@
    USE crs , ONLY :   tmask_i    =>   tmask_i_crs    !: Interior mask at t-points
    USE crs , ONLY :   tmask      =>   tmask_crs      !: land/ocean mask at t-points
+   USE crs , ONLY :   umask      =>   umask_crs      !: land/ocean mask at u-points
+   USE crs , ONLY :   vmask      =>   vmask_crs      !: land/ocean mask at v-points
+
 
  !* ocean fields: here now and after fields *