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

builds on vs2005; still needs to initialize class pitz_param* aphi

Browse Source
This commit is contained in:
Scott R Charlton 2021-04-07 12:35:35 -06:00
parent 71dc944c9d
commit c960e059fb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Phreeqc.h
View File

@ -1615,7 +1615,7 @@ protected:
PHRQMemHeader* s_pTail; PHRQMemHeader* s_pTail;
/* Basic */ /* Basic */
PBasic* basic_interpreter = NULL; PBasic* basic_interpreter;
double (*basic_callback_ptr) (double x1, double x2, const char* str, void* cookie); double (*basic_callback_ptr) (double x1, double x2, const char* str, void* cookie);
void* basic_callback_cookie; void* basic_callback_cookie;
@ -1716,7 +1716,7 @@ protected:
int use_etheta; int use_etheta;
LDBLE OTEMP, OPRESS; LDBLE OTEMP, OPRESS;
LDBLE A0; LDBLE A0;
class pitz_param* aphi = NULL; class pitz_param* aphi/* = NULL*/;
std::vector<class species*> spec; std::vector<class species*> spec;
class species** cations, ** anions, ** neutrals; // pointers to spec class species** cations, ** anions, ** neutrals; // pointers to spec
int count_cations, count_anions, count_neutrals; int count_cations, count_anions, count_neutrals;

6
global_structures.h
View File

@ -763,7 +763,7 @@ public:
} }
const char* name; const char* name;
const char* mole_balance; const char* mole_balance;
int in = FALSE; int in;
int number; int number;
class master* primary; class master* primary;
class master* secondary; class master* secondary;
@ -1236,7 +1236,7 @@ public:
varbase = NULL; varbase = NULL;
loopbase = NULL; loopbase = NULL;
} }
const char* name = NULL; const char* name;
std::string commands; std::string commands;
int new_def; int new_def;
void* linebase; void* linebase;
@ -1535,7 +1535,7 @@ public:
tot_stag = 0; tot_stag = 0;
charge = 0; charge = 0;
} }
const char* name = NULL; const char* name;
LDBLE tot1, tot2, tot_stag, charge; LDBLE tot1, tot2, tot_stag, charge;
}; };
class M_S class M_S