max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'src/' changes from 57b3a6cd..ce34aa5e

Browse Source 
ce34aa5e Merge commit '8184121c90728d5026fa0485302e4584a559ffd8'
8184121c Squashed 'phreeqcpp/' changes from f5587da..b576c75

git-subtree-dir: src
git-subtree-split: ce34aa5e05ddf53f5b3b7ae2240437d31a736f4a
This commit is contained in:
Darth Vader 2024-11-18 21:29:52 +00:00
parent 5f272b1fe3
commit 21df9497a0
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phreeqcpp/kinetics.cpp
View File

@ -1880,13 +1880,13 @@ set_reaction(int i, int use_mix, int use_kinetics)
/* /*
* Find surface * 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) //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)); // // 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 // // appt: we may come here with zero kinetic reaction, but surface may have to keep DONNAN_DL
} //}
else //else
dl_type_x = cxxSurface::NO_DL; // dl_type_x = cxxSurface::NO_DL;
if (use.Get_surface_in() == TRUE) if (use.Get_surface_in() == TRUE)
{ {
use.Set_surface_ptr(Utilities::Rxn_find(Rxn_surface_map, i)); use.Set_surface_ptr(Utilities::Rxn_find(Rxn_surface_map, i));

3
phreeqcpp/mainsubs.cpp
View File

@ -1444,7 +1444,8 @@ xsurface_save(int n_user)
temp_surface.Set_n_user(n_user); temp_surface.Set_n_user(n_user);
temp_surface.Set_n_user_end(n_user); temp_surface.Set_n_user_end(n_user);
temp_surface.Set_new_def(false); 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_solution_equilibria(false);
temp_surface.Set_n_solution(-999); temp_surface.Set_n_solution(-999);