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

Made pitzer_exchange_gammas true the default.

Browse Source 
Fixed up read_input to use correct keyword numbers. Updated tidy to tidy the appropriate data blocks when _modify blocks are read. 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4830 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2010-09-21 20:58:42 +00:00
parent 5aafb6d533
commit 11b0315dd8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Exchange.cxx
View File

@ -31,7 +31,7 @@ cxxExchange::cxxExchange()
//
: cxxNumKeyword()
{
pitzer_exchange_gammas = false;
pitzer_exchange_gammas = true;
}
cxxExchange::cxxExchange(struct exchange * exchange_ptr)
@ -63,7 +63,7 @@ cxxExchange::cxxExchange(PHREEQC_PTR_ARG_COMMA const std::map < int, cxxExchange
cxxNumKeyword()
{
this->n_user = this->n_user_end = l_n_user;
this->pitzer_exchange_gammas = false;
this->pitzer_exchange_gammas = true;
//
// Mix exchangers
//

2
ReadClass.cxx
View File

@ -1322,6 +1322,8 @@ read_equilibrium_phases_modify(void)
pp_assemblage_copy(entity_ptr, &(pp_assemblage[n]), entity_ptr->n_user);
free_check_null(pp_assemblage[n].description);
pp_assemblage[n].description = string_duplicate(entity_ptr->description);
pp_assemblage[n].new_def = TRUE;
pp_assemblage[n].n_user_end = pp_assemblage[n].n_user;
pp_assemblage_free(entity_ptr);
free_check_null(entity_ptr);