Merge commit '7a565fcb295d6b1c8d1776ed20a81802f0ae8a07'

dlparkhurst · Aug 14, 2024 · 9dd340b · 9dd340b
2 parents 5f0453d + 7a565fc
commit 9dd340b
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 108 deletions.
diff --git a/src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h b/src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h
@@ -6,6 +6,10 @@
 
 #include "Var.h"
 
+#ifdef IPHREEQC_NO_FORTRAN_MODULE
+#include <stddef.h>
+#endif
+
 /**
  * @mainpage IPhreeqc Library Documentation (@PHREEQC_VER@-@REVISION_SVN@)
  *

diff --git a/src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/global_structures.h b/src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/global_structures.h
@@ -210,6 +210,20 @@ struct Change_Surf
 /*----------------------------------------------------------------------
  *   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
 {
 public:
@@ -229,20 +243,6 @@ class CReaction
 	double dz[3];
 	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
 {
 public:
@@ -322,6 +322,86 @@ class copier
 /*----------------------------------------------------------------------
  *   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
 {
 public:
@@ -386,58 +466,6 @@ class inverse
 	const char* netpath;
 	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
  *---------------------------------------------------------------------- */
@@ -538,34 +566,6 @@ class list2
 	LDBLE* target;
 	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
 {
 public:
@@ -1107,20 +1107,6 @@ class unknown
 /*----------------------------------------------------------------------
  *   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
 {
 public:
@@ -1139,6 +1125,20 @@ class rxn_token_temp
 	class unknown* unknown;
 	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
 {
 public: