From 2212f9ccb1ed55b463746d524ace70e78258d5bc Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Mon, 10 May 2021 13:36:52 -0600 Subject: [PATCH] fixed bug in reprep when sit had surface species. Added capability of sit + edl, have not tested it --- Phreeqc.h | 1 + prep.cpp | 4 ++-- sit.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Phreeqc.h b/Phreeqc.h index 30982a91..1b934e7a 100644 --- a/Phreeqc.h +++ b/Phreeqc.h @@ -1398,6 +1398,7 @@ protected: *---------------------------------------------------------------------- */ std::vector x; size_t count_unknowns; + size_t sit_aqueous_unknowns; size_t max_unknowns; class unknown* ah2o_unknown; diff --git a/prep.cpp b/prep.cpp index f9d995ed..59df4ba1 100644 --- a/prep.cpp +++ b/prep.cpp @@ -1240,8 +1240,7 @@ build_model(void) } if (dl_type_x != cxxSurface::NO_DL && (/*pitzer_model == TRUE || */sit_model == TRUE)) //DL_pitz { - error_msg("-diffuse_layer option not available for Pizer or SIT model", - STOP); + warning_msg("-diffuse_layer option not tested for SIT model"); } /* * Sum diffuse layer water into hydrogen and oxygen mass balances @@ -1285,6 +1284,7 @@ build_model(void) k++; count_unknowns++; } + sit_aqueous_unknowns = count_unknowns - j0; } /* * Rewrite phases to current master species diff --git a/sit.cpp b/sit.cpp index 6268e450..27825c26 100644 --- a/sit.cpp +++ b/sit.cpp @@ -1117,7 +1117,8 @@ model_sit(void) { count_basis_change++; - count_unknowns -= (int)this->s_x.size(); + //count_unknowns -= (int)this->s_x.size(); + count_unknowns -= sit_aqueous_unknowns; reprep(); full_pitzer = false; }