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

3895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
70f82ce8d6 Squashed 'database/' changes from 91aa5fd8..fd9eb5ee 
fd9eb5ee Tony's viscosity with many examples

git-subtree-dir: database
git-subtree-split: fd9eb5ee8ab232613fc558fa2e11f2c37cc21c5f
 2023-04-10 18:26:21 +00:00
Darth Vader
3ef5dd705f Merge commit '70f82ce8d693ae0686e0c492d517ec2d5e7bdf90' 2023-04-10 18:26:21 +00:00
Darth Vader
c49952b695 Merge commit 'b518cad5a5fe5b1b5d09f49058fd096810d6688a' 2023-04-10 18:26:18 +00:00
Darth Vader
b518cad5a5 Squashed 'phreeqc3-doc/' changes from c3ed55b0..399344e2 
399344e2 fixed surface.cxx correct_gc. tweaked P_Vm, but it is not too stable.
cbf9cc1d Tony's viscosity with many examples

git-subtree-dir: phreeqc3-doc
git-subtree-split: 399344e2d5f22d4edd69ebd5c71b43d15d5a13b9
 2023-04-10 18:26:17 +00:00
Darth Vader
0059c62ae7 Merge commit '4419fccb31acd4a82d2fbd618a45d4c78ae9aec6' 2023-04-10 03:21:41 +00:00
Darth Vader
4419fccb31 Squashed 'src/' changes from 25f24721..c35cbe19 
c35cbe19 Merge commit '0a7874068e77f654f99f8a66b57f3963fea8ec0f'
0a787406 Squashed 'phreeqcpp/' changes from e1de8e8..97a0327

git-subtree-dir: src
git-subtree-split: c35cbe19ca04d0e1bc5fdd1e216784d92e608c08
 2023-04-10 03:21:40 +00:00
Darth Vader
73ca240ca2 Merge commit '05d97e8baf75ee7adbef8da4511ae9b4e3e0b9df' 2023-04-10 02:31:55 +00:00
Darth Vader
05d97e8baf Squashed 'src/' changes from c0e62935..25f24721 
25f24721 fixed compiler warnings except NAN
3f24bf17 moved enum to RMVARS.h
54045123 changed all double precision to real(kind=8) in all files. Compiles and runs test cases.

git-subtree-dir: src
git-subtree-split: 25f2472130c22c1a63e15f0fa58f1021c83a7b4a
 2023-04-10 02:31:55 +00:00
Darth Vader
d8b9961616 Merge commit 'cb3f03cf1a6dfe7059795e4ad153eeeb0b8e36a5' 2023-03-08 21:57:05 +00:00
Darth Vader
cb3f03cf1a Squashed 'database/' changes from 4c2ea26c..91aa5fd8 
91aa5fd8 Introduce end-of-line normalization (#6)

git-subtree-dir: database
git-subtree-split: 91aa5fd89b2f211b1dc85020c227df1a35676318
 2023-03-08 21:57:04 +00:00
Darth Vader
847665788c Merge commit '87471a7ec1fe3597b4d2e7bc0db3386f9d48dc42' 2023-03-08 21:55:39 +00:00
Darth Vader
87471a7ec1 Squashed 'phreeqc3-doc/' changes from 8925f6c3..c3ed55b0 
c3ed55b0 Introduce end-of-line normalization (#6)

git-subtree-dir: phreeqc3-doc
git-subtree-split: c3ed55b0e443c4ea3b85ecfc4fd8c78416a53321
 2023-03-08 21:55:38 +00:00
Darth Vader
4fde5d2a99 Squashed 'src/' changes from da9a093d..c0e62935 
c0e62935 Merge commit 'cb707ac2b79acb0dd01a80e37a0b3f3beb690957'
cb707ac2 Squashed 'phreeqcpp/' changes from 11d588e..e1de8e8

git-subtree-dir: src
git-subtree-split: c0e629358b1b8cadd164afc1c68c974f3b6ec270
 2023-03-08 19:59:39 +00:00
Darth Vader
b263dde974 Merge commit '4fde5d2a9901d22e50df7ddf66dfaf9f6b808d20' 2023-03-08 19:59:39 +00:00
Darth Vader
5bf7286912 Merge commit 'a695dadce25bdb17da3d297bd07e0d7873b64d4b' 2023-03-08 19:58:12 +00:00
Darth Vader
a695dadce2 Squashed 'src/' changes from fe577a18..da9a093d 
da9a093d Closes usgs-coupled/phast3#2 (#3)

git-subtree-dir: src
git-subtree-split: da9a093d9aaf63d9336fcf01bfeef5ea9e4f5a87
 2023-03-08 19:58:11 +00:00
Charlton, Scott R
7ec811d35a Merge branch 'master' of code.chs.usgs.gov:coupled/iphreeqc 2023-03-07 19:16:44 -07:00
Charlton, Scott R
399a3fe2b8
[iphreeqc] Closes #29 (#30) 
* [iphreeqc] Closes usgs-coupled/iphreeqc#29
* [iphreeqc] Fixes iphreeqc-unit-linux-git
 2023-03-07 19:00:55 -07:00
Darth Vader
ad57aa549f Squashed 'src/' changes from 8a85d230..fe577a18 
fe577a18 [webmod] webmod-dist-windows-git fails to build on jenkins

git-subtree-dir: src
git-subtree-split: fe577a188cf0fc8102941d161bd4cc03c10881fe
 2023-03-07 20:05:21 +00:00
Darth Vader
4e416c421f Merge commit 'ad57aa549f45beecd2ae1bb6f2bbb2508af4bba4' 2023-03-07 20:05:21 +00:00
Charlton, Scott R
b6a74d9d27 [webmod] webmod-dist-windows-git fails to build on jenkins 2023-03-07 13:02:09 -07:00
Darth Vader
1385350be1 Merge commit 'c9064048568876e0687e08d6d6c65ab67111b732' 2023-03-07 02:50:37 +00:00
Darth Vader
c906404856 Squashed 'src/' changes from c77222b7..8a85d230 
8a85d230 Merge commit 'eeee6d3cce2549d37d7051ea3aebd78d77b944e8'
eeee6d3c Squashed 'phreeqcpp/' changes from eb35357..11d588e

git-subtree-dir: src
git-subtree-split: 8a85d230127e762c7182034c882f81024ef111ce
 2023-03-07 02:50:37 +00:00
Darth Vader
98aef5142c Merge commit 'ce82b6836a8ae0dc278903bc218e9465da62e8bd' 2023-03-07 02:49:11 +00:00
Darth Vader
ce82b6836a Squashed 'src/' changes from 94f3c45a..c77222b7 
c77222b7 Merge commit '772c30924fd12ad20b8be7c128ae7cc33bb7b170'
772c3092 Squashed 'phreeqcpp/' changes from f8cd55c..eb35357

git-subtree-dir: src
git-subtree-split: c77222b71fe0762cc0afa54ca7fd7b2527d524bf
 2023-03-07 02:49:11 +00:00
Darth Vader
b17a8be1df Squashed 'database/' changes from a161f1c8..4c2ea26c 
4c2ea26c Merge pull request #17 from scharlton2/bmi-working
6b9245ae pre-commit changes use $ pre-commit run --all-files

git-subtree-dir: database
git-subtree-split: 4c2ea26c5adf80379785359fc4e42b6d456a09b8
 2023-03-07 02:43:16 +00:00
Darth Vader
7fdf0a4215 Merge commit 'b17a8be1df47595e656039fef70b3b3f9644d8d6' 2023-03-07 02:43:16 +00:00
Darth Vader
1a19a99b23 Squashed 'src/' changes from 28517a89..94f3c45a 
94f3c45a Merge pull request #17 from scharlton2/bmi-working
b4aa81fa pre-commit changes use $ pre-commit run --all-files

git-subtree-dir: src
git-subtree-split: 94f3c45a58255723a034f61b62b1218a393b02e0
 2023-03-07 02:43:15 +00:00
Darth Vader
0a972354de Merge commit '1a19a99b23a31a1268b50af5429b3a89ee8e6a84' 2023-03-07 02:43:15 +00:00
Darth Vader
90affba324 Squashed 'src/' changes from ec1947dc..28517a89 
28517a89 Merge commit 'bc9ab58d16539fa4c3580b66a7cd309db1c3568e'
bc9ab58d Squashed 'phreeqcpp/' changes from 0b60d1a..f8cd55c

git-subtree-dir: src
git-subtree-split: 28517a89cef56f3eb56b382e584ca8251d4af795
 2023-03-07 01:00:52 +00:00
Darth Vader
5e8c2c1ad4 Merge commit '90affba324b6d44f0703f8b703d94a038f291a1c' 2023-03-07 01:00:52 +00:00
Darth Vader
2a2134b55c Squashed 'database/' changes from 20e6e440..a161f1c8 
a161f1c8 added Thermoddem database

git-subtree-dir: database
git-subtree-split: a161f1c81da294667fd96a8d775254bdb33a474c
 2023-03-07 00:58:59 +00:00
Darth Vader
4327dd3a1f Merge commit '2a2134b55c12b9f96b44a15f8fa6fd7f88a72c7c' 2023-03-07 00:58:59 +00:00
Darth Vader
8e3d93040a Squashed 'phreeqc3-doc/' changes from a321fbd6..8925f6c3 
8925f6c3 updated RELEASE.TXT, revised PR_P and PR_PHI functions and the test case PR_error_incremental

git-subtree-dir: phreeqc3-doc
git-subtree-split: 8925f6c3e593af286eddce71943a535afa7b7a3f
 2023-03-07 00:58:57 +00:00
Darth Vader
8534959170 Merge commit '8e3d93040af90c9c0c57e0ee8ad0dee0625746d6' 2023-03-07 00:58:57 +00:00
Darth Vader
15c997e314 Squashed 'src/' changes from 9b9ee1b0..ec1947dc 
ec1947dc Merge commit 'c85a9cde6d9bf3f7841b3bc9b87c18e1012df0c9'
c85a9cde Squashed 'phreeqcpp/' changes from e9db33b..0b60d1a

git-subtree-dir: src
git-subtree-split: ec1947dcfe62d83054d56433ec3b563e70326879
 2023-03-07 00:43:16 +00:00
Darth Vader
4ca24e3c11 Merge commit '15c997e31499728d7beb32a621ef522b1c72799a' 2023-03-07 00:43:16 +00:00
Darth Vader
40a732a06a Merge commit '9fac4a5659c122db2b529cd16deef696af1496e6' 2023-03-07 00:41:53 +00:00
Darth Vader
9fac4a5659 Squashed 'src/' changes from 6e14dda9..9b9ee1b0 
9b9ee1b0 Closes usgs-coupled/phreeqcrm#12 (#13)

git-subtree-dir: src
git-subtree-split: 9b9ee1b061d2245ad878072c4cd01f6140ca11d8
 2023-03-07 00:41:52 +00:00
Charlton, Scott R
1cce50d505 Merge remote-tracking branch 'origin/master' 2023-02-18 13:22:53 -07:00
Scott R Charlton
ff9bf81347 reset AC_PREREQ 2023-02-18 13:17:56 -07:00
Charlton, Scott R
d30cfee5e2
Merge pull request #25 from scharlton2/22-some-replace-not-correctly-replaced-in-tarball 
Missed versioning CMakeLists.txt
 2023-02-17 20:03:58 -07:00
Charlton, Scott R
159038eb37 Missed CMakeLists.txt 2023-02-17 19:20:59 -07:00
Charlton, Scott R
b160fa2da7
Merge pull request #24 from scharlton2/22-some-replace-not-correctly-replaced-in-tarball 
* Updated jenkins-dist.sh
* Updated configure.ac using autoupdate 2.71 on ubuntu 22.02.1
 2023-02-17 17:09:17 -07:00
Charlton, Scott R
b7badcaa37 [iphreeqc] Closes usgs-coupled/iphreeqc#22 
updated jenkins-dist.sh
 2023-02-17 15:06:15 -07:00
Darth Vader
59cf8dc779 Merge commit '5bef6c5841bbcf3276ad78f81c77673aa43e25b5' 2023-02-11 17:25:39 +00:00
Darth Vader
5bef6c5841 Squashed 'src/' changes from c32e6641..6e14dda9 
6e14dda9 Merge commit 'a4eba15e3b254fa202a7ff58f9f474b1f2dbc584'
a4eba15e Squashed 'phreeqcpp/' changes from bbd2543..e9db33b

git-subtree-dir: src
git-subtree-split: 6e14dda95c0329d990f2f614c892709311b3be12
 2023-02-11 17:25:38 +00:00
Charlton, Scott R
b67b914220
Merge pull request #17 from usgs-coupled/master 
Sync develop with master
 2023-01-29 19:19:57 -07:00
Charlton, Scott R
d942ba5211
Closes #14 and #15 (#16) 
* Added sessionInfo() to R-CMD-check
* Set longer timeout for ctest
* Added cron schedule in order to store htmlhelp cache
 2023-01-29 00:53:31 -07:00
Charlton, Scott R
78e93f68cb [iphreeqc] updated .gitignore 2023-01-16 20:57:51 -07:00