max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

reorder classes in global_structures.h to avoid incomplete definitions

Browse Source
This commit is contained in:
SpaceIm 2024-08-11 21:08:04 +02:00
parent 178b05c251
commit 128b7a1109
1 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
phreeqcpp/global_structures.h
View File

@ -210,6 +210,20 @@ struct Change_Surf
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
* CReaction * CReaction
*---------------------------------------------------------------------- */ *---------------------------------------------------------------------- */
class rxn_token
{
public:
~rxn_token() {};
rxn_token()
{
s = NULL;
coef = 0.0;
name = NULL;
}
class species* s;
LDBLE coef;
const char* name;
};
class CReaction class CReaction
{ {
public: public:
@ -229,20 +243,6 @@ public:
double dz[3]; double dz[3];
std::vector<class rxn_token> token; std::vector<class rxn_token> token;
}; };
class rxn_token
{
public:
~rxn_token() {};
rxn_token()
{
s = NULL;
coef = 0.0;
name = NULL;
}
class species* s;
LDBLE coef;
const char* name;
};
class save class save
{ {
public: public:
@ -322,6 +322,86 @@ public:
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
* Inverse * Inverse
*---------------------------------------------------------------------- */ *---------------------------------------------------------------------- */
class inv_elts
{
public:
~inv_elts() {};
inv_elts()
{
name = NULL;
master = NULL;
row = 0;
//uncertainties.clear();
}
const char* name;
class master* master;
size_t row;
std::vector<double> uncertainties;
};
class isotope
{
public:
~isotope() {};
isotope()
{
isotope_number = 0;
elt_name = NULL;
isotope_name = NULL;
total = 0;
ratio = 0;
ratio_uncertainty = 0;
x_ratio_uncertainty = 0;
master = NULL;
primary = NULL;
coef = 0; /* coefficient of element in phase */
}
LDBLE isotope_number;
const char* elt_name;
const char* isotope_name;
LDBLE total;
LDBLE ratio;
LDBLE ratio_uncertainty;
LDBLE x_ratio_uncertainty;
class master* master;
class master* primary;
LDBLE coef;
};
class inv_isotope
{
public:
~inv_isotope() {};
inv_isotope()
{
isotope_name = NULL;
isotope_number = 0;
elt_name = NULL;
//uncertainties.clear();
}
const char* isotope_name;
LDBLE isotope_number;
const char* elt_name;
std::vector<double> uncertainties;
};
class inv_phases
{
public:
~inv_phases() {};
inv_phases()
{
name = NULL;
phase = NULL;
column = 0;
constraint = EITHER;
force = FALSE;
//isotopes.clear();
}
const char* name;
class phase* phase;
int column;
int constraint;
int force;
std::vector<class isotope> isotopes;
};
class inverse class inverse
{ {
public: public:
@ -386,58 +466,6 @@ public:
const char* netpath; const char* netpath;
const char* pat; const char* pat;
}; };
class inv_elts
{
public:
~inv_elts() {};
inv_elts()
{
name = NULL;
master = NULL;
row = 0;
//uncertainties.clear();
}
const char* name;
class master* master;
size_t row;
std::vector<double> uncertainties;
};
class inv_isotope
{
public:
~inv_isotope() {};
inv_isotope()
{
isotope_name = NULL;
isotope_number = 0;
elt_name = NULL;
//uncertainties.clear();
}
const char* isotope_name;
LDBLE isotope_number;
const char* elt_name;
std::vector<double> uncertainties;
};
class inv_phases
{
public:
~inv_phases() {};
inv_phases()
{
name = NULL;
phase = NULL;
column = 0;
constraint = EITHER;
force = FALSE;
//isotopes.clear();
}
const char* name;
class phase* phase;
int column;
int constraint;
int force;
std::vector<class isotope> isotopes;
};
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
* Jacobian and Mass balance lists * Jacobian and Mass balance lists
*---------------------------------------------------------------------- */ *---------------------------------------------------------------------- */
@ -538,34 +566,6 @@ public:
LDBLE* target; LDBLE* target;
LDBLE coef; LDBLE coef;
}; };
class isotope
{
public:
~isotope() {};
isotope()
{
isotope_number = 0;
elt_name = NULL;
isotope_name = NULL;
total = 0;
ratio = 0;
ratio_uncertainty = 0;
x_ratio_uncertainty = 0;
master = NULL;
primary = NULL;
coef = 0; /* coefficient of element in phase */
}
LDBLE isotope_number;
const char* elt_name;
const char* isotope_name;
LDBLE total;
LDBLE ratio;
LDBLE ratio_uncertainty;
LDBLE x_ratio_uncertainty;
class master* master;
class master* primary;
LDBLE coef;
};
class iso class iso
{ {
public: public:
@ -1107,20 +1107,6 @@ public:
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
* Reaction work space * Reaction work space
*---------------------------------------------------------------------- */ *---------------------------------------------------------------------- */
class reaction_temp
{
public:
~reaction_temp() {};
reaction_temp()
{
for (size_t i = 0; i < MAX_LOG_K_INDICES; i++) logk[i] = 0;
for (size_t i = 0; i < 3; i++) dz[i] = 0;
//token.clear();
}
LDBLE logk[MAX_LOG_K_INDICES];
LDBLE dz[3];
std::vector<class rxn_token_temp> token;
};
class rxn_token_temp class rxn_token_temp
{ {
public: public:
@ -1139,6 +1125,20 @@ public:
class unknown* unknown; class unknown* unknown;
LDBLE coef; LDBLE coef;
}; };
class reaction_temp
{
public:
~reaction_temp() {};
reaction_temp()
{
for (size_t i = 0; i < MAX_LOG_K_INDICES; i++) logk[i] = 0;
for (size_t i = 0; i < 3; i++) dz[i] = 0;
//token.clear();
}
LDBLE logk[MAX_LOG_K_INDICES];
LDBLE dz[3];
std::vector<class rxn_token_temp> token;
};
class unknown_list class unknown_list
{ {
public: public: