mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
Squashed 'src/' changes from 7bae85a3..51eedbc2
51eedbc2 Fix typos git-subtree-dir: src git-subtree-split: 51eedbc27a828ff36a1ca732abea394e7f7f32bd
This commit is contained in:
Darth Vader
parent
3e1c0d11a2
commit
3e3c063083
@ -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();
|
||||
@ -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;
|
||||
|
||||
14
IPhreeqc.cpp
14
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
|
||||
//
|
||||
|
||||
10
IPhreeqc.h
10
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 <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:
|
||||
|
||||
@ -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 @@ public:
|
||||
/**
|
||||
* 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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user