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

Timestamp:

2015-12-17T16:48:41+01:00 (8 years ago)

Author:

cbricaud

Message:

correction of bugs from last update and improvments for CRS

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (2 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 zpshde,ONLY: zps_hde    ! partial step: hor. derivative   (zps_hde routine)
+   USE zpshde,ONLY: zps_hde, zps_hde_isf    ! 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, ONLY : ltrcdm2dc
    USE crs    , ONLY : ln_crs
-   USE dom_oce, ONLY : nn_cla
+   USE dom_oce, ONLY : nn_cla, ln_isfcav
    USE trcice          ! tracers in sea ice
+   USE sbc_oce
  
    IMPLICIT NONE
@@ -148 +148 @@
  
       tra(:,:,:,:) = 0._wp
-      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
-            IF( ln_zps .AND. .NOT. lk_c1d .AND. .NOT. ln_isfcav )   &              ! Partial steps: before horizontal gradient of passive
-            &    CALL zps_hde    ( nit000, jptra, trn, gtru, gtrv  )  ! Partial steps: before horizontal gradient
-            IF( ln_zps .AND. .NOT. lk_c1d .AND.       ln_isfcav )   &
-            &    CALL zps_hde_isf( nit000, jptra, trn, pgtu=gtru, pgtv=gtrv, pgtui=gtrui, pgtvi=gtrvi )       ! tracers at the bottom ocean level
-         ENDIF
+      IF( ln_crs )  THEN
+         CALL zps_hde_crs( nit000, jptra, trn, gtru, gtrv )
+      ELSE
+         IF( ln_zps .AND. .NOT. lk_c1d .AND. .NOT. ln_isfcav )   &              ! Partial steps: before horizontal gradient of passive
+         &    CALL zps_hde    ( nit000, jptra, trn, gtru, gtrv  )  ! Partial steps: before horizontal gradient
+         IF( ln_zps .AND. .NOT. lk_c1d .AND.       ln_isfcav )   &
+         &    CALL zps_hde_isf( nit000, jptra, trn, pgtu=gtru, pgtv=gtrv, pgtui=gtrui, pgtvi=gtrvi )       ! tracers at the bottom ocean level
       ENDIF