diff --git a/src/OCE/ZDF/zdfgls.F90 b/src/OCE/ZDF/zdfgls.F90 index d5fd971fd3de13965fc979df8c85414d70857576..4c2f666596c97eaec9c7f856d27604b06d2facdf 100644 --- a/src/OCE/ZDF/zdfgls.F90 +++ b/src/OCE/ZDF/zdfgls.F90 @@ -447,24 +447,6 @@ CONTAINS en (ji,jj,ibot) = z_en ; en (ji,jj,ibotm1) = z_en END_2D ! - ! NOTE: ctl_stop with ln_isfcav when using GLS - IF( ln_isfcav) THEN ! top boundary (ocean cavity) - DO_2D( 0, 0, 0, 0 ) - itop = mikt(ji,jj) ! k top w-point - itopp1 = mikt(ji,jj) + 1 ! k+1 1st w-point below the top one - ! ! mask at the ocean surface points - z_en = MAX( rc02r * ustar2_top(ji,jj), rn_emin ) * ( 1._wp - tmask(ji,jj,1) ) - ! - !!gm TO BE VERIFIED !!! - ! Dirichlet condition applied at: - ! top level (itop) & Just below it (itopp1) - zd_lw(ji,jj,itop) = 0._wp ; zd_lw(ji,jj,itopp1) = 0._wp - zd_up(ji,jj,itop) = 0._wp ; zd_up(ji,jj,itopp1) = 0._wp - zdiag(ji,jj,itop) = 1._wp ; zdiag(ji,jj,itopp1) = 1._wp - en (ji,jj,itop) = z_en ; en (ji,jj,itopp1) = z_en - END_2D - ENDIF - ! CASE ( 1 ) ! Neumman boundary condition ! DO_2D( 0, 0, 0, 0 ) @@ -481,23 +463,6 @@ CONTAINS zd_up(ji,jj,ibot) = 0._wp ; zd_up(ji,jj,ibotm1) = 0._wp en (ji,jj,ibot) = z_en END_2D - ! NOTE: ctl_stop with ln_isfcav when using GLS - IF( ln_isfcav) THEN ! top boundary (ocean cavity) - DO_2D( 0, 0, 0, 0 ) - itop = mikt(ji,jj) ! k top w-point - itopp1 = mikt(ji,jj) + 1 ! k+1 1st w-point below the top one - ! ! mask at the ocean surface points - z_en = MAX( rc02r * ustar2_top(ji,jj), rn_emin ) * ( 1._wp - tmask(ji,jj,1) ) - ! - ! Bottom level Dirichlet condition: - ! Bottom level (ibot) & Just above it (ibotm1) - ! Dirichlet ! Neumann - zd_lw(ji,jj,itop) = 0._wp ! ! Remove zd_up from zdiag - zdiag(ji,jj,itop) = 1._wp ; zdiag(ji,jj,itopp1) = zdiag(ji,jj,itopp1) + zd_up(ji,jj,itopp1) - zd_up(ji,jj,itop) = 0._wp ; zd_up(ji,jj,itopp1) = 0._wp - en (ji,jj,itop) = z_en - END_2D - ENDIF ! END SELECT