Changeset 10874 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/ZDF/zdfphy.F90

Timestamp:

2019-04-15T15:57:37+02:00 (5 years ago)

Author:

davestorkey

Message:

branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Revert all changes so far in preparation for implementation of new design.

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/ZDF/zdfphy.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/ZDF/zdfphy.F90

@@ -218 +218 @@
 
 
-   SUBROUTINE zdf_phy( kt, ktlev1, ktlev2, kt2lev1, kt2lev2 )
+   SUBROUTINE zdf_phy( kt )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE zdf_phy  ***
@@ -231 +231 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
-      INTEGER, INTENT(in) ::   ktlev1, ktlev2   ! time level indices for 3-time-level source terms
-      INTEGER, INTENT(in) ::   kt2lev1, kt2lev2 ! time level indices for 2-time-level source terms
       !
       INTEGER ::   ji, jj, jk   ! dummy loop indice
@@ -256 +254 @@
       !
       IF( l_zdfsh2 )   &         !* shear production at w-points (energy conserving form)
-         CALL zdf_sh2( uu(:,:,:,ktlev1), vv(:,:,:,ktlev1), uu(:,:,:,ktlev2), vv(:,:,:,ktlev2), avm_k,   &     ! <<== in
+         CALL zdf_sh2( ub, vb, un, vn, avm_k,   &     ! <<== in
             &                           zsh2    )     ! ==>> out : shear production
       !
       SELECT CASE ( nzdf_phy )                  !* Vertical eddy viscosity and diffusivity coefficients at w-points
-      CASE( np_RIC )   ;   CALL zdf_ric( kt, gdept(:,:,:,kt2lev2), zsh2, avm_k, avt_k )    ! Richardson number dependent Kz
-      CASE( np_TKE )   ;   CALL zdf_tke( kt, ktlev1, ktlev2, kt2lev1, kt2lev2, zsh2, avm_k, avt_k )    ! TKE closure scheme for Kz
+      CASE( np_RIC )   ;   CALL zdf_ric( kt, gdept_n, zsh2, avm_k, avt_k )    ! Richardson number dependent Kz
+      CASE( np_TKE )   ;   CALL zdf_tke( kt         , zsh2, avm_k, avt_k )    ! TKE closure scheme for Kz
       CASE( np_GLS )   ;   CALL zdf_gls( kt         , zsh2, avm_k, avt_k )    ! GLS closure scheme for Kz
       CASE( np_OSM )   ;   CALL zdf_osm( kt               , avm_k, avt_k )    ! OSMOSIS closure scheme for Kz
@@ -320 +318 @@
          IF( ln_zdfgls )   CALL gls_rst( kt, 'WRITE' )
          IF( ln_zdfric )   CALL ric_rst( kt, 'WRITE' ) 
-         ! NB. OSMOSIS restart (osm_rst) will be called in step.F90 after ww has been updated
+         ! NB. OSMOSIS restart (osm_rst) will be called in step.F90 after wn has been updated
       ENDIF
       !