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

Merge commit '9152ca292e2ea2a042a654b6393b6fcd9160e0d4'

Browse Source
This commit is contained in:
Scott R Charlton 2018-08-02 22:24:30 -06:00
commit 98d075d472
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phreeqcpp/PPassemblage.h
View File

@ -49,7 +49,7 @@ class cxxPPassemblage:public cxxNumKeyword
void Set_new_def(bool tf) {this->new_def = tf;}
cxxPPassemblageComp *Find(const std::string name);
std::set<std::string> cxxPPassemblage::GetPhases(Phreeqc * phreeqc_ptr);
std::set<std::string> GetPhases(Phreeqc * phreeqc_ptr);
void totalize(Phreeqc * phreeqc_ptr);
void Serialize(Dictionary & dictionary, std::vector < int >&ints, std::vector < double >&doubles);
void Deserialize(Dictionary & dictionary, std::vector < int >&ints, std::vector < double >&doubles, int &ii, int &dd);

12
phreeqcpp/Phreeqc.h
View File

@ -1157,12 +1157,12 @@ public:
void set_phast(int);
int next_user_number(Keywords::KEYWORDS key);
size_t list_components(std::list<std::string> &list_c);
size_t Phreeqc::list_EquilibriumPhases(std::list<std::string> &list_pp);
size_t Phreeqc::list_GasComponents(std::list<std::string> &list_gc);
size_t Phreeqc::list_KineticReactions(std::list<std::string> &list_kr);
size_t Phreeqc::list_SolidSolutions(std::list<std::string> &list_comps, std::list<std::string> &list_names);
size_t Phreeqc::list_Surfaces(std::list<std::string> &surftype, std::list<std::string> &surf);
size_t Phreeqc::list_Exchangers(std::list<std::string> &ex);
size_t list_EquilibriumPhases(std::list<std::string> &list_pp);
size_t list_GasComponents(std::list<std::string> &list_gc);
size_t list_KineticReactions(std::list<std::string> &list_kr);
size_t list_SolidSolutions(std::list<std::string> &list_comps, std::list<std::string> &list_names);
size_t list_Surfaces(std::list<std::string> &surftype, std::list<std::string> &surf);
size_t list_Exchangers(std::list<std::string> &ex);
PHRQ_io * Get_phrq_io(void) {return this->phrq_io;}
void Set_run_cells_one_step(const bool tf) {this->run_cells_one_step = tf;}