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

Debug and release compile.

Browse Source 
Rearranged pitaer.h creating pitzer_structures.h.

Need to figure out conversion routines from C++ classes to C structures.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3869 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2009-12-07 21:33:07 +00:00
parent 2b76f04a8b
commit 6859605bc2
4 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Phreeqc.h
View File

@ -7,6 +7,9 @@
* INCLUDE FILES
* ---------------------------------------------------------------------- */
#include <iostream>
#include <fstream>
#include <sstream>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
@ -32,7 +35,7 @@
#include "p2c.h"
#undef extern
#include "global_structures.h"
#include "pitzer_structures.h"
class Phreeqc
{
public:
@ -831,6 +834,32 @@ void SetChartTitle(char *s);
#endif
int next_keyword_or_option(const char **opt_list, int count_opt_list);
// ReadClass.cxx
int read_solution_raw(void);
int read_exchange_raw(void);
int read_surface_raw(void);
int read_equilibrium_phases_raw(void);
int read_kinetics_raw(void);
int read_solid_solutions_raw(void);
int read_gas_phase_raw(void);
int read_reaction_raw(void);
int read_mix_raw(void);
int read_temperature_raw(void);
int read_dump(void);
int read_solution_modify(void);
int read_equilibrium_phases_modify(void);
int read_exchange_modify(void);
int read_surface_modify(void);
int read_solid_solutions_modify(void);
int read_gas_phase_modify(void);
int read_kinetics_modify(void);
int read_delete(void);
int read_run_cells(void);
int streamify_to_next_keyword(std::istringstream & lines);
int dump_entities(void);
int delete_entities(void);
int run_as_cells(void);
// readtr.c -------------------------------
int read_transport(void);

48
ReadClass.cxx
View File

@ -40,7 +40,7 @@ StorageBinList delete_info;
runner run_info;
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_solution_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -133,7 +133,7 @@ read_solution_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_exchange_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -227,7 +227,7 @@ read_exchange_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_surface_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -321,7 +321,7 @@ read_surface_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_equilibrium_phases_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -418,7 +418,7 @@ read_equilibrium_phases_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_kinetics_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -512,7 +512,7 @@ read_kinetics_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_solid_solutions_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -611,7 +611,7 @@ read_solid_solutions_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_gas_phase_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -705,7 +705,7 @@ read_gas_phase_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_reaction_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -800,7 +800,7 @@ read_reaction_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_mix_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -895,7 +895,7 @@ read_mix_raw(void)
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_temperature_raw(void)
/* ---------------------------------------------------------------------- */
{
@ -992,7 +992,7 @@ read_temperature_raw(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_dump(void)
/* ---------------------------------------------------------------------- */
{
@ -1044,7 +1044,7 @@ read_dump(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_delete(void)
/* ---------------------------------------------------------------------- */
{
@ -1096,7 +1096,7 @@ read_delete(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_run_cells(void)
/* ---------------------------------------------------------------------- */
{
@ -1148,7 +1148,7 @@ read_run_cells(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_solution_modify(void)
/* ---------------------------------------------------------------------- */
{
@ -1235,7 +1235,7 @@ read_solution_modify(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_equilibrium_phases_modify(void)
/* ---------------------------------------------------------------------- */
{
@ -1322,7 +1322,7 @@ read_equilibrium_phases_modify(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_exchange_modify(void)
/* ---------------------------------------------------------------------- */
{
@ -1411,7 +1411,7 @@ read_exchange_modify(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_surface_modify(void)
/* ---------------------------------------------------------------------- */
{
@ -1498,7 +1498,7 @@ read_surface_modify(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_solid_solutions_modify(void)
/* ---------------------------------------------------------------------- */
{
@ -1585,7 +1585,7 @@ read_solid_solutions_modify(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_gas_phase_modify(void)
/* ---------------------------------------------------------------------- */
{
@ -1670,7 +1670,7 @@ read_gas_phase_modify(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
read_kinetics_modify(void)
/* ---------------------------------------------------------------------- */
{
@ -1757,7 +1757,7 @@ read_kinetics_modify(void)
return (return_value);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
streamify_to_next_keyword(std::istringstream & lines)
/* ---------------------------------------------------------------------- */
{
@ -1804,7 +1804,7 @@ streamify_to_next_keyword(std::istringstream & lines)
return (OPTION_ERROR);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
dump_entities(void)
/* ---------------------------------------------------------------------- */
{
@ -2023,7 +2023,7 @@ dump_entities(void)
return (OK);
}
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
delete_entities(void)
/* ---------------------------------------------------------------------- */
{
@ -2341,7 +2341,7 @@ run_as_cells(void)
}
#endif
/* ---------------------------------------------------------------------- */
int
int CLASS_QUALIFIER
run_as_cells(void)
/* ---------------------------------------------------------------------- */
{

2
SSassemblageSS.cxx
View File

@ -77,7 +77,7 @@ cxxSSassemblageSS::~cxxSSassemblageSS()
}
struct s_s *
cxxSSassemblageSS::cxxSSassemblageSS2s_s(std::map < std::string, cxxSSassemblageSS > &el)
cxxSSassemblageSS::cxxSSassemblageSS2s_s(std::map < std::string, cxxSSassemblageSS > &el)
//
// Builds s_s structure from of cxxSSassemblageSS
//

4
SurfaceCharge.cxx
View File

@ -65,7 +65,7 @@ cxxSurfaceCharge::~cxxSurfaceCharge()
}
struct master *
cxxSurfaceCharge::get_psi_master()
cxxSurfaceCharge::get_psi_master()
{
struct master *master_ptr = NULL;
std::string str = this->name;
@ -84,7 +84,7 @@ struct master *
}
struct surface_charge *
cxxSurfaceCharge::cxxSurfaceCharge2surface_charge(std::map < std::string, cxxSurfaceCharge > &el)
cxxSurfaceCharge::cxxSurfaceCharge2surface_charge(std::map < std::string, cxxSurfaceCharge > &el)
//
// Builds surface_charge structure from of cxxSurfaceCharge
//