Commit bd2b9deb authored by Knut's avatar Knut
Browse files

Merge branch 'cfl' into ss_nn_MUDFLAT

parents e5d45bbf fe1cbdb9
......@@ -241,7 +241,7 @@
do j=jmin-HALO,jmax+HALO
do i=imin-HALO,imax+HALO
if (az(i,j) .eq. 1) then
! Note (KK): This would be the correct diluation if hn was
! Note (KK): This would be the correct dilution if hn was
! corrected in start_macro. This also requires,
! that ho=hn is done in coordinates!
! fabm_pel(i,j,kmax,n) = fabm_pel(i,j,kmax,n)*(_ONE_-fwf_int(i,j)/ho(i,j,kmax))
......
......@@ -269,7 +269,7 @@
do j=jmin-HALO,jmax+HALO
do i=imin-HALO,imax+HALO
if (az(i,j) .eq. 1) then
! Note (KK): This would be the correct diluation if hn was
! Note (KK): This would be the correct dilution if hn was
! corrected in start_macro. This also requires,
! that ho=hn is done in coordinates!
! S(i,j,kmax) = S(i,j,kmax)*(_ONE_-fwf_int(i,j)/ho(i,j,kmax))
......
......@@ -60,7 +60,7 @@
! Note (KK): This would be the correct handling for fwf_int, but it
! requires ho=hn in coordinates. See also necessary changes
! in do_salinity and do_getm_fabm!
! ssen = ssen + fwf_int
! Do not update ssen, because true sseo is needed!
! hn(:,:,kmax) = hn(:,:,kmax) + fwf_int
do j=jmin-HALO,jmax+HALO ! Defining 'old' and 'new' sea surface
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment