Changeset 8894 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2017-12-04T18:06:36+01:00 (6 years ago)

Author:

cbricaud

Message:

crs improvments

Location:

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC

Files:

• TRP/trcldf_crs.F90 (modified) (2 diffs)
• oce_trc.F90 (modified) (3 diffs)
• trcdia.F90 (modified) (1 diff)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf_crs.F90

@@ -21 +21 @@
    USE ldftra_oce,ONLY: ln_traldf_grif,rn_aht_0,rn_ahtb_0,lk_traldf_eiv     ! lateral diffusion coefficient on tracers
    USE ldfslp          ! ???
-   USE traldf_bilapg   ! lateral mixing            (tra_ldf_bilapg routine)
-   USE traldf_bilap    ! lateral mixing            (tra_ldf_bilap routine)
    USE traldf_iso_crs      ! lateral mixing            (tra_ldf_iso routine)
-   USE traldf_iso_grif ! lateral mixing          (tra_ldf_iso_grif routine)
-   USE traldf_lap_crs      ! lateral mixing            (tra_ldf_lap routine)
    USE trd_oce
    USE trdtra
@@ -88 +84 @@
       ENDIF
 
-!      WRITE(numout,*) 'nldf', nldf
       SELECT CASE ( nldf )                       ! compute lateral mixing trend and add it to the general trend
-      CASE ( 0 )   ;   CALL tra_ldf_lap_crs   ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra            )  ! iso-level laplacian
       CASE ( 1 )                                                                                            ! rotated laplacian
-                       IF( ln_traldf_grif ) THEN
-                          CALL tra_ldf_iso_grif( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )
-                       ELSE
-                          CALL tra_ldf_iso_crs     ( kt, nittrc000, 'TRC', gtru ,gtrv , trb, tra, jptra, rn_ahtb_0 )
-                       ENDIF
-      CASE ( 2 )   ;   CALL tra_ldf_bilap ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra            )  ! iso-level bilaplacian
-      CASE ( 3 )   ;   CALL tra_ldf_bilapg( kt, nittrc000, 'TRC',             trb, tra, jptra            )  ! s-coord. horizontal bilaplacian
+                        CALL tra_ldf_iso_crs     ( kt, nittrc000, 'TRC', gtru ,gtrv , trb, tra, jptra, rn_ahtb_0 )
          !
       CASE ( -1 )                                     ! esopa: test all possibility with control print
-         CALL tra_ldf_lap_crs   ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra            )
-         WRITE(charout, FMT="('ldf0 ')") ;  CALL prt_ctl_trc_info(charout)
                                             CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
-         IF( ln_traldf_grif ) THEN
-            CALL tra_ldf_iso_grif( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )
-         ELSE
-            CALL tra_ldf_iso_crs     ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )
-         ENDIF
+         CALL tra_ldf_iso_crs     ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )
          WRITE(charout, FMT="('ldf1 ')") ;  CALL prt_ctl_trc_info(charout)
-                                            CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
-         CALL tra_ldf_bilap ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra            )
-         WRITE(charout, FMT="('ldf2 ')") ;  CALL prt_ctl_trc_info(charout)
-                                            CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
-         CALL tra_ldf_bilapg( kt, nittrc000, 'TRC',             trb, tra, jptra            )
-         WRITE(charout, FMT="('ldf3 ')") ;  CALL prt_ctl_trc_info(charout)
                                             CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
       END SELECT

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

@@ -66 +66 @@
    USE par_oce , ONLY :   jp_tem   =>   jp_tem     !: indice for temperature
    USE par_oce , ONLY :   jp_sal   =>   jp_sal     !: indice for salinity
+
+   USE trc_oce    , ONLY : trc_oce_ext_lev_crs
 
    !* IO manager *
@@ -142 +144 @@
    USE crs , ONLY :   e2t        =>   e2t_crs        !: horizontal scale factors at t-point (m)   
    USE crs , ONLY :   e1e2t      =>   e1e2t_crs      !: cell surface at t-point (m2)
+   USE crs , ONLY :   e1e2w_msk  =>   e1e2w_msk      !: cell surface at t-point (m2)
    USE crs , ONLY :   e1u        =>   e1u_crs        !: horizontal scale factors at u-point (m)
    USE crs , ONLY :   e2u        =>   e2u_crs        !: horizontal scale factors at u-point (m)
@@ -342 +345 @@
    USE dom_oce , ONLY :   gdepw_0    =>  gdepw_0         !: f-points (m)
    USE dom_oce , ONLY :   gdept_1d   => gdept_1d          !: f-points (m)
+   USE dom_oce , ONLY :   e3t_1d     => e3t_1d          !: f-points (m)
    USE dom_oce , ONLY :   tmask      => tmask          !: f-points (m)
    USE dom_oce , ONLY :   umask      => umask          !: f-points (m)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/trcdia.F90

@@ -20 +20 @@
    !! trcdib_wr   : outputs of biological fields
    !!----------------------------------------------------------------------
-   USE trc_oce, ONLY : lk_offline ! offline flag
+   USE trc_oce, ONLY : lk_offline,nn_dttrc ! offline flag
    USE trc
    USE par_trc