Skip to content

Commit

Permalink
Merge branch 'master' into 110-double-diag-nitrifcation
Browse files Browse the repository at this point in the history
  • Loading branch information
wathen authored Jul 24, 2024
2 parents 011c37d + ce84dee commit eec4fac
Showing 1 changed file with 2 additions and 1 deletion.
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

0 comments on commit eec4fac

Please sign in to comment.