Changeset 11180 for NEMO/branches/UKMO/NEMO_4.0_surge/src/OCE/ZDF/zdfphy.F90

Timestamp:

2019-06-25T18:50:27+02:00 (5 years ago)

Author:

clne

Message:

Initial commit of code for 2d (surge) work in NEMO4.
This is aiming to replicate the 3.6 version in branches/UKMO/dev_r5518_Surge_Modelling

File:

• NEMO/branches/UKMO/NEMO_4.0_surge/src/OCE/ZDF/zdfphy.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0_surge/src/OCE/ZDF/zdfphy.F90

@@ -84 +84 @@
       !!----------------------------------------------------------------------
       !
+      IF( .NOT. ln_2d ) THEN
+
       IF(lwp) THEN
          WRITE(numout,*)
@@ -209 +211 @@
       IF( ln_zdfswm )   CALL zdf_swm_init       ! surface  wave-driven mixing
 
+      ENDIF  ! .NOT. ln_2d
+
       !                          !== top/bottom friction  ==!
       CALL zdf_drg_init
@@ -251 +255 @@
          ENDIF
       ENDIF
+      
+      IF( .NOT. ln_2d ) THEN ! 2D case only uses bottom friction from this routine     
       !
       !                       !==  Kz from chosen turbulent closure  ==!   (avm_k, avt_k)
@@ -321 +327 @@
          ! NB. OSMOSIS restart (osm_rst) will be called in step.F90 after wn has been updated
       ENDIF
+      
+      ENDIF  ! .NOT. ln_2d
       !
       IF( ln_timing )   CALL timing_stop('zdf_phy')