Skip to content

Commit

Permalink
Squashed 'src/phast/PhreeqcRM/' changes from c3a4cb99..632d95dc
Browse files Browse the repository at this point in the history 
632d95dc Merge commit 'c29e63d53e42fe86eee0f8143a30540d907b7ca0'
c29e63d5 Squashed 'src/' changes from b738c1e5..4b4092a6
bb3dd07c Merge commit '1df6613c3904d2212257f952fa7c9e20cb379c98'
1df6613c Squashed 'database/' changes from 1a221cd7..bf60c1ca

git-subtree-dir: src/phast/PhreeqcRM
git-subtree-split: 632d95dca19295a28d74c9ece36e0b2b995a54d9
  • Loading branch information
Darth Vader committed Dec 6, 2024
1 parent 4e61b49 commit dfd11fa
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SOLUTION_MASTER_SPECIES


#
# elemen species alk gfw_formula element_gfw atomic number
# element species alk gfw_formula element_gfw atomic number
#


Expand Down
2 changes: 1 addition & 1 deletion database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SOLUTION_MASTER_SPECIES


#
# elemen species alk gfw_formula element_gfw atomic number
# element species alk gfw_formula element_gfw atomic number
#


Expand Down
2 changes: 1 addition & 1 deletion database/OtherDatabases/CEMDATA18.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SOLUTION_MASTER_SPECIES


#
# elemen species alk gfw_formula element_gfw atomic number
# element species alk gfw_formula element_gfw atomic number
#


Expand Down
2 changes: 1 addition & 1 deletion database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ SOLUTION_MASTER_SPECIES
#
#
#
# elemen species alk gfw_formula element_gfw atomic Disposition Source of data
# element species alk gfw_formula element_gfw atomic Disposition Source of data
# number PMATCHC
#
H H+ -1.0 H 1.008 # 1 Ele NAGRA NTB 91-17
Expand Down
8 changes: 4 additions & 4 deletions src/IPhreeqcPhast/IPhreeqc/CSelectedOutput.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ std::ostream& operator<< (std::ostream &os, const CSelectedOutput &a)
void CSelectedOutput::Serialize(
int row_number,
std::vector<int> &types, // each column for each row types, including headings
std::vector<long> &longs, // in order by occurance
std::vector<double> &doubles, // in order by occurance
std::vector<long> &longs, // in order by occurrence
std::vector<double> &doubles, // in order by occurrence
std::string &strings)
{
types.clear();
Expand Down Expand Up @@ -300,8 +300,8 @@ void CSelectedOutput::Serialize(
}
void CSelectedOutput::DeSerialize(
std::vector<int> &types, // each column for each row types, including headings
std::vector<long> &longs, // in order by occurance
std::vector<double> &doubles, // in order by occurance
std::vector<long> &longs, // in order by occurrence
std::vector<double> &doubles, // in order by occurrence
std::string &strings)
{
size_t i_types = 0, i_longs = 0, i_doubles = 0;
Expand Down
14 changes: 7 additions & 7 deletions src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ VRESULT IPhreeqc::AccumulateLine(const char *line)
}
catch (...)
{
this->AddError("AccumulateLine: An unhandled exception occured.\n");
this->AddError("AccumulateLine: An unhandled exception occurred.\n");
throw;
}
return VR_OUTOFMEMORY;
Expand Down Expand Up @@ -607,7 +607,7 @@ int IPhreeqc::load_db(const char* filename)
}
catch (...)
{
const char *errmsg = "LoadDatabase: An unhandled exception occured.\n";
const char *errmsg = "LoadDatabase: An unhandled exception occurred.\n";
try
{
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws IPhreeqcStop
Expand Down Expand Up @@ -670,7 +670,7 @@ int IPhreeqc::load_db_str(const char* input)
}
catch(...)
{
const char *errmsg = "LoadDatabaseString: An unhandled exception occured.\n";
const char *errmsg = "LoadDatabaseString: An unhandled exception occurred.\n";
try
{
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws PhreeqcStop
Expand Down Expand Up @@ -773,7 +773,7 @@ int IPhreeqc::RunAccumulated(void)
}
catch(...)
{
const char *errmsg = "RunAccumulated: An unhandled exception occured.\n";
const char *errmsg = "RunAccumulated: An unhandled exception occurred.\n";
try
{
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws PhreeqcStop
Expand Down Expand Up @@ -844,7 +844,7 @@ int IPhreeqc::RunFile(const char* filename)
}
catch(...)
{
const char *errmsg = "RunFile: An unhandled exception occured.\n";
const char *errmsg = "RunFile: An unhandled exception occurred.\n";
try
{
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws PhreeqcStop
Expand Down Expand Up @@ -907,7 +907,7 @@ int IPhreeqc::RunString(const char* input)
}
catch(...)
{
const char *errmsg = "RunString: An unhandled exception occured.\n";
const char *errmsg = "RunString: An unhandled exception occurred.\n";
try
{
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws PhreeqcStop
Expand Down Expand Up @@ -1285,7 +1285,7 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
// (punch.in == TRUE) when any "RUN" has contained
// a SELECTED_OUTPUT block since the last LoadDatabase call.
//
// Since LoadDatabase inititializes punch.in to FALSE
// Since LoadDatabase initializes punch.in to FALSE
// (via UnLoadDatabase...do_initialize)
// and punch.in is set to TRUE in read_selected_output
//
Expand Down
10 changes: 5 additions & 5 deletions src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extern "C" {
* Internally used to create an error condition.
* @param id The instance id returned from @ref CreateIPhreeqc.
* @param error_msg The error message to display.
* @return The current error count if successful; otherwise a negative value indicates an error occured (see @ref IPQ_RESULT).
* @return The current error count if successful; otherwise a negative value indicates an error occurred (see @ref IPQ_RESULT).
* @see GetErrorString, GetErrorStringLine, GetErrorStringLineCount, OutputErrorString
* @par Fortran90 Interface:
* @htmlonly
Expand All @@ -96,7 +96,7 @@ extern "C" {
* Internally used to create a warning condition.
* @param id The instance id returned from @ref CreateIPhreeqc.
* @param warn_msg The warning message to display.
* @return The current warning count if successful; otherwise a negative value indicates an error occured (see @ref IPQ_RESULT).
* @return The current warning count if successful; otherwise a negative value indicates an error occurred (see @ref IPQ_RESULT).
* @see GetWarningString, GetWarningStringLine, GetWarningStringLineCount, OutputWarningString
* @par Fortran90 Interface:
* @htmlonly
Expand Down Expand Up @@ -137,7 +137,7 @@ extern "C" {

/**
* Create a new IPhreeqc instance.
* @return A non-negative value if successful; otherwise a negative value indicates an error occured (see @ref IPQ_RESULT).
* @return A non-negative value if successful; otherwise a negative value indicates an error occurred (see @ref IPQ_RESULT).
* @see DestroyIPhreeqc
* @par Fortran90 Interface:
* @htmlonly
Expand Down Expand Up @@ -224,7 +224,7 @@ extern "C" {
* Retrieves the number of components in the current component list.
* @param id The instance id returned from @ref CreateIPhreeqc.
* @return The current count of components.
* A negative value indicates an error occured (see @ref IPQ_RESULT).
* A negative value indicates an error occurred (see @ref IPQ_RESULT).
* @see GetComponent
* @par Fortran90 Interface:
* @htmlonly
Expand Down Expand Up @@ -671,7 +671,7 @@ extern "C" {
* Retrieves the nth user number of the currently defined <B>SELECTED_OUTPUT</B> keyword blocks.
* @param id The instance id returned from @ref CreateIPhreeqc.
* @param n The zero-based index of the <B>SELECTED_OUTPUT</B> user number to retrieve.
* @return The nth defined user number; a negative value indicates an error occured.
* @return The nth defined user number; a negative value indicates an error occurred.
* @see GetCurrentSelectedOutputUserNumber, GetSelectedOutputCount, SetCurrentSelectedOutputUserNumber
* @pre @ref RunAccumulated, @ref RunFile, @ref RunString must have been called and returned 0 (zero) errors.
* @par Fortran90 Interface:
Expand Down
4 changes: 2 additions & 2 deletions src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SelectedOutput;
* @class IPhreeqcStop
*
* @brief This class is derived from std::exception and is thrown
* when an unrecoverable error has occured.
* when an unrecoverable error has occurred.
*/
class IPQ_DLL_EXPORT IPhreeqcStop : public std::exception
{
Expand Down Expand Up @@ -289,7 +289,7 @@ class IPQ_DLL_EXPORT IPhreeqc : public PHRQ_io
/**
* Retrieves the nth user number of the currently defined <B>SELECTED_OUTPUT</B> blocks.
* @param n The zero-based index of the <B>SELECTED_OUTPUT</B> user number to retrieve.
* @return The nth defined user number; a negative value indicates an error occured.
* @return The nth defined user number; a negative value indicates an error occurred.
* @see GetCurrentSelectedOutputUserNumber, GetSelectedOutputCount, SetCurrentSelectedOutputUserNumber
*/
int GetNthSelectedOutputUserNumber(int n)const;
Expand Down

0 comments on commit dfd11fa

Please sign in to comment.