Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge private to public #105

Closed
wants to merge 4 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/benthic_calcite.F90
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,14 @@ subroutine do_bottom(self,_ARGUMENTS_DO_BOTTOM_)
_HORIZONTAL_LOOP_BEGIN_

_GET_HORIZONTAL_(self%id_c, bL2c)
_GET_(self%id_om_cal, om_cal)

if (self%iswcal==0) then ! NB select case would be cleaner but makes vectorization impossible for ifort 14
fdiss = 0._rk
elseif (self%iswcal==1) then
_GET_(self%id_om_cal, om_cal)
fdiss = (max(1._rk-om_cal,0._rk))**self%ndiss
else
_GET_(self%id_om_cal, om_cal)
fdiss = max(0._rk,(1._rk-om_cal)/(1._rk-om_cal+self%KcalomX))
end if

Expand Down
Loading