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

Merge commit '0366caf10b0748d78cb718898c714e1397a008b4'

Browse Source
This commit is contained in:
Scott R Charlton 2019-12-13 10:20:33 -07:00
commit c5ff247765
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
phreeqcpp/PBasic.cpp
View File

@ -1549,6 +1549,18 @@ listtokens(FILE * f, tokenrec * l_buf)
case tokcell_saturation:
output_msg("CELL_SATURATION");
break;
case tokvelocity_x:
output_msg("VELOCITY_X");
break;
case tokvelocity_y:
output_msg("VELOCITY_Y");
break;
case tokvelocity_z:
output_msg("VELOCITY_Z");
break;
case toktransport_cell_no:
output_msg("TRANSPORT_CELL_NO");
break;
case tokiso:
output_msg("ISO");
break;
@ -3636,6 +3648,30 @@ factor(struct LOC_exec * LINK)
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "cell_saturation");
}
break;
case tokvelocity_x:
{
double x1 = (double)PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "velocity_x");
}
break;
case tokvelocity_y:
{
double x1 = (double)PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "velocity_y");
}
break;
case tokvelocity_z:
{
double x1 = (double)PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "velocity_z");
}
break;
case toktransport_cell_no:
{
double x1 = (double)PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "transport_cell_no");
}
break;
case toksc:
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->calc_SC();
break;
@ -7307,6 +7343,10 @@ const std::map<const std::string, PBasic::BASIC_TOKEN>::value_type temp_tokens[]
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("cell_pore_volume", PBasic::tokcell_pore_volume),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("cell_porosity", PBasic::tokcell_porosity),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("cell_saturation", PBasic::tokcell_saturation),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("velocity_x", PBasic::tokvelocity_x),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("velocity_y", PBasic::tokvelocity_y),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("velocity_z", PBasic::tokvelocity_z),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("transport_cell_no", PBasic::toktransport_cell_no),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("totmole", PBasic::toktotmole),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("totmol", PBasic::toktotmol),
std::map<const std::string, PBasic::BASIC_TOKEN>::value_type("totmoles", PBasic::toktotmoles),

4
phreeqcpp/PBasic.h
View File

@ -285,6 +285,10 @@ public:
tokcell_pore_volume,
tokcell_porosity,
tokcell_saturation,
tokvelocity_x,
tokvelocity_y,
tokvelocity_z,
toktransport_cell_no,
#if defined MULTICHART
tokplot_xy,
#endif