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

Last checkin svn deleted obsolete files output.h, output.cpp, phreeqc_files, main.cpp.

Browse Source 
removed all PHREEQC_CLASS ifdefs

Need to remove old_io ifdefs

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-10-20 21:14:33 +00:00
parent 601d8515b8
commit 7e26eec197
27 changed files with 2 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChartHandler.cpp
View File

@ -7,12 +7,7 @@
#endif
#include "ChartHandler.h"
#include "phreeqc_class.h"
#if defined PHREEQC_CLASS
#include "phreeqc.h"
#else
extern int punch_user_graph(void);
extern int error_msg(const char *err_str, const int stop, ...);
#endif
#include <iostream>
@ -82,9 +77,7 @@ ChartHandler::Read(PHREEQC_PTR_ARG_COMMA CParser &parser)
{
chart_map[n_user] = new ChartObject(this->Get_io());
it = this->chart_map.find(n_user);
#ifdef PHREEQC_CLASS
it->second->Set_phreeqc(P_INSTANCE);
#endif
}
// Read/update ChartObject

10
ChartObject.h
View File

@ -6,11 +6,6 @@
#include <string>
#include <sstream>
#include "CurveObject.h"
#if defined PHREEQC_CLASS
#else
#include "global_structures.h"
#endif
#include "NumKeyword.h"
#include <float.h>
@ -274,7 +269,6 @@ class ChartObject:public cxxNumKeyword
{
return this->form_started;
}
#if defined PHREEQC_CLASS
void Set_phreeqc(Phreeqc * ptr)
{
this->p_instance1 = ptr;
@ -283,7 +277,6 @@ class ChartObject:public cxxNumKeyword
{
return this->p_instance1;
}
#endif
bool Set_axis_scale(std::vector<std::string>, std::vector<int> types, std::ostringstream &);
bool Set_axis_scale(CParser & parser);
@ -377,10 +370,7 @@ class ChartObject:public cxxNumKeyword
bool active;
bool detach;
bool form_started;
#if defined PHREEQC_CLASS
class Phreeqc * p_instance1;
#endif
public:
int usingResource;

5
ExchComp.cxx
View File

@ -10,12 +10,7 @@
#include <float.h>
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "ExchComp.h"
#include "Dictionary.h"
#include "phqalloc.h"

5
GasPhase.cxx
View File

@ -9,12 +9,7 @@
#include <float.h>
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "GasPhase.h"
#include "cxxMix.h"
#include "phqalloc.h"

5
ISolution.cxx
View File

@ -9,12 +9,7 @@
#include <sstream>
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "ISolution.h"
#include "phqalloc.h"
#include "phrqproto.h"

5
ISolutionComp.cxx
View File

@ -4,12 +4,7 @@
#include <cassert>
#include "Utils.h"
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "ISolutionComp.h"
#include "phrqproto.h"
#include "phqalloc.h"

5
KineticsComp.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "KineticsComp.h"
#include "Dictionary.h"
#include "phqalloc.h"

5
NameDouble.cxx
View File

@ -10,12 +10,7 @@
#include <iostream> // std::cout std::cerr
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "NameDouble.h"
#include "Dictionary.h"
#include "phqalloc.h"

5
PPassemblage.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "PPassemblage.h"
#include "cxxMix.h"
#include "phqalloc.h"

5
PPassemblageComp.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "PPassemblageComp.h"
#include "Dictionary.h"
#include "phqalloc.h"

2
Parser.cxx
View File

@ -12,9 +12,7 @@
#include <iostream> // std::cout std::cerr
#include "Utils.h"
#include <stdio.h>
#if defined (PHREEQC_CLASS)
#include "Phreeqc.h"
#endif
#include "Parser.h"
#include "PHRQ_io.h"

13
Phreeqc_class.h
View File

@ -1,15 +1,6 @@
#ifndef _INC_PHREEQC_CLASS_H
#define _INC_PHREEQC_CLASS_H
#if !defined PHREEQC_CLASS
#define P_INSTANCE
#define P_INSTANCE_COMMA
#define P_INSTANCE_POINTER
#define PHREEQC_PTR_ARG
#define PHREEQC_PTR_ARG_COMMA
#define PHREEQC_THIS
#define PHREEQC_THIS_COMMA
#define PHREEQC_NAME_SPACE ::
#else
#define P_INSTANCE p_instance1
#define P_INSTANCE_COMMA p_instance1,
#define P_INSTANCE_POINTER p_instance1->
@ -18,6 +9,6 @@
#define PHREEQC_THIS this
#define PHREEQC_THIS_COMMA this,
#define PHREEQC_NAME_SPACE Phreeqc::
#endif
#endif /* _INC_PHREEQC_CLASS_H */

5
Reaction.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "Reaction.h"
#include "phqalloc.h"
#include "phrqproto.h"

21
ReadClass.cxx
View File

@ -5,12 +5,7 @@
#include <fstream>
#include <sstream>
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "Phreeqc_class.h"
#include "Parser.h"
#include "Solution.h"
@ -29,22 +24,6 @@
#include "phqalloc.h"
#include "phrqproto.h"
#if !defined(PHREEQC_CLASS)
static int streamify_to_next_keyword(std::istringstream & lines);
extern int reading_database(void);
extern int check_line(const char *string, int allow_empty, int allow_eof,
int allow_keyword, int print);
extern int set_use(void);
extern int copy_use(int i);
dumper dump_info;
StorageBinList delete_info;
runner run_info;
int dump_entities(void);
void dump_ostream(std::ostream& os);
int delete_entities(void);
int run_as_cells(void);
#endif
/* ---------------------------------------------------------------------- */
int CLASS_QUALIFIER

5
SSassemblage.cxx
View File

@ -9,12 +9,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "SSassemblage.h"
#include "SSassemblageSS.h"
#include "cxxMix.h"

6
SSassemblageSS.cxx
View File

@ -8,13 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#include "output.h"
#else
#include "Phreeqc.h"
#endif
#include "SSassemblageSS.h"
#include "Dictionary.h"
#include "phqalloc.h"

5
Solution.cxx
View File

@ -14,12 +14,7 @@
#include <cassert> // assert
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "Solution.h"
#include "cxxMix.h"
#include "phqalloc.h"

5
SolutionIsotope.cxx
View File

@ -5,12 +5,7 @@
#include <sstream> // std::ostrstream
#include "Utils.h"
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "SolutionIsotope.h"
#include "phqalloc.h"
#include "phrqproto.h"

5
SolutionIsotopeList.cxx
View File

@ -2,12 +2,7 @@
#include <cassert> // assert
#include <algorithm> // std::sort
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "SolutionIsotopeList.h"
#include "phqalloc.h"
#include "phrqproto.h"

5
StorageBin.cxx
View File

@ -14,12 +14,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "NameDouble.h"
#include "StorageBin.h"
#include "SSassemblage.h"

5
Surface.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Phreeqc_class.h"
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "Surface.h"
#include "cxxMix.h"
#include "phqalloc.h"

5
SurfaceCharge.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "SurfaceCharge.h"
#include "Dictionary.h"
#include "phqalloc.h"

5
SurfaceComp.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "SurfaceComp.h"
#include "Dictionary.h"
#include "phqalloc.h"

5
System.cxx
View File

@ -1,11 +1,6 @@
#include <algorithm> // std::replace
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "System.h"
#include "SSassemblage.h"
#include "Solution.h"

5
Temperature.cxx
View File

@ -9,12 +9,7 @@
#include "Utils.h" // define first
#include "Parser.h"
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "Temperature.h"
#include "phqalloc.h"
#include "phrqproto.h"

5
cxxKinetics.cxx
View File

@ -8,12 +8,7 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "cxxKinetics.h"
#include "cxxMix.h"

5
cxxMix.cxx
View File

@ -9,12 +9,7 @@
#include "Utils.h" // define first
#include "Parser.h"
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "cxxMix.h"
#include "phqalloc.h"
#include "phrqproto.h"