Changeset 10023 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ZDF

Timestamp:

2018-08-02T08:19:03+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.2 bug correction in dynnxt + domvvl_RK3 creation

Location:

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ZDF

Files:

• zdfmxl.F90 (modified) (1 diff)
• zdftke.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ZDF/zdfmxl.F90

@@ -126 +126 @@
       IF( .NOT.l_offline ) THEN
          IF( iom_use("mldr10_1") ) THEN
-            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldr10_1", hmlp - risfdep)   ! mixed layer thickness
-            ELSE                  ;  CALL iom_put( "mldr10_1", hmlp )            ! mixed layer depth
+            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldr10_1", hmlp - ht_isf)   ! mixed layer thickness
+            ELSE                  ;  CALL iom_put( "mldr10_1", hmlp )           ! mixed layer depth
             END IF
          END IF
          IF( iom_use("mldkz5") ) THEN
-            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldkz5"  , hmld - risfdep )   ! turbocline thickness
-            ELSE                  ;  CALL iom_put( "mldkz5"  , hmld )             ! turbocline depth
+            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldkz5"  , hmld - ht_isf )   ! turbocline thickness
+            ELSE                  ;  CALL iom_put( "mldkz5"  , hmld )            ! turbocline depth
             END IF
          ENDIF

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ZDF/zdftke.F90

@@ -392 +392 @@
       !                            !  TKE due to surface and internal wave breaking
       !                            !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-!!gm BUG : in the exp  remove the depth of ssh !!!
+!!gm BUG : in the exp  remove the depth of ssh !!!   ===>>>  not sure of that
 !!gm       i.e. use gde3w in argument (pdepw)
       
@@ -518 +518 @@
  !!gm Not sure of that coding for ISF....
       ! where wmask = 0 set zmxlm == p_e3w
+      
+!!gm  pdepw(ji,jj,mikt(ji,jj)+1) = ht_n ....
+!!gm  pdepw(ji,jj,mikt(ji,jj)) = ht_isf(:,:) + ssh(:,:,Nnn)
+      
       CASE ( 0 )           ! bounded by the distance to surface and bottom
          DO jk = 2, jpkm1