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

Merge commit 'aa62814aa6731a0b093267ec2d361d4837fa3ba9'

Browse Source
This commit is contained in:
Darth Vader 2021-04-23 20:15:50 +00:00
commit 0d764e5c0c
66 changed files with 37 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phreeqcpp/ChartHandler.cpp
View File

@ -9,8 +9,6 @@
#include "ChartHandler.h"
#include <iostream>
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/ChartObject.cpp
View File

@ -18,7 +18,6 @@
#include "Form1.h"
using namespace zdg_ui2;
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

2
src/phreeqcpp/CurveObject.cpp
View File

@ -7,8 +7,6 @@
#endif
#include "CurveObject.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/ExchComp.cxx
View File

@ -15,7 +15,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/Exchange.cxx
View File

@ -15,7 +15,6 @@
#include "Exchange.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/GasComp.cxx
View File

@ -15,7 +15,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/GasPhase.cxx
View File

@ -14,7 +14,6 @@
#include "cxxMix.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/ISolution.cxx
View File

@ -13,7 +13,6 @@
#include "ISolution.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/ISolutionComp.cxx
View File

@ -9,7 +9,6 @@
#include "Solution.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/KineticsComp.cxx
View File

@ -14,7 +14,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/NameDouble.cxx
View File

@ -17,7 +17,6 @@
#include "phqalloc.h"
#include "ISolutionComp.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/NumKeyword.cxx
View File

@ -10,7 +10,6 @@
#include "Parser.h"
#include "Utils.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/PBasic.cpp
View File

@ -24,7 +24,6 @@
#define toklength 20
typedef long chset[9];
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/PHRQ_io_output.cpp
View File

@ -2,7 +2,6 @@
#include "Phreeqc.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/PPassemblage.cxx
View File

@ -13,7 +13,6 @@
#include "cxxMix.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/PPassemblageComp.cxx
View File

@ -13,7 +13,6 @@
#include "Dictionary.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/PhreeqcKeywords/Keywords.cpp
View File

@ -1,6 +1,5 @@
#include "Keywords.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/Pressure.cxx
View File

@ -13,7 +13,6 @@
#include "Pressure.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/Reaction.cxx
View File

@ -12,7 +12,6 @@
#include "Reaction.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/ReadClass.cxx
View File

@ -24,7 +24,6 @@
#include "Surface.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/SS.cxx
View File

@ -13,7 +13,6 @@
#include "Dictionary.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/SSassemblage.cxx
View File

@ -16,7 +16,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/SScomp.cxx
View File

@ -13,7 +13,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/SelectedOutput.cpp
View File

@ -1,6 +1,5 @@
#include "SelectedOutput.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

2
src/phreeqcpp/Solution.cxx
View File

@ -15,8 +15,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/SolutionIsotope.cxx
View File

@ -10,7 +10,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

3
src/phreeqcpp/StorageBin.cxx
View File

@ -30,8 +30,9 @@
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char BASED_CODE THIS_FILE[] = __FILE__;
static char THIS_FILE[] = __FILE__;
#endif
#endif

2
src/phreeqcpp/Surface.cxx
View File

@ -12,8 +12,6 @@
#include "cxxMix.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/SurfaceCharge.cxx
View File

@ -13,7 +13,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/SurfaceComp.cxx
View File

@ -13,7 +13,6 @@
#include "phqalloc.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/System.cxx
View File

@ -15,7 +15,6 @@
#include "Reaction.h"
#include "Temperature.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

3
src/phreeqcpp/Temperature.cxx
View File

@ -13,7 +13,6 @@
#include "Temperature.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW
@ -22,8 +21,6 @@ static char THIS_FILE[] = __FILE__;
#endif
#endif
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////

1
src/phreeqcpp/Use.cpp
View File

@ -1,7 +1,6 @@
#include <stdio.h>
#include "Use.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/advection.cpp
View File

@ -13,7 +13,6 @@ static char THIS_FILE[] = __FILE__;
#endif
#endif
/* ---------------------------------------------------------------------- */
int Phreeqc::
advection(void)

1
src/phreeqcpp/cl1.cpp
View File

@ -10,7 +10,6 @@
#define CHECK_ERRORS
*/
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

2
src/phreeqcpp/cl1mp.cpp
View File

@ -14,8 +14,6 @@
#define CHECK_ERRORS
*/
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/common/PHRQ_base.cxx
View File

@ -1,4 +1,3 @@
#include "Phreeqc.h"
#include "PHRQ_base.h"
#include <iostream>
#include "PHRQ_io.h"

9
src/phreeqcpp/common/PHRQ_exports.h
View File

@ -1,6 +1,15 @@
#ifndef INC_PHRQ_EXPORTS_H
#define INC_PHRQ_EXPORTS_H
#if defined(WIN32)
# if defined(PHREEQCI_GUI)
# ifndef WINVER
# define WINVER 0x0400
# endif
# include <afx.h>
# endif
# include <windows.h>
#endif
#if defined(_WINDLL) && defined(IPhreeqc_EXPORTS)
# define IPQ_DLL_EXPORT __declspec(dllexport)

2
src/phreeqcpp/common/PHRQ_io.cpp
View File

@ -1,5 +1,4 @@
#include <assert.h>
#include "Phreeqc.h"
#include "PHRQ_io.h"
#include "Parser.h"
@ -14,7 +13,6 @@
#include <stdio.h>
#include <stdarg.h>
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/common/Parser.cxx
View File

@ -15,7 +15,6 @@
#include "Parser.h"
#include "PHRQ_io.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

8
src/phreeqcpp/common/Parser.h
View File

@ -1,7 +1,13 @@
#if !defined(PARSER_H_INCLUDED)
#define PARSER_H_INCLUDED
#if defined(WIN32)
#include <windows.h>
# if defined(PHREEQCI_GUI)
# ifndef WINVER
# define WINVER 0x0400
# endif
# include <afx.h>
# endif
# include <windows.h>
#endif
#include <string> // std::string
#include <map> // std::map

1
src/phreeqcpp/common/Utils.cxx
View File

@ -12,7 +12,6 @@
#include "float.h"
#include "math.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

2
src/phreeqcpp/cvode.cpp
View File

@ -543,8 +543,6 @@ static int CVHandleFailure(CVodeMem cv_mem, int kflag);
/********* BEGIN Exported Functions Implementation *************/
/***************************************************************/
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/cxxKinetics.cxx
View File

@ -15,7 +15,6 @@
#include "PHRQ_io.h"
#include "Dictionary.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/cxxMix.cxx
View File

@ -13,7 +13,6 @@
#include "cxxMix.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

18
src/phreeqcpp/dense.cpp
View File

@ -66,16 +66,6 @@
#include "dense.h"
#include "smalldense.h"
/* WARNING don`t include any headers below here */
#define ZERO RCONST(0.0)
#define ONE RCONST(1.0)
/* Implementation */
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW
@ -84,6 +74,14 @@ static char THIS_FILE[] = __FILE__;
#endif
#endif
/* WARNING don`t include any headers below here */
#define ZERO RCONST(0.0)
#define ONE RCONST(1.0)
/* Implementation */
DenseMat
DenseAllocMat(integertype N)
{

1
src/phreeqcpp/input.cpp
View File

@ -5,7 +5,6 @@
#include <fstream>
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/integrate.cpp
View File

@ -6,7 +6,6 @@
#define MAX_QUAD 20
#define K_POLY 5
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/isotopes.cpp
View File

@ -2,7 +2,6 @@
#include "phqalloc.h"
#include "Solution.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/model.cpp
View File

@ -8,7 +8,6 @@
#include "SSassemblage.h"
#include "Solution.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/nvector.cpp
View File

@ -61,7 +61,6 @@
#include "nvector.h" /* generic M_Env and N_Vector */
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/nvector_serial.cpp
View File

@ -98,7 +98,6 @@ static void Vaxpy_Serial(realtype a, N_Vector x, N_Vector y);
/* x <- ax */
static void VScaleBy_Serial(realtype a, N_Vector x);
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/parse.cpp
View File

@ -1,7 +1,6 @@
#include "Phreeqc.h"
#include "phqalloc.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

2
src/phreeqcpp/phqalloc.cpp
View File

@ -9,7 +9,6 @@
#include <crtdbg.h>
#endif
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW
@ -18,7 +17,6 @@ static char THIS_FILE[] = __FILE__;
#endif
#endif
#if defined(USE_PHRQ_ALLOC)
/* ---------------------------------------------------------------------- */
#if !defined(NDEBUG)

1
src/phreeqcpp/pitzer.cpp
View File

@ -5,7 +5,6 @@
#define PITZER_LISTS
#define PITZER
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/pitzer_structures.cpp
View File

@ -4,7 +4,6 @@
#include <list>
#include <string>
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/read.cpp
View File

@ -19,7 +19,6 @@
#include "SelectedOutput.h"
#include "UserPunch.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/readtr.cpp
View File

@ -17,7 +17,6 @@ typedef unsigned char boolean;
#define OPTION_DEFAULT -4
#define OPTION_DEFAULT2 -5
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/sit.cpp
View File

@ -3,7 +3,6 @@
#include "Exchange.h"
#include "Solution.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

14
src/phreeqcpp/smalldense.cpp
View File

@ -63,13 +63,6 @@
#include "smalldense.h"
#include "sundialstypes.h"
#include "sundialsmath.h"
/* WARNING don`t include any headers below here */
#define ZERO RCONST(0.0)
#define ONE RCONST(1.0)
/* Implementation */
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
@ -79,6 +72,13 @@ static char THIS_FILE[] = __FILE__;
#endif
#endif
/* WARNING don`t include any headers below here */
#define ZERO RCONST(0.0)
#define ONE RCONST(1.0)
/* Implementation */
realtype **
denalloc(integertype n)
{

1
src/phreeqcpp/step.cpp
View File

@ -17,7 +17,6 @@
#include "SSassemblage.h"
#include "cxxKinetics.h"
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

9
src/phreeqcpp/sundialsmath.cpp
View File

@ -63,11 +63,6 @@
#include "sundialsmath.h"
#include "sundialstypes.h"
#define ZERO RCONST(0.0)
#define ONE RCONST(1.0)
#define TWO RCONST(2.0)
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW
@ -76,6 +71,10 @@ static char THIS_FILE[] = __FILE__;
#endif
#endif
#define ZERO RCONST(0.0)
#define ONE RCONST(1.0)
#define TWO RCONST(2.0)
realtype
UnitRoundoff(void)
{

1
src/phreeqcpp/tally.cpp
View File

@ -18,7 +18,6 @@ static char THIS_FILE[] = __FILE__;
#endif
#endif
/*
Calling sequence

1
src/phreeqcpp/tidy.cpp
View File

@ -10,7 +10,6 @@
#define ZERO_TOL 1.0e-30
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

1
src/phreeqcpp/transport.cpp
View File

@ -51,7 +51,6 @@ struct MOLES_ADDED /* total moles added to balance negative conc's */
} *moles_added;
int count_moles_added;
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW

2
src/phreeqcpp/utilities.cpp
View File

@ -6,8 +6,6 @@
#include "Solution.h"
#include <time.h>
#if defined(PHREEQCI_GUI)
#ifdef _DEBUG
#define new DEBUG_NEW