From c960834c29f63cc7e43b2175565c4aa2e599e067 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Mon, 18 Nov 2024 21:37:25 +0000 Subject: [PATCH] Squashed 'src/phast/PhreeqcRM/' changes from 8f04d76b..3020a662 3020a662 Merge commit 'b2c5566ad7c5b1806f496a9512c32a70b89a643d' b2c5566a Squashed 'src/' changes from 274ce014..164c290b git-subtree-dir: src/phast/PhreeqcRM git-subtree-split: 3020a6620943ac3f2cdb2d4884ec46e196a397b9 --- src/IPhreeqcPhast/IPhreeqc/phreeqcpp/kinetics.cpp | 14 +++++++------- src/IPhreeqcPhast/IPhreeqc/phreeqcpp/mainsubs.cpp | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/kinetics.cpp b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/kinetics.cpp index 2f6f6592..8b427856 100644 --- a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/kinetics.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/kinetics.cpp @@ -1880,13 +1880,13 @@ set_reaction(int i, int use_mix, int use_kinetics) /* * Find surface */ - if (use.Get_surface_in() && use.Get_kinetics_in() && use.Get_kinetics_ptr() && !use.Get_kinetics_ptr()->Get_use_cvode() && reaction_step > 1) - { - // use.Set_surface_ptr(Utilities::Rxn_find(Rxn_surface_map, i)); - // appt: we may come here with zero kinetic reaction, but surface may have to keep DONNAN_DL - } - else - dl_type_x = cxxSurface::NO_DL; + //if (use.Get_surface_in() && use.Get_kinetics_in() && use.Get_kinetics_ptr() && !use.Get_kinetics_ptr()->Get_use_cvode() && reaction_step > 1) + //{ + // // use.Set_surface_ptr(Utilities::Rxn_find(Rxn_surface_map, i)); + // // appt: we may come here with zero kinetic reaction, but surface may have to keep DONNAN_DL + //} + //else + // dl_type_x = cxxSurface::NO_DL; if (use.Get_surface_in() == TRUE) { use.Set_surface_ptr(Utilities::Rxn_find(Rxn_surface_map, i)); diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/mainsubs.cpp b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/mainsubs.cpp index 27cb9ad2..ba317af0 100644 --- a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/mainsubs.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/mainsubs.cpp @@ -1444,7 +1444,8 @@ xsurface_save(int n_user) temp_surface.Set_n_user(n_user); temp_surface.Set_n_user_end(n_user); temp_surface.Set_new_def(false); - temp_surface.Set_dl_type(dl_type_x); + //temp_surface.Set_dl_type(dl_type_x); + temp_surface.Set_dl_type(use.Get_surface_ptr()->Get_dl_type()); temp_surface.Set_solution_equilibria(false); temp_surface.Set_n_solution(-999);