Changeset 7170

Timestamp:

2016-11-03T06:08:40+01:00 (7 years ago)

Author:

gm

Message:

#1751 - branch SIMPLIF_6_aerobulk: traadv_fct & zdftke ==> back to previous revision

Location:

branches/2016/dev_r6711_SIMPLIF_6_aerobulk/NEMOGCM/NEMO/OPA_SRC

Files:

• TRA/traadv_fct.F90 (modified) (1 diff)
• ZDF/zdftke.F90 (modified) (2 diffs)

branches/2016/dev_r6711_SIMPLIF_6_aerobulk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90

@@ -728 +728 @@
                !
                IF( tmask(ji,jj,jk+1) == 0._wp) THEN   ! Switch to second order centered at bottom
-                  zwd (ji,jj,jk) = 2._wp
-                  zwi (ji,jj,jk) = 0._wp     ! 1  ici ou à l'autre
-                  zws (ji,jj,jk) = 0._wp     !    car 1 dans la diag inferieur au fond et superior en surf
-                  zwrm(ji,jj,jk) = 3._wp * pt_in(ji,jj,jk)  
+                  zwd (ji,jj,jk) = 1._wp
+                  zwi (ji,jj,jk) = 0._wp
+                  zws (ji,jj,jk) = 0._wp
+                  zwrm(ji,jj,jk) = 0.5 * ( pt_in(ji,jj,jk-1) + pt_in(ji,jj,jk) )    
                ENDIF
             END DO

branches/2016/dev_r6711_SIMPLIF_6_aerobulk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -558 +558 @@
          zmxlm(:,:,1) = rn_mxl0
       ENDIF
-      
-!!gm  copy from GLS:
-!      ! Set surface roughness length
-!      SELECT CASE ( nn_z0_met )
-!      !
-!      CASE ( 0 )             ! Constant roughness          
-!         zhsro(:,:) = rn_hsro
-!      CASE ( 1 )             ! Standard Charnock formula for surface roughness
-!         zhsro(:,:) = MAX(rsbc_zs1 * ustars2(:,:), rn_hsro)
-!  with:           rsbc_zs1  = rn_charn/grav
-!      CASE ( 2 )             ! Roughness formulae according to Rascle et al., Ocean Modelling (2008)
-!         zdep(:,:)  = 30.*TANH(2.*0.3/(28.*SQRT(MAX(ustars2(:,:),rsmall))))             ! Wave age (eq. 10)
-!         zhsro(:,:) = MAX(rsbc_zs2 * ustars2(:,:) * zdep(:,:)**1.5, rn_hsro) ! zhsro = rn_frac_hs * Hsw (eq. 11)
-!      !
-!      END SELECT
-!!gm end
-
-
-
       !
       DO jk = 2, jpkm1              ! interior value : l=sqrt(2*e/n^2)
@@ -807 +788 @@
 
       IF( ln_mxl0 ) THEN
-         IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '   use a surface mixing length = F(stress) :   set rn_mxl0 = rmxl_min'
          rn_mxl0 = rmxl_min