Scott Charlton ca80be6e65 fixed conflict on merge

2020-01-27 15:05:40 -07:00

common

[phreeqc3] Testing subtree merges

2020-01-27 14:36:36 -07:00

PhreeqcKeywords

moved keywords to PhreeqcKeywords directory

2015-02-09 23:40:34 +00:00

.gitlab-ci.yml

[phreeqc3] Testing subtree merges

2020-01-27 14:36:36 -07:00

advection.cpp

moved phreeqc files into src

2013-01-10 06:04:12 +00:00

basicsubs.cpp

Implicit seems to be working with Tony's latest changes

2019-05-30 22:03:38 -06:00

chart_icon.gif

moved phreeqc files into src

2013-01-10 06:04:12 +00:00

ChartHandler.cpp

memory leak when chart was closed before it plotting was finished.

2015-05-28 23:38:01 +00:00

ChartHandler.h

Added active_charts to ChartHandler.

2012-12-20 23:22:16 +00:00

ChartObject.cpp

memory leak when chart was closed before it plotting was finished.

2015-05-28 23:38:01 +00:00

ChartObject.h

Added second logical in batch. First is color, second is grid.

2012-08-01 20:03:47 +00:00

cl1.cpp

removed register keywords and updated for misc clang warnings

2018-08-14 16:11:36 -07:00

cl1mp.cpp

Merged source up to phreeqc3-trunk SVN 10892

2016-03-04 18:13:43 +00:00

class_main.cpp

initial Tony changes

2019-10-22 16:36:15 -06:00

CurveObject.cpp

fixed all System::Threading::Interlocked::CompareExchange and added some debugging code

2012-12-13 22:20:53 +00:00

CurveObject.h

Merged ErrorHandling 6119-6268 changes.

2012-03-06 23:42:49 +00:00

cvdense.cpp

updated for R

2015-09-25 06:18:48 +00:00

cvdense.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

cvode.cpp

Fixed more compile warnings. Removed andra_kin_ss from testing, results are inconsistent between Linux and Windows, presumably the ifs in RATES

2019-11-19 19:39:09 -07:00

cvode.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

cxxKinetics.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

cxxKinetics.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

cxxMix.cxx

Use MIX_RAW in dump to read negative numbered mixes.

2014-01-27 22:04:45 +00:00

cxxMix.h

const static vopts

2012-07-17 17:12:50 +00:00

dense.cpp

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

dense.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

Dictionary.cpp

added Dictionary and Serializer

2016-01-20 18:19:12 +00:00

Dictionary.h

added Dictionary and Serializer

2016-01-20 18:19:12 +00:00

dumper.cpp

Fixing VS static checker warnings.

2015-02-24 19:22:09 +00:00

dumper.h

added Set_append

2013-05-31 05:39:52 +00:00

Exchange.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

Exchange.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

ExchComp.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

ExchComp.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

Form1.2005.resX

fixed to compile in vs2005

2017-10-31 19:55:15 +00:00

Form1.h

Tony's changes from 20180305

2018-03-07 17:08:33 -07:00

Form1.resX

Merged in Tony's changes for electro diffusion.

2017-02-09 17:17:10 +00:00

GasComp.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

GasComp.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

gases.cpp

Tony's changes; diffuse layer with pitzer

2018-08-01 17:44:32 -06:00

GasPhase.cxx

Fixed gas_phase_mix bug, added test case

2019-02-05 13:45:02 -07:00

GasPhase.h

[phreeqc3] needed to check gas phase type for same model, added test case

2018-08-06 14:04:12 -06:00

global_structures.h

initial Tony changes

2019-10-22 16:36:15 -06:00

input.cpp

moved phreeqc files into src

2013-01-10 06:04:12 +00:00

integrate.cpp

initial Tony changes

2019-10-22 16:36:15 -06:00

inverse.cpp

inverse iter 100000; finished copy operator; a bit more testing to go

2018-08-21 11:33:27 -06:00

ISolution.cxx

Updated to svn 12361 on trunk

2017-03-29 20:48:54 +00:00

ISolution.h

Updated to svn 12361 on trunk

2017-03-29 20:48:54 +00:00

ISolutionComp.cxx

Bugs fixes noted by Marco De-Vroed

2014-01-14 20:42:12 +00:00

ISolutionComp.h

updated for linux (added headers)

2012-04-20 05:18:15 +00:00

isotopes.cpp

fixing bugs in copy operator

2018-08-18 12:42:30 -06:00

kinetics.cpp

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

KineticsComp.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

KineticsComp.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

mainsubs.cpp

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

Makefile

latest test cases, minor changes except for .pat file, which were wrong

2014-11-03 17:38:37 +00:00

Makefile.am

added Form1.2005.resX to configure dist

2017-10-31 20:38:32 +00:00

Makefile.old

fixed > > in templates for gcc

2019-06-03 21:05:15 -06:00

model.cpp

Last Linux compile warnings. Added more precision to andra_kin_ss.

2019-11-19 12:33:58 -07:00

NA.h

moved phreeqc files into src

2013-01-10 06:04:12 +00:00

NameDouble.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

NameDouble.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

NumKeyword.cxx

Allow negative numbers on entity mixes.

2012-07-24 18:52:15 +00:00

NumKeyword.h

Merged ErrorHandling 6119-6268 changes.

2012-03-06 23:42:49 +00:00

nvector_serial.cpp

fixed if R_SO not set

2014-07-09 19:46:08 +00:00

nvector_serial.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

nvector.cpp

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

nvector.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

parse.cpp

Tony's changes.

2017-09-28 21:48:05 +00:00

PBasic.cpp

added Basic functions for PHAST: velocity_x, velocity_y, velocity_z, transport_cell_no

2019-12-12 21:20:22 -07:00

PBasic.h

added Basic functions for PHAST: velocity_x, velocity_y, velocity_z, transport_cell_no

2019-12-12 21:20:22 -07:00

phast.xsd

eol

2009-12-03 01:06:34 +00:00

phqalloc.cpp

initial Tony changes

2019-10-22 16:36:15 -06:00

phqalloc.h

moved phreeqc files into src

2013-01-10 06:04:12 +00:00

Phreeqc.cpp

IPhreeqc: ifdef'd out references to std::cerr and std::cout

2019-11-23 21:14:02 -07:00

Phreeqc.h

initial Tony changes

2019-10-22 16:36:15 -06:00

phreeqc.Makefile

moved phreeqc files into src

2013-01-10 06:04:12 +00:00

phreex.ico

Tony's changes and bug fixes

2018-02-17 20:09:31 -07:00

PHRQ_io_output.cpp

Fixed -Wcatch-value warnings reported by CRAN

2019-01-29 16:04:01 -08:00

pitzer_structures.cpp

Updated to phreeqc3-trunk 21475

2017-03-01 21:27:37 +00:00

pitzer.cpp

Implicit seems to be working with Tony's latest changes

2019-05-30 22:03:38 -06:00

PPassemblage.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

PPassemblage.h

Closes #1

2018-08-02 22:00:47 -06:00

PPassemblageComp.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

PPassemblageComp.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

prep.cpp

initial Tony changes

2019-10-22 16:36:15 -06:00

Pressure.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

Pressure.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

print.cpp

Changed back print to allow incremental_reactions to work correctly

2019-11-18 20:32:46 -07:00

Reaction.cxx

const static vopts

2012-07-17 17:12:50 +00:00

Reaction.h

const static vopts

2012-07-17 17:12:50 +00:00

read.cpp

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

ReadClass.cxx

Added logic to run only one step in RunCells

2014-09-12 22:11:27 +00:00

readtr.cpp

Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff

2020-01-26 18:55:23 -07:00

runner.cpp

removed set but not used variables using gcc 4.8.2[-Wunused-but-set-variable]

2014-07-09 01:46:43 +00:00

runner.h

added Setters for time params

2013-03-07 05:42:24 +00:00

SelectedOutput.cpp

Tony's changes; diffuse layer with pitzer

2018-08-01 17:44:32 -06:00

SelectedOutput.h

Tony's changes; diffuse layer with pitzer

2018-08-01 17:44:32 -06:00

Serializer.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

Serializer.h

added Dictionary and Serializer

2016-01-20 18:19:12 +00:00

sit.cpp

Tony's changes; diffuse layer with pitzer

2018-08-01 17:44:32 -06:00

smalldense.cpp

fixed if R_SO not set

2014-07-09 19:46:08 +00:00

smalldense.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

Solution.cxx

Updated to PHREEQC3 12386

2017-02-09 16:41:47 +00:00

Solution.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

SolutionIsotope.cxx

Tony's changes and bug fixes

2018-02-17 20:09:31 -07:00

SolutionIsotope.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

spread.cpp

[iphreeqc] Changes for CRAN 3.4.7

2018-08-09 12:42:50 -06:00

SS.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

SS.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

SSassemblage.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

SSassemblage.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

SScomp.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

SScomp.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

step.cpp

Tony's changes 20190117

2019-01-28 17:24:59 -07:00

StorageBin.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

StorageBin.h

changed restart file to include UZ

2018-11-30 17:41:13 -07:00

StorageBinList.cpp

Fixing VS static checker warnings.

2015-02-24 19:22:09 +00:00

StorageBinList.h

added some const and added cell for use in phreeqci

2013-05-29 23:38:00 +00:00

structures.cpp

changes to solid solution numerical method

2019-01-28 21:08:54 -07:00

sundialsmath.cpp

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

sundialsmath.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

sundialstypes.h

added LICENSE to cvode files

2014-05-08 02:23:14 +00:00

Surface.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

Surface.h

Beginning to test copy operator

2018-08-16 11:52:11 -06:00

SurfaceCharge.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

SurfaceCharge.h

Tony's changes from 20180305

2018-03-07 17:08:33 -07:00

SurfaceComp.cxx

changes to make related and mixing items independent of case. surface_mix test case.

2019-10-28 18:21:57 -06:00

SurfaceComp.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

System.cxx

copy/paste error for surface in totalize system.

2014-08-04 14:44:08 +00:00

System.h

Removed Phreeqc_class.h.

2012-04-19 18:35:14 +00:00

tally.cpp

Updated to PHREEQC3 12386

2017-02-09 16:41:47 +00:00

Temperature.cxx

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

Temperature.h

Updated concrete source from concrete_parallel source (not using parallel).

2016-01-20 18:12:15 +00:00

test.xml

eol

2009-12-03 01:06:34 +00:00

tidy.cpp

Implicit seems to be working with Tony's latest changes

2019-05-30 22:03:38 -06:00

transport.cpp

Fixed GFW bug on new elements in TRANSPORT

2020-01-02 19:12:39 -07:00

Use.cpp

Linux Makefile

2012-01-11 16:46:37 +00:00

Use.h

Merged ErrorHandling 6119-6268 changes.

2012-03-06 23:42:49 +00:00

UserPunch.cpp

Fixed left shift operator error and null pointer error for R UBSAN check;

2014-12-03 05:19:35 +00:00

UserPunch.h

changed EOL to native

2014-01-23 01:31:19 +00:00

utilities.cpp

Implicit seems to be working with Tony's latest changes

2019-05-30 22:03:38 -06:00

ZedGraph.dll

moved phreeqc files into src

2013-01-10 06:04:12 +00:00

Description

No description provided

40 MiB

Languages

C++ 81.6%

Makefile 9.2%

C 4.8%

Fortran 1.8%

R 1%

Other 1.3%