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
1,930 Commits 6 Branches 4 Tags
Commit Graph

1930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d5808fd188 Merge commit '6ea0442d458c0a029140954f6c801006cac0871b' 2023-08-25 15:29:27 +00: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
99451c0855 Merge commit '99b10305984102705405888e62ff98cae0c70fe6' 2023-08-25 03:34:17 +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
52357404b5 Merge commit 'e902474819623e9469f66b6514a8293063ff2b86' 2023-08-25 03:29:16 +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
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
Darth Vader
35dec7bafc Squashed 'phreeqcpp/' changes from e7c12e1..b12de1f 
b12de1f Added sleeps after curl -X POST
fb55642 working on SelectedOutput for BMI
a050758 Closes #48 -- Illegal character encoding in string literal (#49)

git-subtree-dir: phreeqcpp
git-subtree-split: b12de1f7f0eadb7b6153bffca9d0412801d2e132
 2023-05-26 02:32:21 +00:00
Darth Vader
b9bc048c32 Merge commit '35dec7bafcb86c2fb40acc463c51be5af1af21b4' 2023-05-26 02:32:21 +00:00
Charlton, Scott R
8a1e3f9711 Added sleeps after curl -X POST 2023-05-25 20:24:19 -06:00
David Parkhurst
91d35938de working on SelectedOutput for BMI 2023-04-22 16:14:01 -06:00
Charlton, Scott R
4234c11ed7 Closes #48 -- Illegal character encoding in string literal (#49) 2023-04-14 15:25:45 -06:00
Darth Vader
aff166b184 Squashed 'phreeqcpp/' changes from 97a0327..e7c12e1 
e7c12e1 Merge commit '823f839bc515d692be4dba290f43673b3c0493ab'
823f839 Squashed 'common/' changes from 04cb71a..6e625e5
c0c3f59 Merge remote-tracking branch 'github/master'
6a30753 changed math.h to cmath.
171ff7f ifdef for NAN
f0839d1 fixed warnings from Intel C++ 2023 compiler
49d0a56 fixed surface.cxx correct_gc. tweaked P_Vm, but it is not too stable.
f2b8caa added viscosity to solution.h, solution.cpp, and xsolution_save
7ff51aa Tony's viscosity with many examples

git-subtree-dir: phreeqcpp
git-subtree-split: e7c12e191414a87ddcedcf73f17d7765702cb75b
 2023-04-10 18:27:31 +00:00
Darth Vader
813150bc86 Merge commit 'aff166b18426080aa53a136931d221f7afa810d3' 2023-04-10 18:27:31 +00:00
Darth Vader
0a7874068e Squashed 'phreeqcpp/' changes from e1de8e8..97a0327 
97a0327 fixed compiler warnings except NAN
ee1acc4 changed all double precision to real(kind=8) in all files. Compiles and runs test cases.

git-subtree-dir: phreeqcpp
git-subtree-split: 97a0327aa6a4017dcd2e0298f44d5e672b05288a
 2023-04-10 03:21:02 +00:00
Darth Vader
c35cbe19ca Merge commit '0a7874068e77f654f99f8a66b57f3963fea8ec0f' 2023-04-10 03:21:02 +00:00
David Parkhurst
25f2472130 fixed compiler warnings except NAN 2023-04-03 03:27:21 -06:00
David Parkhurst
3f24bf1780 moved enum to RMVARS.h 2023-03-30 23:48:27 -06:00
David Parkhurst
540451234f changed all double precision to real(kind=8) in all files. Compiles and runs test cases. 2023-03-24 15:11:36 -06:00
Darth Vader
cb707ac2b7 Squashed 'phreeqcpp/' changes from 11d588e..e1de8e8 
e1de8e8 Closes usgs-coupled/phast3#2 (#3)

git-subtree-dir: phreeqcpp
git-subtree-split: e1de8e819060ecaf6d402694b29d70ffd0a3bf10
 2023-03-08 19:58:39 +00:00
Darth Vader
c0e629358b Merge commit 'cb707ac2b79acb0dd01a80e37a0b3f3beb690957' 2023-03-08 19:58:39 +00:00
Charlton, Scott R
da9a093d9a Closes usgs-coupled/phast3#2 (#3) 2023-03-08 12:51:02 -07:00
Charlton, Scott R
fe577a188c [webmod] webmod-dist-windows-git fails to build on jenkins 2023-03-07 13:02:09 -07:00
Darth Vader
8a85d23012 Merge commit 'eeee6d3cce2549d37d7051ea3aebd78d77b944e8' 2023-03-07 02:49:50 +00:00
Darth Vader
eeee6d3cce Squashed 'phreeqcpp/' changes from eb35357..11d588e 
11d588e Merge commit '84dc8253eb8498cc204cacb6b24ee3b92f0a58b3'
84dc825 Squashed 'common/' changes from fb03f6a..04cb71a

git-subtree-dir: phreeqcpp
git-subtree-split: 11d588edde138d4961072f7b55c9bebc666189db
 2023-03-07 02:49:49 +00:00
Darth Vader
c77222b71f Merge commit '772c30924fd12ad20b8be7c128ae7cc33bb7b170' 2023-03-07 02:48:23 +00:00
Darth Vader
772c30924f Squashed 'phreeqcpp/' changes from f8cd55c..eb35357 
eb35357 Merge pull request #17 from scharlton2/bmi-working
26a26c1 pre-commit changes use $ pre-commit run --all-files

git-subtree-dir: phreeqcpp
git-subtree-split: eb35357c1291b425b97f8bae8a62d5a888a6d4e3
 2023-03-07 02:48:23 +00:00
Charlton, Scott R
94f3c45a58 Merge pull request #17 from scharlton2/bmi-working 
bmi-working merge
 2023-03-06 19:37:08 -07:00
Darth Vader
bc9ab58d16 Squashed 'phreeqcpp/' changes from 0b60d1a..f8cd55c 
f8cd55c Merge branch 'master' of code.chs.usgs.gov:coupled/phreeqc3
56731ea updated RELEASE.TXT, revised PR_P and PR_PHI functions and the test case PR_error_incremental
35190be added Thermoddem database. Fixed error in PR_P and PR_PHI. Added test case to check PR_P and PR_PHI are fixed.

git-subtree-dir: phreeqcpp
git-subtree-split: f8cd55c27c133f195a16f21cb6e07a46d280b2f3
 2023-03-07 01:00:20 +00:00
Darth Vader
28517a89ce Merge commit 'bc9ab58d16539fa4c3580b66a7cd309db1c3568e' 2023-03-07 01:00:20 +00:00
Darth Vader
c85a9cde6d Squashed 'phreeqcpp/' changes from e9db33b..0b60d1a 
0b60d1a Closes usgs-coupled/phreeqcrm#12 (#13)

git-subtree-dir: phreeqcpp
git-subtree-split: 0b60d1aeccfdbd9d0f0c4959ee6a04e99d7725e4
 2023-03-07 00:42:18 +00:00
Darth Vader
ec1947dcfe Merge commit 'c85a9cde6d9bf3f7841b3bc9b87c18e1012df0c9' 2023-03-07 00:42:18 +00:00
Charlton, Scott R
b4aa81fa76 pre-commit changes 
use $ pre-commit run --all-files
 2023-03-05 16:11:39 -07:00
Charlton, Scott R
9b9ee1b061 Closes usgs-coupled/phreeqcrm#12 (#13) 
* Closes usgs-coupled/phreeqcrm#12

* Added yaml-cpp install

* Added yaml-cpp to PhreeqcRM link libraries

* Added yaml-cpp install to cmake builds

* Added compile feature cxx_std_11

* Added toolchain for windows cmake

* Fix autotools build on macOS?

* Changed to c++ headers for math.h and float.h

* Updated 'Test install' step for autotools (macos-latest)
 2023-02-26 16:50:20 -07:00
Darth Vader
a4eba15e3b Squashed 'phreeqcpp/' changes from bbd2543..e9db33b 
e9db33b Added replacement code for snprintf for vs versions before vs2015 (#30)

git-subtree-dir: phreeqcpp
git-subtree-split: e9db33b14235f3d9018e1205ae05895dd2eb3e2e
 2023-02-11 17:25:04 +00:00
Darth Vader
6e14dda95c Merge commit 'a4eba15e3b254fa202a7ff58f9f474b1f2dbc584' 2023-02-11 17:25:04 +00:00
Darth Vader
fb59ec8b19 Squashed 'phreeqcpp/' changes from feaa432..bbd2543 
bbd2543 [phreeqc] fixes what iphreeqc/issue-8 broke

git-subtree-dir: phreeqcpp
git-subtree-split: bbd2543978c857c8e46ff6f553231f188c5cb32c
 2023-01-17 03:32:29 +00:00