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

phreeqcpp (nonclass) compiles.

Browse Source 
SSassemblage.cxx compiles, but need to work on header files.

Need to fix header files throughout.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3865 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2009-12-04 22:47:55 +00:00
parent b33830cc5c
commit 0a91aa5bec
5 changed files with 70 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
Phreeqc.h
View File

@ -31,6 +31,7 @@
#define extern
#include "p2c.h"
#undef extern
#include "global_structures.h"
class Phreeqc
{
@ -39,57 +40,57 @@ public:
~Phreeqc(void);
private:
struct _generic_N_Vector;
struct calculate_value;
struct conc;
struct CVodeMemRec;
struct element;
struct exchange;
struct exch_comp;
struct elt_list;
struct gas_phase;
struct gas_comp;
struct inverse;
struct inv_elts;
struct inv_phases;
struct inv_isotope;
struct irrev;
struct isotope;
struct kinetics;
struct kinetics_comp;
struct LOC_exec;
struct master;
struct master_activity;
struct master_isotope;
struct mix;
struct mix_comp;
struct name_coef;
struct pe_data;
struct phase;
struct PHRQMemHeader;
struct pitz_param;
struct pp_assemblage;
struct pure_phase;
struct reaction;
struct reaction_temp;
struct rxn_token;
struct rxn_token_temp;
struct solution;
struct species;
struct s_s;
struct s_s_assemblage;
struct s_s_comp;
struct species_diff_layer;
struct surface;
struct surface_comp;
struct surface_charge;
struct surface_diff_layer;
struct theta_param;
struct tokenrec;
struct varrec;
struct unknown;
//private:
//
//struct _generic_N_Vector;
//struct calculate_value;
//struct conc;
//struct CVodeMemRec;
//struct element;
//struct exchange;
//struct exch_comp;
//struct elt_list;
//struct gas_phase;
//struct gas_comp;
//struct inverse;
//struct inv_elts;
//struct inv_phases;
//struct inv_isotope;
//struct irrev;
//struct isotope;
//struct kinetics;
//struct kinetics_comp;
//struct LOC_exec;
//struct master;
//struct master_activity;
//struct master_isotope;
//struct mix;
//struct mix_comp;
//struct name_coef;
//struct pe_data;
//struct phase;
//struct PHRQMemHeader;
//struct pitz_param;
//struct pp_assemblage;
//struct pure_phase;
//struct reaction;
//struct reaction_temp;
//struct rxn_token;
//struct rxn_token_temp;
//struct solution;
//struct species;
//struct s_s;
//struct s_s_assemblage;
//struct s_s_comp;
//struct species_diff_layer;
//struct surface;
//struct surface_comp;
//struct surface_charge;
//struct surface_diff_layer;
//struct theta_param;
//struct tokenrec;
//struct varrec;
//struct unknown;
#define PITZER_EXTERNAL
#include "pitzer.h"

13
SSassemblage.cxx
View File

@ -4,16 +4,21 @@
#ifdef _DEBUG
#pragma warning(disable : 4786) // disable truncation warning (Only used by debugger)
#endif
#include <float.h>
#include <cassert> // assert
#include <algorithm> // std::sort
#include "Utils.h" // define first
#include "SSassemblage.h"
#include "SSassemblageSS.h"
#define EXTERNAL extern
#include "global.h"
#include "cxxMix.h"
#if defined(PHREEQC_CLASS)
#define CLASS_STATIC static
#endif
#include "global_structures.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include <cassert> // assert
#include <algorithm> // std::sort
//////////////////////////////////////////////////////////////////////
// Construction/Destruction

6
SSassemblage.h
View File

@ -2,8 +2,6 @@
#define SSASSEMBLAGE_H_INCLUDED
#include "NumKeyword.h"
#define EXTERNAL extern
#include "global.h"
#include <cassert> // assert
#include <map> // std::map
#include <string> // std::string
@ -11,7 +9,11 @@
#include <vector> // std::vector
#include "SSassemblageSS.h"
//#include "NameDouble.h"
//class cxxSSassemblageSS;
#include "cxxMix.h"
//class cxxMix;
class cxxSSassemblage:public cxxNumKeyword
{

2
SSassemblageSS.h
View File

@ -2,8 +2,6 @@
#define SSASSEMBLAGESS_H_INCLUDED
#include "NameDouble.h"
#define EXTERNAL extern
#include "global.h"
#include <cassert> // assert
#include <map> // std::map
#include <string> // std::string

7
StorageBin.h
View File

@ -8,10 +8,13 @@
#include "GasPhase.h"
#include "cxxKinetics.h"
#include "PPassemblage.h"
#include "SSassemblage.h"
//#include "SSassemblage.h"
class NameDouble;
class cxxSSassemblageSS;
#include "Surface.h"
#include "System.h"
#include "cxxMix.h"
//#include "cxxMix.h"
class cxxMix;
#include "Reaction.h"
#include "Temperature.h"