Merge commit 'c960834c29f63cc7e43b2175565c4aa2e599e067'

usgs-coupled · Nov 18, 2024 · 6e5133f · 6e5133f
2 parents 4393c8d + c960834
commit 6e5133f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/kinetics.cpp b/src/phast/PhreeqcRM/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/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/mainsubs.cpp b/src/phast/PhreeqcRM/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);