Changeset 10115 for NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF

Timestamp:

2018-09-12T15:59:13+02:00 (6 years ago)

Author:

cbricaud

Message:

phase 3.6 coarsening branch with nemo_3.6_rev9192

Location:

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF

Files:

• zdfddm_substitute.h90 (modified) (1 diff)
• zdfric.F90 (modified) (1 diff)
• zdftke.F90 (modified) (1 diff)
• zdftmx.F90 (modified) (1 diff)

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm_substitute.h90

@@ -5 +5 @@
    !!      with a constant or 1D or 2D or 3D array, using CPP macro.
    !!----------------------------------------------------------------------
-#if defined key_zdfddm
+#if defined key_zdfddm && ! defined key_offline
 !   'key_zdfddm' :                      avs: 3D array defined in zdfddm module
 #   define   fsavs(i,j,k)       avs(i,j,k)

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90

@@ -178 +178 @@
       !  Compute Ekman depth from wind stress forcing.
       ! -------------------------------------------------------
-      zflageos = ( 0.5 + SIGN( 0.5, nn_eos - 1. ) ) * rau0
+      !SF  zflageos = ( 0.5 + SIGN( 0.5, nn_eos - 1. ) ) * rau0
+      !SF  DO jj = 1, jpj
+      !SF     DO ji = 1, jpi
+      !SF        zrhos          = rhop(ji,jj,1) + zflageos * ( 1. - tmask(ji,jj,1) )
+      !SF        zustar         = SQRT( taum(ji,jj) / ( zrhos +  rsmall ) )
+      !SF        ekm_dep(ji,jj) = rn_ekmfc * zustar / ( ABS( ff(ji,jj) ) + rsmall )
+      !SF        ekm_dep(ji,jj) = MAX(ekm_dep(ji,jj),rn_mldmin) ! Minimun allowed
+      !SF        ekm_dep(ji,jj) = MIN(ekm_dep(ji,jj),rn_mldmax) ! Maximum allowed
+      !SF     END DO
+      !SF  END DO
+
       DO jj = 1, jpj
          DO ji = 1, jpi
-            zrhos          = rhop(ji,jj,1) + zflageos * ( 1. - tmask(ji,jj,1) )
-            zustar         = SQRT( taum(ji,jj) / ( zrhos +  rsmall ) )
+            zustar         = SQRT( taum(ji,jj) * r1_rau0 )
             ekm_dep(ji,jj) = rn_ekmfc * zustar / ( ABS( ff(ji,jj) ) + rsmall )
             ekm_dep(ji,jj) = MAX(ekm_dep(ji,jj),rn_mldmin) ! Minimun allowed

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -865 +865 @@
               CALL tke_avn                               ! recompute avt, avm, avmu, avmv and dissl (approximation)
               !
-              avt_k (:,:,:) = avt (:,:,:)
-              avm_k (:,:,:) = avm (:,:,:)
-              avmu_k(:,:,:) = avmu(:,:,:)
-              avmv_k(:,:,:) = avmv(:,:,:)
-              !
               DO jit = nit000 + 1, nit000 + 10   ;   CALL zdf_tke( jit )   ;   END DO
            ENDIF
         ELSE                                   !* Start from rest
            en(:,:,:) = rn_emin * tmask(:,:,:)
-           DO jk = 1, jpk                           ! set the Kz to the background value
-              avt (:,:,jk) = avtb(jk) * wmask (:,:,jk)
-              avm (:,:,jk) = avmb(jk) * wmask (:,:,jk)
-              avmu(:,:,jk) = avmb(jk) * wumask(:,:,jk)
-              avmv(:,:,jk) = avmb(jk) * wvmask(:,:,jk)
-           END DO
         ENDIF
-        !
+           !                                   ! Initialize av*_k
+           avt_k (:,:,:) = avt (:,:,:)
+           avm_k (:,:,:) = avm (:,:,:)
+           avmu_k(:,:,:) = avmu(:,:,:)
+           avmv_k(:,:,:) = avmv(:,:,:)
+           !
      ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN   ! Create restart file
         !                                   ! -------------------

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90

@@ -235 +235 @@
 
       !                             ! compute the form function using N2 at each time step
+      zdn2dz     (:,:,jpk) = 0.e0
       zempba_3d_1(:,:,jpk) = 0.e0
       zempba_3d_2(:,:,jpk) = 0.e0