Skip to content

Commit 3873951

Browse files
author
Darth Vader
committed
Merge commit 'dfd11facc26446d545c0553d095d366f64576b7b'
2 parents e3e1901 + dfd11fa commit 3873951

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎src/phast/PhreeqcRM/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOLUTION_MASTER_SPECIES
2424

2525

2626
#
27-
# elemen species alk gfw_formula element_gfw atomic number
27+
# element species alk gfw_formula element_gfw atomic number
2828
#
2929

3030

‎src/phast/PhreeqcRM/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SOLUTION_MASTER_SPECIES
2222

2323

2424
#
25-
# elemen species alk gfw_formula element_gfw atomic number
25+
# element species alk gfw_formula element_gfw atomic number
2626
#
2727

2828

‎src/phast/PhreeqcRM/database/OtherDatabases/CEMDATA18.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SOLUTION_MASTER_SPECIES
1818

1919

2020
#
21-
# elemen species alk gfw_formula element_gfw atomic number
21+
# element species alk gfw_formula element_gfw atomic number
2222
#
2323

2424

‎src/phast/PhreeqcRM/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ SOLUTION_MASTER_SPECIES
6161
#
6262
#
6363
#
64-
# elemen species alk gfw_formula element_gfw atomic Disposition Source of data
64+
# element species alk gfw_formula element_gfw atomic Disposition Source of data
6565
# number PMATCHC
6666
#
6767
H H+ -1.0 H 1.008 # 1 Ele NAGRA NTB 91-17

‎src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/CSelectedOutput.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ std::ostream& operator<< (std::ostream &os, const CSelectedOutput &a)
247247
void CSelectedOutput::Serialize(
248248
int row_number,
249249
std::vector<int> &types, // each column for each row types, including headings
250-
std::vector<long> &longs, // in order by occurance
251-
std::vector<double> &doubles, // in order by occurance
250+
std::vector<long> &longs, // in order by occurrence
251+
std::vector<double> &doubles, // in order by occurrence
252252
std::string &strings)
253253
{
254254
types.clear();
@@ -300,8 +300,8 @@ void CSelectedOutput::Serialize(
300300
}
301301
void CSelectedOutput::DeSerialize(
302302
std::vector<int> &types, // each column for each row types, including headings
303-
std::vector<long> &longs, // in order by occurance
304-
std::vector<double> &doubles, // in order by occurance
303+
std::vector<long> &longs, // in order by occurrence
304+
std::vector<double> &doubles, // in order by occurrence
305305
std::string &strings)
306306
{
307307
size_t i_types = 0, i_longs = 0, i_doubles = 0;

‎src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ VRESULT IPhreeqc::AccumulateLine(const char *line)
110110
}
111111
catch (...)
112112
{
113-
this->AddError("AccumulateLine: An unhandled exception occured.\n");
113+
this->AddError("AccumulateLine: An unhandled exception occurred.\n");
114114
throw;
115115
}
116116
return VR_OUTOFMEMORY;
@@ -607,7 +607,7 @@ int IPhreeqc::load_db(const char* filename)
607607
}
608608
catch (...)
609609
{
610-
const char *errmsg = "LoadDatabase: An unhandled exception occured.\n";
610+
const char *errmsg = "LoadDatabase: An unhandled exception occurred.\n";
611611
try
612612
{
613613
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws IPhreeqcStop
@@ -670,7 +670,7 @@ int IPhreeqc::load_db_str(const char* input)
670670
}
671671
catch(...)
672672
{
673-
const char *errmsg = "LoadDatabaseString: An unhandled exception occured.\n";
673+
const char *errmsg = "LoadDatabaseString: An unhandled exception occurred.\n";
674674
try
675675
{
676676
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws PhreeqcStop
@@ -773,7 +773,7 @@ int IPhreeqc::RunAccumulated(void)
773773
}
774774
catch(...)
775775
{
776-
const char *errmsg = "RunAccumulated: An unhandled exception occured.\n";
776+
const char *errmsg = "RunAccumulated: An unhandled exception occurred.\n";
777777
try
778778
{
779779
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws PhreeqcStop
@@ -844,7 +844,7 @@ int IPhreeqc::RunFile(const char* filename)
844844
}
845845
catch(...)
846846
{
847-
const char *errmsg = "RunFile: An unhandled exception occured.\n";
847+
const char *errmsg = "RunFile: An unhandled exception occurred.\n";
848848
try
849849
{
850850
this->PhreeqcPtr->error_msg(errmsg, STOP); // throws PhreeqcStop
@@ -907,7 +907,7 @@ int IPhreeqc::RunString(const char* input)
907907
}
908908
catch(...)
909909
{
910-
const char *errmsg = "RunString: An unhandled exception occured.\n";
910+
const char *errmsg = "RunString: An unhandled exception occurred.\n";
911911
try
912912
{
913913
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
12851285
// (punch.in == TRUE) when any "RUN" has contained
12861286
// a SELECTED_OUTPUT block since the last LoadDatabase call.
12871287
//
1288-
// Since LoadDatabase inititializes punch.in to FALSE
1288+
// Since LoadDatabase initializes punch.in to FALSE
12891289
// (via UnLoadDatabase...do_initialize)
12901290
// and punch.in is set to TRUE in read_selected_output
12911291
//

‎src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ extern "C" {
7373
* Internally used to create an error condition.
7474
* @param id The instance id returned from @ref CreateIPhreeqc.
7575
* @param error_msg The error message to display.
76-
* @return The current error count if successful; otherwise a negative value indicates an error occured (see @ref IPQ_RESULT).
76+
* @return The current error count if successful; otherwise a negative value indicates an error occurred (see @ref IPQ_RESULT).
7777
* @see GetErrorString, GetErrorStringLine, GetErrorStringLineCount, OutputErrorString
7878
* @par Fortran90 Interface:
7979
* @htmlonly
@@ -96,7 +96,7 @@ extern "C" {
9696
* Internally used to create a warning condition.
9797
* @param id The instance id returned from @ref CreateIPhreeqc.
9898
* @param warn_msg The warning message to display.
99-
* @return The current warning count if successful; otherwise a negative value indicates an error occured (see @ref IPQ_RESULT).
99+
* @return The current warning count if successful; otherwise a negative value indicates an error occurred (see @ref IPQ_RESULT).
100100
* @see GetWarningString, GetWarningStringLine, GetWarningStringLineCount, OutputWarningString
101101
* @par Fortran90 Interface:
102102
* @htmlonly
@@ -137,7 +137,7 @@ extern "C" {
137137

138138
/**
139139
* Create a new IPhreeqc instance.
140-
* @return A non-negative value if successful; otherwise a negative value indicates an error occured (see @ref IPQ_RESULT).
140+
* @return A non-negative value if successful; otherwise a negative value indicates an error occurred (see @ref IPQ_RESULT).
141141
* @see DestroyIPhreeqc
142142
* @par Fortran90 Interface:
143143
* @htmlonly
@@ -224,7 +224,7 @@ extern "C" {
224224
* Retrieves the number of components in the current component list.
225225
* @param id The instance id returned from @ref CreateIPhreeqc.
226226
* @return The current count of components.
227-
* A negative value indicates an error occured (see @ref IPQ_RESULT).
227+
* A negative value indicates an error occurred (see @ref IPQ_RESULT).
228228
* @see GetComponent
229229
* @par Fortran90 Interface:
230230
* @htmlonly
@@ -671,7 +671,7 @@ extern "C" {
671671
* Retrieves the nth user number of the currently defined <B>SELECTED_OUTPUT</B> keyword blocks.
672672
* @param id The instance id returned from @ref CreateIPhreeqc.
673673
* @param n The zero-based index of the <B>SELECTED_OUTPUT</B> user number to retrieve.
674-
* @return The nth defined user number; a negative value indicates an error occured.
674+
* @return The nth defined user number; a negative value indicates an error occurred.
675675
* @see GetCurrentSelectedOutputUserNumber, GetSelectedOutputCount, SetCurrentSelectedOutputUserNumber
676676
* @pre @ref RunAccumulated, @ref RunFile, @ref RunString must have been called and returned 0 (zero) errors.
677677
* @par Fortran90 Interface:

‎src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SelectedOutput;
2525
* @class IPhreeqcStop
2626
*
2727
* @brief This class is derived from std::exception and is thrown
28-
* when an unrecoverable error has occured.
28+
* when an unrecoverable error has occurred.
2929
*/
3030
class IPQ_DLL_EXPORT IPhreeqcStop : public std::exception
3131
{
@@ -289,7 +289,7 @@ class IPQ_DLL_EXPORT IPhreeqc : public PHRQ_io
289289
/**
290290
* Retrieves the nth user number of the currently defined <B>SELECTED_OUTPUT</B> blocks.
291291
* @param n The zero-based index of the <B>SELECTED_OUTPUT</B> user number to retrieve.
292-
* @return The nth defined user number; a negative value indicates an error occured.
292+
* @return The nth defined user number; a negative value indicates an error occurred.
293293
* @see GetCurrentSelectedOutputUserNumber, GetSelectedOutputCount, SetCurrentSelectedOutputUserNumber
294294
*/
295295
int GetNthSelectedOutputUserNumber(int n)const;

0 commit comments

Comments
 (0)