Changeset 8317 for branches/UKMO/dev_r5518_GO6M_StableTo6959/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

Timestamp:

2017-07-11T14:34:04+02:00 (7 years ago)

Author:

frrh

Message:

Merge in required revisions using command:

svn merge -r 6820:6959 \u200bsvn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/nemo_v3_6_STABLE

followed by running fcm conflicts and resolving a number of issues manually.

File:

• branches/UKMO/dev_r5518_GO6M_StableTo6959/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) (3 diffs)

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

@@ -77 +77 @@
          IF( ln_trcdmp )        CALL trc_dmp( kstp )            ! internal damping trends
                                 CALL trc_adv( kstp )            ! horizontal & vertical advection 
-# if defined key_debug_medusa
-         IF(lwp) WRITE(numout,*) ' MEDUSA trc_trp after trc_adv at kt =', kstp
-         CALL trc_rst_tra_stat
-         CALL flush(numout)
-# endif
+         IF( ln_zps ) THEN
+           IF( ln_isfcav ) THEN ; CALL zps_hde_isf( kstp, jptra, trb, pgtu=gtru, pgtv=gtrv, pgtui=gtrui, pgtvi=gtrvi )  ! both top & bottom
+           ELSE                 ; CALL zps_hde    ( kstp, jptra, trb, gtru, gtrv )                                      !  only bottom
+           ENDIF
+         ENDIF
                                 CALL trc_ldf( kstp )            ! lateral mixing
          IF( .NOT. lk_offline .AND. lk_zdfkpp )    &
@@ -107 +107 @@
 #endif
 
-         IF( ln_zps  .AND. .NOT. ln_isfcav)        &
-            &            CALL zps_hde    ( kstp, jptra, trn, gtru, gtrv )   ! Partial steps: now horizontal gradient of passive
-         IF( ln_zps .AND.        ln_isfcav)        &
-            &            CALL zps_hde_isf( kstp, jptra, trn, pgtu=gtru, pgtv=gtrv, pgtui=gtrui, pgtvi=gtrvi )  ! Partial steps: now horizontal gradient of passive
-                                                                ! tracers at the bottom ocean level
-         !
       ELSE                                               ! 1D vertical configuration
                                 CALL trc_sbc( kstp )            ! surface boundary condition
@@ -124 +118 @@
       !
       IF( nn_timing == 1 )   CALL timing_stop('trc_trp')
+      !
+9400  FORMAT(a25,i4,D23.16)
       !
    END SUBROUTINE trc_trp