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 '0b3f349ad3bb84d493fc4d54bb6537a1fcafbc15'

Browse Source
This commit is contained in:
Darth Vader 2024-05-16 01:04:33 +00:00
commit 70e32eba2f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phreeqcpp/PBasic.cpp
View File

@ -3247,6 +3247,7 @@ factor(struct LOC_exec * LINK)
char* min_name = strexpr(LINK); char* min_name = strexpr(LINK);
require(tokrp, LINK); require(tokrp, LINK);
if (parse_all) { if (parse_all) {
PhreeqcPtr->PHRQ_free(min_name);
n.UU.val = 1; n.UU.val = 1;
break; break;
} }
@ -3419,6 +3420,7 @@ factor(struct LOC_exec * LINK)
char* min_name = strexpr(LINK); char* min_name = strexpr(LINK);
require(tokrp, LINK); require(tokrp, LINK);
if (parse_all) { if (parse_all) {
PhreeqcPtr->PHRQ_free(min_name);
n.UU.val = 1; n.UU.val = 1;
break; break;
} }
@ -3574,6 +3576,7 @@ factor(struct LOC_exec * LINK)
char* min_name = strexpr(LINK); char* min_name = strexpr(LINK);
require(tokrp, LINK); require(tokrp, LINK);
if (parse_all) { if (parse_all) {
PhreeqcPtr->PHRQ_free(min_name);
n.UU.val = 1; n.UU.val = 1;
break; break;
} }
@ -3668,6 +3671,7 @@ factor(struct LOC_exec * LINK)
char* min_name = strexpr(LINK); char* min_name = strexpr(LINK);
require(tokrp, LINK); require(tokrp, LINK);
if (parse_all) { if (parse_all) {
PhreeqcPtr->PHRQ_free(min_name);
n.UU.val = 1; n.UU.val = 1;
break; break;
} }

12
phreeqcpp/PhreeqcKeywords/Keywords.cpp
View File

@ -229,12 +229,12 @@ std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_RATE_P
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_RATE_PARAMETERS_SVD, "RATE_PARAMETERS_SVD"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_RATE_PARAMETERS_SVD, "RATE_PARAMETERS_SVD"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_RATE_PARAMETERS_HERMANSKA, "RATE_PARAMETERS_HERMANSKA"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_RATE_PARAMETERS_HERMANSKA, "RATE_PARAMETERS_HERMANSKA"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_MEAN_GAMMAS, "RATE_MEAN_GAMMAS"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_MEAN_GAMMAS, "RATE_MEAN_GAMMAS"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_SOLUTION_MIX, "SOLUTION_MIX"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_SOLUTION_MIX, "SOLUTION_MIX"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_EXCHANGE_MIX, "EXCHANGE_MIX"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_EXCHANGE_MIX, "EXCHANGE_MIX"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_GAS_PHASE_MIX, "GAS_PHASE_MIX"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_GAS_PHASE_MIX, "GAS_PHASE_MIX"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_KINETICS_MIX, "KINETICS_MIX"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_KINETICS_MIX, "KINETICS_MIX"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_PPASSEMBLAGE_MIX, "EQUILIBRIUM_PHASES_MIX"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_PPASSEMBLAGE_MIX, "EQUILIBRIUM_PHASES_MIX"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_SSASSEMBLAGE_MIX, "SOLID_SOLUTIONS_MIX"), std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_SSASSEMBLAGE_MIX, "SOLID_SOLUTIONS_MIX"),
std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_SURFACE_MIX, "SURFACE_MIX") std::map<Keywords::KEYWORDS, const std::string>::value_type(Keywords::KEY_SURFACE_MIX, "SURFACE_MIX")
}; };
const std::map<Keywords::KEYWORDS, const std::string> Keywords::phreeqc_keyword_names(temp_keyword_names, temp_keyword_names + sizeof temp_keyword_names / sizeof temp_keyword_names[0]); const std::map<Keywords::KEYWORDS, const std::string> Keywords::phreeqc_keyword_names(temp_keyword_names, temp_keyword_names + sizeof temp_keyword_names / sizeof temp_keyword_names[0]);