Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Viscosity #58

Merged
merged 2 commits into from
May 10, 2024
Merged

Viscosity #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c90534
Freed result from strexpr
dlparkhurst May 9, 2024
ff5876b
Pad needed a free. Ran all test cases.
dlparkhurst May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/PBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3211,13 +3211,15 @@ factor(struct LOC_exec * LINK)
case tokpad_:
case tokpad:
{
char* str;
n.stringval = true;
require(toklp, LINK);
string1 = strexpr(LINK);
str = strexpr(LINK);
require(tokcomma, LINK);
i = intexpr(LINK);
require(tokrp, LINK);
n.UU.sval = PhreeqcPtr->string_pad(string1, i);
n.UU.sval = PhreeqcPtr->string_pad(str, i);
PhreeqcPtr->PHRQ_free(str);
}
break;

Expand Down Expand Up @@ -3249,6 +3251,7 @@ factor(struct LOC_exec * LINK)
break;
}
std::string min_string = min_name;
PhreeqcPtr->PHRQ_free(min_name);
Utilities::str_tolower(min_string);
std::map<std::string, std::vector<double> >::const_iterator it = PhreeqcPtr->rate_parameters_pk.find(min_string);
if (it == PhreeqcPtr->rate_parameters_pk.end())
Expand Down Expand Up @@ -3420,6 +3423,7 @@ factor(struct LOC_exec * LINK)
break;
}
std::string min_string = min_name;
PhreeqcPtr->PHRQ_free(min_name);
Utilities::str_tolower(min_string);
std::map<std::string, std::vector<double> >::const_iterator it = PhreeqcPtr->rate_parameters_svd.find(min_string);
if (it == PhreeqcPtr->rate_parameters_svd.end())
Expand Down Expand Up @@ -3574,6 +3578,7 @@ factor(struct LOC_exec * LINK)
break;
}
std::string min_string = min_name;
PhreeqcPtr->PHRQ_free(min_name);
Utilities::str_tolower(min_string);
std::map<std::string, std::vector<double> >::const_iterator it = PhreeqcPtr->rate_parameters_hermanska.find(min_string);
if (it == PhreeqcPtr->rate_parameters_hermanska.end())
Expand Down Expand Up @@ -3667,6 +3672,7 @@ factor(struct LOC_exec * LINK)
break;
}
std::string min_string = min_name;
PhreeqcPtr->PHRQ_free(min_name);
Utilities::str_tolower(min_string);
std::map<std::string, cxxNameDouble>::const_iterator it = PhreeqcPtr->mean_gammas.find(min_string);
if (it == PhreeqcPtr->mean_gammas.end() || it->second.size() == 0)
Expand Down Expand Up @@ -5403,7 +5409,9 @@ cmdput_(struct LOC_exec* LINK)
require(toklp, LINK);

/* get first argumen */
std::string s_value = strexpr(LINK);
char* str = strexpr(LINK);
std::string s_value = str;
PhreeqcPtr->PHRQ_free(str);

for (;;)
{
Expand Down