From d647eec2ef056b43657992f58c4b14f0b84c9bcb Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Sun, 13 Jun 2021 07:37:41 -0600 Subject: [PATCH 1/4] Added StateSave, StateApply, StateDelete with documentation for C++. Need testing, Fortran, and C --- Phreeqc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Phreeqc.h b/Phreeqc.h index 30982a91..75b9267e 100644 --- a/Phreeqc.h +++ b/Phreeqc.h @@ -1083,6 +1083,8 @@ public: std::map& Get_Rxn_pp_assemblage_map() { return this->Rxn_pp_assemblage_map; } std::map& Get_Rxn_ss_assemblage_map() { return this->Rxn_ss_assemblage_map; } std::map& Get_Rxn_surface_map() { return this->Rxn_surface_map; } + std::map& Get_Rxn_mix_map() { return this->Rxn_mix_map; } + std::map& Get_Rxn_reaction_map() { return this->Rxn_reaction_map; } std::map& Get_Rxn_temperature_map() { return this->Rxn_temperature_map; } std::map& Get_Rxn_pressure_map() { return this->Rxn_pressure_map; } From c22cbb7bc7be764a69e5b0e991522076de9675d1 Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Sun, 13 Jun 2021 07:37:41 -0600 Subject: [PATCH 2/4] Added StateSave, StateApply, StateDelete with documentation for C++. Need testing, Fortran, and C --- phreeqcpp/Phreeqc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phreeqcpp/Phreeqc.h b/phreeqcpp/Phreeqc.h index 30982a91..75b9267e 100644 --- a/phreeqcpp/Phreeqc.h +++ b/phreeqcpp/Phreeqc.h @@ -1083,6 +1083,8 @@ public: std::map& Get_Rxn_pp_assemblage_map() { return this->Rxn_pp_assemblage_map; } std::map& Get_Rxn_ss_assemblage_map() { return this->Rxn_ss_assemblage_map; } std::map& Get_Rxn_surface_map() { return this->Rxn_surface_map; } + std::map& Get_Rxn_mix_map() { return this->Rxn_mix_map; } + std::map& Get_Rxn_reaction_map() { return this->Rxn_reaction_map; } std::map& Get_Rxn_temperature_map() { return this->Rxn_temperature_map; } std::map& Get_Rxn_pressure_map() { return this->Rxn_pressure_map; } From cb1f9afc172ad6266d637134ce751959c7130e40 Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Mon, 14 Jun 2021 09:38:48 -0600 Subject: [PATCH 3/4] Finished up C, Fortran, documentation. Need to check DOxygen --- Phreeqc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Phreeqc.h b/Phreeqc.h index 02f4ccc9..6f36b79e 100644 --- a/Phreeqc.h +++ b/Phreeqc.h @@ -1088,7 +1088,6 @@ public: std::map& Get_Rxn_temperature_map() { return this->Rxn_temperature_map; } std::map& Get_Rxn_pressure_map() { return this->Rxn_pressure_map; } - protected: void init(void); From 524bfc46cc89c9b8899b917f5828837e9079de2b Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Mon, 14 Jun 2021 09:38:48 -0600 Subject: [PATCH 4/4] Finished up C, Fortran, documentation. Need to check DOxygen --- phreeqcpp/Phreeqc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/phreeqcpp/Phreeqc.h b/phreeqcpp/Phreeqc.h index 02f4ccc9..6f36b79e 100644 --- a/phreeqcpp/Phreeqc.h +++ b/phreeqcpp/Phreeqc.h @@ -1088,7 +1088,6 @@ public: std::map& Get_Rxn_temperature_map() { return this->Rxn_temperature_map; } std::map& Get_Rxn_pressure_map() { return this->Rxn_pressure_map; } - protected: void init(void);