max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,960 Commits 6 Branches 4 Tags
Commit Graph

1960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
c767e9c6a1 Merge commit '4a24a89572cca75b5919dabde3ac798c175bf899' 2024-05-07 22:41:18 +00:00
Darth Vader
4a24a89572 Squashed 'phreeqcpp/' changes from 0243c90..60ccbf8 
60ccbf8 Removed CALCULATE_VALUES, added MEAN_GAMMAS, made phreeqc_rates.dat, updated CMakeLists, ran all examples, added test case ss_kinetics
baa0eee Added a little error checking to tokrate_pk
50d999b Tony added table numbers, kinetic_rates_plus has complete tables.
bf054e3 Finished up mean_gammas keyword and test case. Tony has some new changes I need to add.
8c561f0 Implemented rate parameters PK, SVD, Hermanska
5998b71 Added Basic function RATE_PK and RATE_SVERDRUP
c881283 added put$ and get$ Basic functions. Added test cases get_put_ to test get$ and put$. Added kinetic_rates_carbfix to use new database kinec.v2.dat. Fixed pad$ to use strexpr.

git-subtree-dir: phreeqcpp
git-subtree-split: 60ccbf83563b6f60011e37200b0357361e9e6379
 2024-05-07 22:41:18 +00:00
David Parkhurst
8acfbb384a Merge branch 'master' into module 2024-04-18 17:20:59 -06:00
Darth Vader
f100f492a5 Squashed 'phreeqcpp/' changes from 89d028d..0243c90 
0243c90 Updated to build in vs2005

git-subtree-dir: phreeqcpp
git-subtree-split: 0243c905af6767a3777640ad6b89de56ec5ab4b7
 2024-04-18 21:17:18 +00:00
Darth Vader
478318affe Merge commit 'f100f492a5750d4998da1daa4a3e9b14b245a0e8' 2024-04-18 21:17:18 +00:00
Darth Vader
c378c74d7f Squashed 'phreeqcpp/' changes from 7284fed..89d028d 
89d028d Tony's fix for Valgrind error in Debye1.
9716b89 fix for new Valgrind problem. Added a newer CEMDATA database for the database collection.
eee3969 Merge branch 'master' into viscosity
b575463 Merge branch 'master' into viscosity
b74423e Issue resolution to be tested: Valgrind-Conditional jump or move depends on uninitialised value (SC) #48
67a69ae Tony changes 20240414, with correction to CH4 Vm. Changes to src. seaw_SC expanded.
34b880c Merge branch 'master' into viscosity
1819d3a Merge branch 'master' into viscosity

git-subtree-dir: phreeqcpp
git-subtree-split: 89d028d8321339d90539869f46da1143f23d4025
 2024-04-18 18:16:55 +00:00
Darth Vader
e8c03d1693 Merge commit 'c378c74d7f2510092a8fca311f7ffbbb7ed96f1d' 2024-04-18 18:16:55 +00:00
Darth Vader
1ebe8191c2 Squashed 'phreeqcpp/' changes from 87919a0..7284fed 
7284fed Fixed alignment for some of the utf-8
7babc4b Changed sprintf to snprintf
0d90285 Changed encoding to utf-8
3e00b23 Merge pull request #45 from dlparkhurst/viscosity
4aa8034 merged master into viscosity
166aec1 Tony tweak of t3 in transport.cpp
6a4443d used density_x. Added xsoln_visc test case
4ad0613 removed viscos_x and density_x
269d107 Tony's changes Mar 15, 2024
f50111a Tony's changes with added test cases. All test cases run

git-subtree-dir: phreeqcpp
git-subtree-split: 7284fed50f48610d24dc565cb530f6444940b4a3
 2024-04-17 00:16:57 +00:00
Darth Vader
b4a424453b Merge commit '1ebe8191c254ea7a50f20876ef1bf21450f7887a' 2024-04-17 00:16:57 +00:00
David Parkhurst
666e4b813e Issue 160 in phreeqc. llnl minimum temperature problem. There are several places where a SOLUTION is constructed to get lists or test the database. By default the SOLUTION is 25C, so if llnl has a minimum temperature greater (or maximum temperature less) than 25, an error is encountered. The fix is to change the temperature of the SOLUTIONs to the minimum temperature of the llnl grid if llnl is being used. 2024-04-15 18:21:29 -06:00
Charlton, Scott R
2dcf40623f normalized text files 2024-03-26 17:51:00 -06:00
Darth Vader
0ebad0eedc Squashed 'phreeqcpp/' changes from 9925ceb..87919a0 
87919a0 Merge commit 'b397d9d56c7985fddac5b7dbe8cd3c63152bf033'
b397d9d Squashed 'common/' changes from 11183a1..6abe004
a25b00d Try this to fix warning on Darwin
a2f6386 fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04

git-subtree-dir: phreeqcpp
git-subtree-split: 87919a001bdcde90d6559f597b06586d0d5015fd
 2024-03-05 15:42:26 +00:00
Darth Vader
6fd34ae380 Merge commit '0ebad0eedcbb952d1411042592b4081823abdbf5' 2024-03-05 15:42:26 +00:00
Scott R Charlton
64e51c1d13 Try this to fix warning on Darwin 2024-03-04 19:11:28 -07:00
Scott R Charlton
79518deebc fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04 2024-03-04 18:42:52 -07:00
Darth Vader
488c119ac8 Squashed 'phreeqcpp/' changes from f975e17..9925ceb 
9925ceb Updated for more visual studios tested on vs2005 vs2012 vs2013 vs2015 vs2019

git-subtree-dir: phreeqcpp
git-subtree-split: 9925ceb3d2afa5ed8686dbc781b857e6f1b45314
 2023-11-18 03:54:34 +00:00
Darth Vader
ba2ac19165 Merge commit '488c119ac8fb2c9755ce3708519c79f4bd7d382c' 2023-11-18 03:54:34 +00:00
Darth Vader
a5b8a03fd7 Squashed 'phreeqcpp/' changes from ff1cc7a..f975e17 
f975e17 Merge commit 'f82d3a73538ba56c8ed81977b0d26d46ebcb7f98'
f82d3a7 Squashed 'common/' changes from 740bdd5..11183a1

git-subtree-dir: phreeqcpp
git-subtree-split: f975e17ccce7eca010a391898d91c25e6e10990b
 2023-11-18 01:35:08 +00:00
Darth Vader
a8a469b26f Merge commit 'a5b8a03fd7c84cdedb6507c4cd0679b46997ed7d' 2023-11-18 01:35:08 +00:00
Darth Vader
589ec40c7c Squashed 'phreeqcpp/' changes from 3e6c2e9..ff1cc7a 
ff1cc7a [phreeqci] Updated to compile on vs2005

git-subtree-dir: phreeqcpp
git-subtree-split: ff1cc7aa82e0ec1145f593a84025ff174af18463
 2023-11-18 01:30:46 +00:00
Darth Vader
6ce9ad665a Merge commit '589ec40c7ce71d50ea98f7ff283f58ed5283cb29' 2023-11-18 01:30:46 +00:00
Darth Vader
deb497735e Squashed 'phreeqcpp/' changes from 625f6f1..3e6c2e9 
3e6c2e9 Merge commit 'c4958bb740964f1804a6a4e6ae5d8df52c5c64ad'
c4958bb Squashed 'common/' changes from b9af572..740bdd5

git-subtree-dir: phreeqcpp
git-subtree-split: 3e6c2e94e308d95c2be3b98e50cf0f253f327a29
 2023-11-16 05:11:36 +00:00
Darth Vader
c7c1a23d71 Merge commit 'deb497735e9dea915ec582d42e671e0cfbcdd10e' 2023-11-16 05:11:36 +00:00
Darth Vader
1df4f18911 Merge commit 'ed1fbe949157f56f0799b2170ce207b7716a10f2' 2023-11-16 05:06:28 +00:00
Darth Vader
ed1fbe9491 Squashed 'phreeqcpp/' changes from bd2e2b6..625f6f1 
625f6f1 Fixed bugs in inverse
ea9e0ef strcpy_safe and strcat_safe
9b06157 trying different header files
e890269 added <cstring>
c370c7b warnings, strcat, strcpy
14ed59f Try using goto(s)
d2d31d2 Try updated logical expression
d2a3eac Turn off optimizing on k_temp

git-subtree-dir: phreeqcpp
git-subtree-split: 625f6f14905e41a1130a3d0a217b8de478631aca
 2023-11-16 05:06:27 +00:00
David Parkhurst
81f180a069 Fixed bugs in inverse 2023-11-14 22:37:11 -07:00
David Parkhurst
6d575967d4 strcpy_safe and strcat_safe 2023-11-14 14:37:25 -07:00
David Parkhurst
6d98c4e13d trying different header files 2023-11-13 15:35:27 -07:00
David Parkhurst
72796f154c added <cstring> 2023-11-13 15:18:55 -07:00
David Parkhurst
e848160727 warnings, strcat, strcpy 2023-11-13 14:32:40 -07:00
Charlton, Scott R
988bdee0a6 Try using goto(s) 2023-10-31 14:15:28 -06:00
Charlton, Scott R
9b10ce3f5c Try updated logical expression 2023-10-31 13:34:41 -06:00
Charlton, Scott R
812061be2c Turn off optimizing on k_temp 2023-10-31 11:57:11 -06:00
Charlton, Scott R
6e248c34be Updated to pass unit tests on linux 
Added two additional selected_output tests:
  TestSelectedOutputFileMultipleRuns
  TestGetSelectedOutputRowCountMultipleRuns
 2023-08-26 18:15:23 -06:00
Charlton, Scott R
4d2181b795 Fixed bug that caused selected_output to 
accumulate in selected_output storage
 2023-08-25 19:44:03 -06:00
Darth Vader
6ea0442d45 Squashed 'phreeqcpp/' changes from 8dade82..bd2e2b6 
bd2e2b6 Merge remote-tracking branch 'usgs-coupled/master'
f170ab5 Merge branch 'usgs-coupled:master' into phreeqc-1-working
4cbc303 bug fix on Basic functions; minor update to Release.txt

git-subtree-dir: phreeqcpp
git-subtree-split: bd2e2b68ccf277552f19c498e9ef0b972c6d8b7e
 2023-08-25 15:29:27 +00:00
Darth Vader
d5808fd188 Merge commit '6ea0442d458c0a029140954f6c801006cac0871b' 2023-08-25 15:29:27 +00:00
Darth Vader
99b1030598 Squashed 'phreeqcpp/' changes from 3b5f98c..8dade82 
8dade82 Merge commit '64c9761e116474c4c9e673976f02111fbec32caf'
64c9761 Squashed 'common/' changes from a088e29..b9af572

git-subtree-dir: phreeqcpp
git-subtree-split: 8dade82c963a39f50ceeaab4d2d7b9700b53822f
 2023-08-25 03:34:17 +00:00
Darth Vader
99451c0855 Merge commit '99b10305984102705405888e62ff98cae0c70fe6' 2023-08-25 03:34:17 +00:00
Darth Vader
e902474819 Squashed 'phreeqcpp/' changes from 8fa568f..3b5f98c 
3b5f98c No memory leaks; Still need to turn-on Fortran

git-subtree-dir: phreeqcpp
git-subtree-split: 3b5f98c838520da9638d08384186b2c85103ff30
 2023-08-25 03:29:16 +00:00
Darth Vader
52357404b5 Merge commit 'e902474819623e9469f66b6514a8293063ff2b86' 2023-08-25 03:29:16 +00:00
Charlton, Scott R
0cb7f62994 No memory leaks; Still need to turn-on Fortran 2023-08-10 11:01:24 -06:00
Darth Vader
322a40bb3a Squashed 'phreeqcpp/' changes from 6dade54..8fa568f 
8fa568f removed src/print.cpp.utf8
d140c3f End of Run after

git-subtree-dir: phreeqcpp
git-subtree-split: 8fa568f0b446527445c0601dc860cfeab5626212
 2023-05-28 19:59:33 +00:00
Darth Vader
8da0b21940 Merge commit '322a40bb3a8db90d73fe707afaee51381e422aad' 2023-05-28 19:59:33 +00:00
Darth Vader
dd7aa46600 Squashed 'phreeqcpp/' changes from 82515f7..6dade54 
6dade54 Merge commit '4f698833b1b758cefb3440762b18bec08bb945b9'
4f69883 Squashed 'common/' changes from 7c31f5b..a088e29

git-subtree-dir: phreeqcpp
git-subtree-split: 6dade54926bd93a4c9a2bcbd792a41b525784929
 2023-05-26 04:32:50 +00:00
Darth Vader
446e7a8a2a Merge commit 'dd7aa466004fee2b8f0ddc5ba8c04e6199af7fc8' 2023-05-26 04:32:50 +00:00
Darth Vader
050663209b Squashed 'phreeqcpp/' changes from 93ab5c9..82515f7 
82515f7 Merge remote-tracking branch 'origin/master'
1cc4fa0 fix phi for water at high TP. Tony May, 2023
275b340 Tony's changes May 5 and 7.
0fb2509 cleaned up compiler warnings. removed math.h. cleaned up NAN

git-subtree-dir: phreeqcpp
git-subtree-split: 82515f7fecada9be373fd832dd0c5cdf53c79da7
 2023-05-26 04:27:58 +00:00
Darth Vader
32fbc5ab56 Merge commit '050663209be623e2af35e3f93a41ac6f5ac1f18f' 2023-05-26 04:27:58 +00:00
Darth Vader
dc26aa2a8f Squashed 'phreeqcpp/' changes from b12de1f..93ab5c9 
93ab5c9 Merge commit '2841329ea39783ebc402e2644413de9e72904213'
2841329 Squashed 'common/' changes from 6e625e5..7c31f5b

git-subtree-dir: phreeqcpp
git-subtree-split: 93ab5c94e48156a2792207f284e9413df097c82f
 2023-05-26 02:36:52 +00:00
Darth Vader
9bd0be28d6 Merge commit 'dc26aa2a8fe1111439df64025df25f8f01a615fe' 2023-05-26 02:36:52 +00:00