Diffusion SpecMiCP / ReactMiCP 122408819b15

Merge branch 'specmicp/supersaturation'
122408819b15
Actions

Authored by georget on Sep 21 2016, 19:30.

Description

Merge branch 'specmicp/supersaturation'

Details

Committed

georget

Sep 21 2016, 19:30

Parents

rSPECMICP37c71514d885: reactmicp: Add constraint to remove the precipitation of a mineral
rSPECMICPa39bd5f94ba0: Merge branch 'master' of bitbucket.org:specmicp/specmicp

Branches

Unknown

Tags

Unknown

Event Timeline

georget committed rSPECMICP122408819b15: Merge branch 'specmicp/supersaturation' (authored by georget).Sep 21 2016, 19:30

Merged Changes

Commit	Author	Details	Committed
37c71514d885	georget	reactmicp: Add constraint to remove the precipitation of a mineral	Sep 21 2016
539807e728a9	georget	specmicp: fix no precipitation in adim solver	Sep 21 2016
05066e4d960f	georget	debug: print the current residuals	Sep 21 2016
30a1dd687101	georget	unsaturated: add residuals in post_residuals_impl	Sep 21 2016
395d9580f23b	georget	minor: fix dfpm configuration print	Sep 21 2016
166fda7bb141	georget	specmicp: add mineral upper bound in ReactantBox	Sep 19 2016
f451f96e739a	georget	micpsolver: clean BoxVI code	Sep 18 2016
4837d2ea3d06	georget	specmicp solver : add upper bound on minerals	Sep 18 2016
b33545f17075	georget	micpsolver : add box constrained VI solver	Sep 18 2016

Changes (38)

				Path
	M			src/dfpm/io/print.cpp
	M			src/reactmicp/io/configuration_unsaturated.cpp
	M			src/reactmicp/solver/reactive_transport_solver.cpp
	M			src/reactmicp/systems/unsaturated/aqueous_equation.cpp
	M			src/reactmicp/systems/unsaturated/aqueous_equation.hpp
	M			src/reactmicp/systems/unsaturated/aqueous_pressure_equation.cpp
	M			src/reactmicp/systems/unsaturated/aqueous_pressure_equation.hpp
	M			src/reactmicp/systems/unsaturated/boundary_conditions.cpp
	M			src/reactmicp/systems/unsaturated/boundary_conditions.hpp
	M			src/reactmicp/systems/unsaturated/equilibrium_stagger.cpp
	M			src/reactmicp/systems/unsaturated/fv_1dof_equation.hpp
	M			src/reactmicp/systems/unsaturated/fv_1dof_equation.inl
	M			src/reactmicp/systems/unsaturated/pressure_equation.cpp
	M			src/reactmicp/systems/unsaturated/pressure_equation.hpp
	M			src/reactmicp/systems/unsaturated/saturation_equation.cpp
	M			src/reactmicp/systems/unsaturated/saturation_equation.hpp
	M			src/reactmicp/systems/unsaturated/saturation_pressure_equation.cpp
	M			src/reactmicp/systems/unsaturated/saturation_pressure_equation.hpp
	M			src/specmicp/adimensional/adimensional_system.cpp
	M			src/specmicp/adimensional/adimensional_system.hpp
	M			src/specmicp/adimensional/adimensional_system_solver.cpp
	M			src/specmicp/adimensional/adimensional_system_structs.hpp
	M			src/specmicp/problem_solver/reactant_box.cpp
	M			src/specmicp/problem_solver/reactant_box.hpp
	M			src/specmicp_common/micpsolver/CMakeLists.txt
	P			src/specmicp_common/micpsolver/boxviprog.hpp Copied from src/specmicp_database/aqueous_selector.hpp
	M			src/specmicp_common/micpsolver/micpsolver.hpp
	M			src/specmicp_common/micpsolver/micpsolver.inl
	M			src/specmicp_common/micpsolver/micpsolver_base.inl
	M			src/specmicp_common/micpsolver/ncp_function.hpp
	A			src/specmicp_common/micpsolver/reformulations.inl
	M			tests/specmicp/CMakeLists.txt
	P			tests/specmicp/adim/adimensional_system_boxvi.cpp Copied from tests/specmicp/adim/adimensional_system_carboalu.cpp
	P			tests/specmicp/adim/adimensional_system_carboalu.cpp Copied to tests/specmicp/adim/adimensional_system_boxvi.cpp
	M			tests/specmicp/adim/adimensional_system_problem_solver.cpp
	M			tests/specmicp_common/CMakeLists.txt
	M			tests/specmicp_common/micpsolver.cpp
	A			tests/specmicp_common/ncp_functions.cpp