Merge commit '4cee19d768863d8f09b3629ee36a11e1a6030f33'

phreeqcpp/ChartHandler.cpp

@@ -10,6 +10,15 @@
 #include <iostream>
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/ChartObject.cpp

@@ -18,6 +18,15 @@
 #include "Form1.h"
 using namespace zdg_ui2;
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/CurveObject.cpp

@@ -8,6 +8,15 @@
 #include "CurveObject.h"
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/Dictionary.cpp

@@ -1,4 +1,13 @@
 #include "Dictionary.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 Dictionary::Dictionary(void)
 {
 }

phreeqcpp/ExchComp.cxx

@@ -15,6 +15,15 @@
 #include "phqalloc.h"
 #include "Dictionary.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/Exchange.cxx

@@ -16,6 +16,14 @@
 #include "phqalloc.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/GasComp.cxx

@@ -16,6 +16,13 @@
 #include "Dictionary.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

phreeqcpp/GasPhase.cxx

@@ -15,6 +15,14 @@
 #include "phqalloc.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/ISolution.cxx

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

phreeqcpp/ISolutionComp.cxx

@@ -9,6 +9,15 @@
 #include "Solution.h"
 #include "phqalloc.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 cxxISolutionComp::cxxISolutionComp(PHRQ_io *io):
 PHRQ_base(io),
 moles(0.0), 

phreeqcpp/KineticsComp.cxx

@@ -14,6 +14,15 @@
 #include "phqalloc.h"
 #include "Dictionary.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/NameDouble.cxx

@@ -18,6 +18,14 @@
 #include "ISolutionComp.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/NumKeyword.cxx

@@ -10,6 +10,15 @@
 #include "Parser.h"
 #include "Utils.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/PBasic.cpp

@@ -1,15 +1,6 @@
-#if defined(WIN32) && !defined(__GNUC__)
-#include <windows.h>
-#if defined(PHREEQCI_GUI)
-#include "../../resource.h"
-#endif
-#else
-#include <assert.h>
-#define _ASSERTE assert
-#endif
 #include <stdlib.h>
-#include "PBasic.h"
 #include "Phreeqc.h"
+#include "PBasic.h"
 #include "phqalloc.h"
 #include "NameDouble.h"
 #include "Utils.h"
@@ -29,6 +20,15 @@
 #define toklength       20
 typedef long chset[9];
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* Output from p2c, the Pascal-to-C translator */
 /* From input file "basic.p" */
 

phreeqcpp/PHRQ_io_output.cpp

@@ -2,6 +2,15 @@
 #include "Phreeqc.h"
 #include "phqalloc.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 warning_msg(const char *err_str)

phreeqcpp/PPassemblage.cxx

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

phreeqcpp/PPassemblageComp.cxx

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

phreeqcpp/Phreeqc.cpp

@@ -15,6 +15,14 @@
 #include "Temperature.h"
 #include "SSassemblage.h"
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //const const_iso Phreeqc::iso_defaults[] = {
 //	{"13C", -10, 1},
 //	{"13C(4)", -10, 1},

phreeqcpp/Phreeqc.h

@@ -1,7 +1,16 @@
 #ifndef _INC_PHREEQC_H
 #define _INC_PHREEQC_H
 #if defined(WIN32)
-#include <windows.h>
+#  if defined(PHREEQCI_GUI)
+#    ifndef WINVER
+#      define WINVER 0x0400
+#    endif
+#    include <afx.h>
+#  endif
+#  include <windows.h>
+#  if defined(PHREEQCI_GUI)
+#    include "../../resource.h"
+#  endif
 #endif
 #if defined(WIN32_MEMORY_DEBUG)
 #define _CRTDBG_MAP_ALLOC

phreeqcpp/PhreeqcKeywords/Keywords.cpp

@@ -1,6 +1,14 @@
 #include "Keywords.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 Keywords::Keywords(void)
 {
 }

phreeqcpp/Pressure.cxx

@@ -8,11 +8,20 @@
 #include <algorithm>			// std::sort
 
 #include "Utils.h"				// define first
-#include "Parser.h"
 #include "Phreeqc.h"
+#include "Parser.h"
 #include "Pressure.h"
 #include "phqalloc.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/Reaction.cxx

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

phreeqcpp/ReadClass.cxx

@@ -24,6 +24,15 @@
 #include "Surface.h"
 #include "phqalloc.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 read_dump(void)

phreeqcpp/SS.cxx

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

phreeqcpp/SSassemblage.cxx

@@ -17,6 +17,14 @@
 #include "Dictionary.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/SScomp.cxx

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

phreeqcpp/SelectedOutput.cpp

@@ -1,5 +1,14 @@
 #include "SelectedOutput.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 SelectedOutput::SelectedOutput(int n, PHRQ_io *io)
 :	cxxNumKeyword(io)
 {

phreeqcpp/Serializer.cxx

@@ -9,6 +9,15 @@
 #include "PPassemblage.h"
 #include "SSassemblage.h"
 #include "Surface.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 Serializer::Serializer(PHRQ_io *io)
 	: PHRQ_base(io)
 {

phreeqcpp/Solution.cxx

@@ -16,6 +16,15 @@
 #include "Dictionary.h"
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/SolutionIsotope.cxx

@@ -10,6 +10,15 @@
 #include "phqalloc.h"
 #include "Dictionary.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 cxxSolutionIsotope::cxxSolutionIsotope(PHRQ_io *io)
 :
 PHRQ_base(io),

phreeqcpp/StorageBin.cxx

@@ -28,6 +28,12 @@
 #include "phqalloc.h"
 #include "Use.h"
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#undef THIS_FILE
+static char BASED_CODE THIS_FILE[] = __FILE__;
+#endif
+#endif
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

phreeqcpp/StorageBinList.cpp

@@ -2,6 +2,14 @@
 #include "StorageBinList.h"
 #include "Parser.h"
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 StorageBinListItem::StorageBinListItem(void)
 {
 	this->defined = false;

phreeqcpp/Surface.cxx

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

phreeqcpp/SurfaceCharge.cxx

@@ -14,6 +14,14 @@
 #include "Dictionary.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/SurfaceComp.cxx

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

phreeqcpp/System.cxx

@@ -15,6 +15,15 @@
 #include "Reaction.h"
 #include "Temperature.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 cxxSystem::cxxSystem(PHRQ_io *io)
 :
 PHRQ_base(io)

phreeqcpp/Temperature.cxx

@@ -8,12 +8,21 @@
 #include <algorithm>			// std::sort
 
 #include "Utils.h"				// define first
-#include "Parser.h"
 #include "Phreeqc.h"
+#include "Parser.h"
 #include "Temperature.h"
 #include "phqalloc.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
+
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

phreeqcpp/Use.cpp

@@ -1,6 +1,15 @@
 #include <stdio.h>
 #include "Use.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 cxxUse::cxxUse()
 {
 	this->init();

phreeqcpp/UserPunch.cpp

@@ -1,5 +1,14 @@
 #include "UserPunch.h"
 #include "Phreeqc.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 UserPunch::UserPunch(int n, PHRQ_io *io)
 :	cxxNumKeyword(io)
 {

phreeqcpp/advection.cpp

@@ -4,6 +4,16 @@
 #include "cxxKinetics.h"
 #include "Solution.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 advection(void)

phreeqcpp/basicsubs.cpp

@@ -11,6 +11,15 @@
 #include "cxxKinetics.h"
 #include "Solution.h"
 #include "Parser.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 LDBLE Phreeqc::
 activity(const char *species_name)

phreeqcpp/cl1.cpp

@@ -10,6 +10,15 @@
 #define CHECK_ERRORS
  */
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 int Phreeqc::
 cl1(int k, int l, int m, int n,
 	int l_nklmd, int l_n2d,

phreeqcpp/cl1mp.cpp

@@ -15,6 +15,15 @@
  */
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 int Phreeqc::
 cl1mp(int k, int l, int m, int n,
 	  int nklmd, int n2d,

phreeqcpp/class_main.cpp

@@ -11,6 +11,15 @@
 #include "cxxKinetics.h"
 //#include <sys/signal.h>
 //#include <fenv.h>
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ----------------------------------------------------------------------
  *   MAIN
  * ---------------------------------------------------------------------- */

phreeqcpp/common/PHRQ_base.cxx

@@ -1,6 +1,16 @@
+#include "Phreeqc.h"
 #include "PHRQ_base.h"
 #include <iostream>
 #include "PHRQ_io.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 PHRQ_base::
 PHRQ_base(void)
 {

phreeqcpp/common/PHRQ_io.cpp

@@ -1,4 +1,5 @@
 #include <assert.h>
+#include "Phreeqc.h"
 #include "PHRQ_io.h"
 #include "Parser.h"
 
@@ -13,6 +14,15 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 PHRQ_io::
 PHRQ_io(void)
 {

phreeqcpp/common/Parser.cxx

@@ -15,6 +15,15 @@
 #include "Parser.h"
 #include "PHRQ_io.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/common/Utils.cxx

@@ -12,6 +12,15 @@
 #include "float.h"
 #include "math.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 ////////////////////////////////////////////////////////////////////////////
 int
 Utilities::strcmp_nocase_arg1(const char *str1, const char *str2)

phreeqcpp/cvdense.cpp

@@ -63,6 +63,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "Phreeqc.h"
 #include "cvdense.h"
 #include "cvode.h"
 #include "dense.h"
@@ -71,7 +72,6 @@
 #include "sundialsmath.h"
 
 
-#include "Phreeqc.h"
 #if !defined(WIN32_MEMORY_DEBUG)
 #define malloc PHRQ_malloc
 #endif
@@ -150,6 +150,15 @@ static void CVDenseDQJac(integertype N, DenseMat J, RhsFn f, void *f_data,
 						 N_Vector vtemp2, N_Vector vtemp3);
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /*************** CVDenseDQJac ****************************************
 
  This routine generates a dense difference quotient approximation to

phreeqcpp/cvode.cpp

@@ -59,6 +59,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE  *
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   *
  **************************************************************************/
+#include "Phreeqc.h"
 #include "nvector_serial.h"
 #define Ith(v,i)	NV_Ith_S(v,i-1)
 /************************************************************/
@@ -71,7 +72,6 @@
 #include "nvector.h"
 #include "sundialsmath.h"
 
-#include "Phreeqc.h"
 
 #if !defined(WIN32_MEMORY_DEBUG)
 #define malloc MACHENV_MALLOC PHRQ_malloc
@@ -544,6 +544,15 @@ static int CVHandleFailure(CVodeMem cv_mem, int kflag);
 /***************************************************************/
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /******************** CVodeMalloc *******************************
 
  CVodeMalloc allocates and initializes memory for a problem. All

phreeqcpp/cxxKinetics.cxx

@@ -15,6 +15,15 @@
 #include "PHRQ_io.h"
 #include "Dictionary.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/cxxMix.cxx

@@ -8,11 +8,20 @@
 #include <algorithm>			// std::sort
 
 #include "Utils.h"				// define first
-#include "Parser.h"
 #include "Phreeqc.h"
+#include "Parser.h"
 #include "cxxMix.h"
 #include "phqalloc.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

phreeqcpp/dense.cpp

@@ -75,6 +75,15 @@
 /* Implementation */
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 DenseMat
 DenseAllocMat(integertype N)
 {

phreeqcpp/dumper.cpp

@@ -4,6 +4,14 @@
 #include "Parser.h"
 #include "PHRQ_io.h"
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 dumper::dumper(PHRQ_io *io)
 :
 PHRQ_base(io)

phreeqcpp/gases.cpp

@@ -1,5 +1,14 @@
 #include "Phreeqc.h"
 #include "GasPhase.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 setup_fixed_volume_gas(void)

phreeqcpp/input.cpp

@@ -5,6 +5,15 @@
 #include <fstream>
 #include "phqalloc.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 void Phreeqc::
 set_reading_database(int reading_database)

phreeqcpp/integrate.cpp

@@ -6,6 +6,15 @@
 #define MAX_QUAD 20
 #define K_POLY 5
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 calc_all_g(void)

phreeqcpp/inverse.cpp

@@ -12,6 +12,15 @@
 #define SCALE_EPSILON .0009765625
 #define SCALE_WATER   1.
 #define SCALE_ALL     1.
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 inverse_models(void)

phreeqcpp/isotopes.cpp

@@ -3,6 +3,14 @@
 #include "Solution.h"
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 read_isotopes(void)

phreeqcpp/kinetics.cpp

@@ -39,6 +39,15 @@
 
 #define MAX_DIVIDE 2
 #define KINETICS_TOL 1e-8;
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 calc_kinetic_reaction(cxxKinetics *kinetics_ptr, LDBLE time_step)

phreeqcpp/mainsubs.cpp

@@ -17,6 +17,14 @@
 #include <windows.h>
 #endif
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 void Phreeqc::
 initialize(void)

phreeqcpp/model.cpp

@@ -8,6 +8,15 @@
 #include "SSassemblage.h"
 #include "Solution.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 model(void)

phreeqcpp/nvector.cpp

@@ -61,6 +61,15 @@
 
 #include "nvector.h"			/* generic M_Env and N_Vector */
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 N_Vector
 N_VNew(integertype n, M_Env machEnv)
 {

phreeqcpp/nvector_serial.cpp

@@ -98,6 +98,15 @@ 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
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /********************* Exported Functions ************************/
 
 /* Serial implementation of the machine environment

phreeqcpp/parse.cpp

@@ -1,6 +1,15 @@
 #include "Phreeqc.h"
 #include "phqalloc.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 parse_eq(char* eqn, std::vector<class elt_list>& new_elt_list, int association)

phreeqcpp/phqalloc.cpp

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

phreeqcpp/pitzer.cpp

@@ -5,6 +5,15 @@
 #define PITZER_LISTS
 #define PITZER
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 pitzer_init(void)

phreeqcpp/pitzer_structures.cpp

@@ -4,6 +4,15 @@
 #include <list>
 #include <string>
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* **********************************************************************
  *
  *   Routines related to structure "pitz_param"

phreeqcpp/prep.cpp

@@ -10,6 +10,15 @@
 #include "SS.h"
 #include "Solution.h"
 #include "cxxKinetics.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 prep(void)

phreeqcpp/print.cpp

@@ -13,6 +13,15 @@
 #include "cxxKinetics.h"
 #include "Solution.h"
 #include "Surface.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 array_print(LDBLE * array_l, int row_count, int column_count,

phreeqcpp/read.cpp

@@ -19,6 +19,15 @@
 #include "SelectedOutput.h"
 #include "UserPunch.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 read_input(void)

phreeqcpp/readtr.cpp

@@ -1,12 +1,12 @@
 #include <iostream>				/* std::cout std::cerr */
 #include <sstream>
 #include <fstream>
+#include "Phreeqc.h"
 #include "StorageBin.h"
 #include "SS.h"
 #ifndef boolean
 typedef unsigned char boolean;
 #endif
-#include "Phreeqc.h"
 #include "phqalloc.h"
 #include "Utils.h"
 
@@ -17,6 +17,15 @@ typedef unsigned char boolean;
 #define OPTION_DEFAULT -4
 #define OPTION_DEFAULT2 -5
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 read_transport(void)

phreeqcpp/runner.cpp

@@ -2,6 +2,15 @@
 #include "Parser.h"
 #include "NA.h"
 #include "Utils.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 runner::runner(PHRQ_io *io)
 :
 PHRQ_base(io)

phreeqcpp/sit.cpp

@@ -3,6 +3,15 @@
 #include "Exchange.h"
 #include "Solution.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 sit_init(void)

phreeqcpp/smalldense.cpp

@@ -70,6 +70,15 @@
 
 /* Implementation */
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 realtype **
 denalloc(integertype n)
 {

phreeqcpp/spread.cpp

@@ -16,6 +16,15 @@ typedef unsigned char boolean;
 #define OPTION_ERROR -3
 #define OPTION_DEFAULT -4
 #define OPT_1 -5
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 read_solution_spread(void)

phreeqcpp/step.cpp

@@ -17,6 +17,15 @@
 #include "SSassemblage.h"
 #include "cxxKinetics.h"
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 step(LDBLE step_fraction)

phreeqcpp/structures.cpp

@@ -15,6 +15,13 @@
 #include "Surface.h"
 #include "Solution.h"
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
 
 /* ---------------------------------------------------------------------- */
 int Phreeqc::

phreeqcpp/sundialsmath.cpp

@@ -68,6 +68,14 @@
 #define TWO  RCONST(2.0)
 
 
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 realtype
 UnitRoundoff(void)
 {

phreeqcpp/tally.cpp

@@ -9,6 +9,16 @@
 #include "SSassemblage.h"
 #include "cxxKinetics.h"
 #include "Solution.h"
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
+
 /*   
      Calling sequence 
 

phreeqcpp/tidy.cpp

@@ -10,6 +10,15 @@
 
 #define ZERO_TOL 1.0e-30
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 tidy_model(void)

phreeqcpp/transport.cpp

@@ -51,6 +51,15 @@ 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
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 int Phreeqc::
 transport(void)

phreeqcpp/utilities.cpp

@@ -7,6 +7,15 @@
 #include <time.h>
 
 
+
+#if defined(PHREEQCI_GUI)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+#endif
+
 /* ---------------------------------------------------------------------- */
 double Phreeqc::
 calc_alk(CReaction& rxn_ref)