Skip to content
This repository has been archived by the owner on Apr 15, 2024. It is now read-only.

Commit

Permalink
Version 5.82
Browse files Browse the repository at this point in the history
  • Loading branch information
perabrahamsen committed Mar 5, 2019
1 parent d8f4b05 commit 021a5c0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
10 changes: 10 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2019-03-05 Per Abrahamsen <[email protected]>

* Version 5.82 released.

2019-03-05 Per Abrahamsen <[email protected]>

* reaction_adsorption.C (tick_soil): Only use solute part of
'solute' chemical, and try to be smart about when to use the new
and old water content.

2019-03-04 Per Abrahamsen <[email protected]>

* Version 5.81 released.
Expand Down
9 changes: 5 additions & 4 deletions reaction_adsorption.C
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,13 @@ struct ReactionAdsorption : public Reaction
for (size_t c = 0; c < cell_size; c++)
{
scope.set_cell (c);
const double Theta = soil_water.Theta (c);
const double has_solute = solute.M_primary (c);
const double Theta_old = soil_water.Theta_old (c);
const double Theta_new = soil_water.Theta (c);
const double has_solute = solute.C_primary (c) * Theta_old;
const double has_sorbed = sorbed.M_primary (c);
const double has_M = has_solute + has_sorbed;
const double want_C = equilibrium->M_to_C1 (soil, Theta, c, has_M);
const double want_solute = want_C * Theta;
const double want_C = equilibrium->M_to_C1 (soil, Theta_new, c, has_M);
const double want_solute = want_C * Theta_new;
const double want_sorbed = has_M - want_solute;

daisy_assert (approximate (has_solute + has_sorbed,
Expand Down
2 changes: 1 addition & 1 deletion version.C
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// version.C -- automatically generated file

extern const char *const version = "5.81";
extern const char *const version = "5.82";
extern const char *const version_date = __DATE__;

0 comments on commit 021a5c0

Please sign in to comment.