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

Added missing -dw parameters for MgCO3, MgHCO3,

Browse Source 
and MgSO4 aqueous species.

Changed indentation for llnl parameters in model.c

Added capability to include files within the input
        file. Files included in include files are also 
        included. Files are included verbatim and need not
        contain complete keyword datablocks; however, the
        combination of included files must result in a
        legal PHREEQC input file.

#$include file_name

Updated #$include to work with all configurations. Added
MERGE_INCLUDE_FILES define to all configurations of 
phreeqcpp.

Updated phreeqc and phreeqcpp revisions.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4843 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2010-09-27 17:18:03 +00:00
parent 61580e1510
commit 8b69f05ff9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Phreeqc.h
View File

@ -311,9 +311,9 @@ public:
int close_input_files(void);
int close_output_files(void);
CLASS_STATIC int getc_callback(void *cookie);
#if defined(MERGE_INCLUDE_FILES) && defined(PHREEQC_CLASS)
#if defined(MERGE_INCLUDE_FILES)
CLASS_STATIC int istream_getc(void *cookie);
#endif /* #if defined(MERGE_INCLUDE_FILES) && defined(PHREEQC_CLASS) */
#endif /* #if defined(MERGE_INCLUDE_FILES) */
int process_file_names(int argc, char *argv[], void **db_cookie,
void **input_cookie, int log);
@ -1438,10 +1438,10 @@ int isamong(char c, const char *s_l);
Address Hash_multi(HashTable * Table, char *Key);
void ExpandTable_multi(HashTable * Table);
#if defined(MERGE_INCLUDE_FILES) && defined(PHREEQC_CLASS)
#if defined(MERGE_INCLUDE_FILES)
public:
bool recursive_include(std::ifstream & input_stream, std::iostream & accumulated_stream);
#endif /* #if defined(MERGE_INCLUDE_FILES) && defined(PHREEQC_CLASS) */
#endif /* #if defined(MERGE_INCLUDE_FILES) */
public: // public methods for PHREEQC_CLASS
int main_method(int argc, char *argv[]);

4
class_main.cpp
View File

@ -133,7 +133,7 @@ main_method(int argc, char *argv[])
/*
* Load database into memory
*/
#if defined(MERGE_INCLUDE_FILES) && defined(PHREEQC_CLASS)
#if defined(MERGE_INCLUDE_FILES)
errors = read_database(istream_getc, db_cookie);
#else
errors = read_database(getc_callback, db_cookie);
@ -147,7 +147,7 @@ main_method(int argc, char *argv[])
/*
* Read input data for simulation
*/
#if defined(MERGE_INCLUDE_FILES) && defined(PHREEQC_CLASS)
#if defined(MERGE_INCLUDE_FILES)
errors = run_simulations(istream_getc, input_cookie);
#else
errors = run_simulations(getc_callback, input_cookie);