Changeset 5105 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2015-02-24T15:46:25+01:00 (9 years ago)

Author:

cbricaud

Message:

bug correction

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (4 diffs)

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

@@ -25 +25 @@
    USE trcini_my_trc   ! MY_TRC   initialisation
    USE trcdta          ! initialisation from files
-   USE daymod          ! calendar manager
-   USE zpshde          ! partial step: hor. derivative   (zps_hde routine)
+   USE zpshde,ONLY: zps_hde    ! partial step: hor. derivative   (zps_hde routine)
+   USE zpshde_crs      ! partial step: hor. derivative   (zps_hde routine)
    USE prtctl_trc      ! Print control passive tracers (prt_ctl_trc_init routine)
    USE trcsub          ! variables to substep passive tracers
    USE lib_mpp         ! distribued memory computing library
-   USE sbc_oce
+   USE sbc_oce, ONLY : ltrcdm2dc
+   USE crs    , ONLY : ln_crs
+   USE dom_oce, ONLY : nn_cla
  
    IMPLICIT NONE
@@ -143 +145 @@
  
       tra(:,:,:,:) = 0._wp
-      IF( ln_zps .AND. .NOT. lk_c1d )   &              ! Partial steps: before horizontal gradient of passive
-        &    CALL zps_hde( nit000, jptra, trn, pgtu=gtru, pgtv=gtrv, sgtu=gtrui, sgtv=gtrvi )       ! tracers at the bottom ocean level
-
+      IF( ln_zps .AND. .NOT. lk_c1d )THEN              ! Partial steps: before horizontal gradient of passive
+         IF( ln_crs )  THEN
+            CALL zps_hde_crs( nit000, jptra, trn, gtru, gtrv )
+         ELSE
+            CALL zps_hde( nit000, jptra, trn, pgtu=gtru, pgtv=gtrv, sgtu=gtrui, sgtv=gtrvi )! tracers at the bottom ocean level
+         ENDIF
+      ENDIF
       !
       IF( nn_dttrc /= 1 )        CALL trc_sub_ini      ! Initialize variables for substepping passive tracers
@@ -188 +194 @@
       !!----------------------------------------------------------------------
       USE trcadv        , ONLY:   trc_adv_alloc          ! TOP-related alloc routines...
+      USE trcadv_crs    , ONLY:   trc_adv_alloc_crs      ! TOP-related alloc routines..
       USE trc           , ONLY:   trc_alloc
       USE trcnxt        , ONLY:   trc_nxt_alloc
       USE trczdf        , ONLY:   trc_zdf_alloc
+      USE trczdf_crs    , ONLY:   trc_zdf_alloc_crs
       USE trdtrc_oce    , ONLY:   trd_trc_oce_alloc
 #if defined key_trdmxl_trc 
@@ -200 +208 @@
       !
       ierr =        trc_adv_alloc()          ! Start of TOP-related alloc routines...
+      ierr = ierr + trc_adv_alloc_crs()
       ierr = ierr + trc_alloc    ()
       ierr = ierr + trc_nxt_alloc()
       ierr = ierr + trc_zdf_alloc()
+      ierr = ierr + trc_zdf_alloc_crs()
       ierr = ierr + trd_trc_oce_alloc()
 #if defined key_trdmxl_trc