From dfd11facc26446d545c0553d095d366f64576b7b Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Fri, 6 Dec 2024 00:36:14 +0000 Subject: [PATCH] Squashed 'src/phast/PhreeqcRM/' changes from c3a4cb99..632d95dc 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 --- .../CEMDATA18-31-03-2022-phaseVol.dat | 2 +- .../CEMDATA18.1-16-01-2019-phaseVol.dat | 2 +- database/OtherDatabases/CEMDATA18.dat | 2 +- .../PSINA_12_07_110615_DAV_s_win.dat | 2 +- src/IPhreeqcPhast/IPhreeqc/CSelectedOutput.cpp | 8 ++++---- src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp | 14 +++++++------- src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h | 10 +++++----- src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat b/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat index 1006f59b5..02b98dc6e 100644 --- a/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat +++ b/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat @@ -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 # diff --git a/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat b/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat index c27d0cd5f..37a27609d 100644 --- a/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat +++ b/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat @@ -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 # diff --git a/database/OtherDatabases/CEMDATA18.dat b/database/OtherDatabases/CEMDATA18.dat index 80be5ba54..961964fc5 100644 --- a/database/OtherDatabases/CEMDATA18.dat +++ b/database/OtherDatabases/CEMDATA18.dat @@ -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 # diff --git a/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat b/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat index 0e6c024f2..23d304101 100644 --- a/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat +++ b/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat @@ -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 diff --git a/src/IPhreeqcPhast/IPhreeqc/CSelectedOutput.cpp b/src/IPhreeqcPhast/IPhreeqc/CSelectedOutput.cpp index 5298f1cb4..23aeb60d6 100644 --- a/src/IPhreeqcPhast/IPhreeqc/CSelectedOutput.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/CSelectedOutput.cpp @@ -247,8 +247,8 @@ std::ostream& operator<< (std::ostream &os, const CSelectedOutput &a) void CSelectedOutput::Serialize( int row_number, std::vector &types, // each column for each row types, including headings - std::vector &longs, // in order by occurance - std::vector &doubles, // in order by occurance + std::vector &longs, // in order by occurrence + std::vector &doubles, // in order by occurrence std::string &strings) { types.clear(); @@ -300,8 +300,8 @@ void CSelectedOutput::Serialize( } void CSelectedOutput::DeSerialize( std::vector &types, // each column for each row types, including headings - std::vector &longs, // in order by occurance - std::vector &doubles, // in order by occurance + std::vector &longs, // in order by occurrence + std::vector &doubles, // in order by occurrence std::string &strings) { size_t i_types = 0, i_longs = 0, i_doubles = 0; diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp index 20b967b43..e5b450171 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp @@ -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; @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 // diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h index 6be24c247..a45b9b9df 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h @@ -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 @@ -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 @@ -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 @@ -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 @@ -671,7 +671,7 @@ extern "C" { * Retrieves the nth user number of the currently defined SELECTED_OUTPUT keyword blocks. * @param id The instance id returned from @ref CreateIPhreeqc. * @param n The zero-based index of the SELECTED_OUTPUT 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: diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp index 036b14caa..714274780 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp @@ -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 { @@ -289,7 +289,7 @@ class IPQ_DLL_EXPORT IPhreeqc : public PHRQ_io /** * Retrieves the nth user number of the currently defined SELECTED_OUTPUT blocks. * @param n The zero-based index of the SELECTED_OUTPUT 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;