Darth Vader
7e60110c31
Merge commit '45befa710880429a2a04cbc0294e83e0f2ce66b9'
2024-08-29 19:02:04 +00:00
Darth Vader
f5b9d3f0a9
Squashed 'phreeqc3-examples/' changes from 2d7d1bca..4a0d366e
...
4a0d366e Updated examples with latest viscosity branch
git-subtree-dir: phreeqc3-examples
git-subtree-split: 4a0d366eef6b8e55e4109ef4bd3824a10d482038
2024-08-29 19:01:30 +00:00
Darth Vader
0c070e5710
Merge commit 'f5b9d3f0a9df756ddee8322eab1cdb4581044f8c'
2024-08-29 19:01:30 +00:00
Darth Vader
e4059956a8
Squashed 'phreeqc3-doc/' changes from cfaa0d9a..ca3ebafd
...
ca3ebafd updated release.txt with Tony's viscosity updates. Updated EDL Basic function documentation in HTML.
git-subtree-dir: phreeqc3-doc
git-subtree-split: ca3ebafda0fc09ea9b95a8ce4ee7890b6755b93b
2024-08-29 19:01:22 +00:00
Darth Vader
0db9072455
Merge commit 'e4059956a82bb8d8d18ea3ce31ae39265af80e8e'
2024-08-29 19:01:22 +00:00
Max Lübke
bd1cbceb2c
Merge branch 'ml/kinetic-names' into 'poet'
...
refactor: Comment out unused code in KineticWrapper::names(), leading to name duplication
See merge request naaice/iphreeqc!8
2024-08-29 08:46:47 +02:00
Max Lübke
48e65d87ad
refactor: Comment out unused code in KineticWrapper::names(), leading to doubling of names
2024-08-29 08:25:14 +02:00
Charlton, Scott R
4a0d366eef
Updated examples with latest viscosity branch
2024-08-28 16:10:03 -06:00
David Parkhurst
ca3ebafda0
updated release.txt with Tony's viscosity updates. Updated EDL Basic function documentation in HTML.
2024-08-27 14:50:58 -06:00
Max Lübke
fead98ad38
Merge branch 'ml/fix-cpp-standard' into 'poet'
...
Set C++23 standard for IPhreeqcPOET target
See merge request naaice/iphreeqc!6
2024-08-26 11:22:51 +02:00
Max Luebke
674ac498a9
Set C++23 standard for IPhreeqcPOET target
2024-08-26 11:19:58 +02:00
Charlton, Scott R
3b69596c77
Added Kinec_v3.ascii to DBS
2024-08-23 13:08:50 -06:00
Charlton, Scott R.
bd62c44578
Added Kinec_v3.dat to CRAN dist
2024-08-23 11:50:42 -06:00
Darth Vader
e628a74d08
Merge commit '13380db01c7c73a17b38710d840593fe1d9918bc'
2024-08-22 23:33:44 +00:00
Darth Vader
13380db01c
Squashed 'database/' changes from c51839c6..5146dd68
...
5146dd68 Added Kinec_v3.dat to distribution Updated RELEASE.TXT for IPhreeqc
b98a6538 Kinec_v3.dat should replace kinec.v2.dat
git-subtree-dir: database
git-subtree-split: 5146dd686e295681c78dc7f775ab22efa6f84ed6
2024-08-22 23:33:43 +00:00
Darth Vader
edbb05ae8f
Merge commit '48526b35940255d9bf1e87e3d738d88182fa783e'
2024-08-22 23:33:40 +00:00
Darth Vader
48526b3594
Squashed 'phreeqc3-doc/' changes from 162c3a25..cfaa0d9a
...
cfaa0d9a Added Kinec_v3.dat to distribution Updated RELEASE.TXT for IPhreeqc
7f831e87 Updated RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: cfaa0d9ad164cd5dd73163c8ca265b12793c8b99
2024-08-22 23:33:39 +00:00
Charlton, Scott R
5146dd686e
Added Kinec_v3.dat to distribution
...
Updated RELEASE.TXT for IPhreeqc
2024-08-22 17:10:38 -06:00
Charlton, Scott R
cfaa0d9ad1
Added Kinec_v3.dat to distribution
...
Updated RELEASE.TXT for IPhreeqc
2024-08-22 17:10:38 -06:00
Darth Vader
e9b2c29221
Squashed 'examples/com/' changes from 3ed6cb65..af8d7af7
...
af8d7af7 Closes https://github.com/usgs-coupled/iphreeqccom/issues/6
git-subtree-dir: examples/com
git-subtree-split: af8d7af7fb6d37dfdbc4d825350f183f0073d14c
2024-08-22 21:43:27 +00:00
Darth Vader
f7a1be4e54
Merge commit 'e9b2c29221ea97c7fbab9fdfced5fed601ea2e0f'
2024-08-22 21:43:27 +00:00
Darth Vader
afb2c0a6d6
Merge commit 'e9b2c29221ea97c7fbab9fdfced5fed601ea2e0f'
2024-08-22 21:43:27 +00:00
David Parkhurst
b98a65380b
Kinec_v3.dat should replace kinec.v2.dat
2024-08-22 09:22:31 -06:00
David Parkhurst
7f831e87e5
Updated RELEASE.TXT
2024-08-22 07:24:30 -06:00
Charlton, Scott R.
79cc7201cf
Merge pull request #58 from scharlton2/54-fetchcontent_populate-is-deprecated-in-cmake-build
...
Closes #54
2024-08-16 18:08:24 -06:00
Charlton, Scott R
af8d7af7fb
Closes https://github.com/usgs-coupled/iphreeqccom/issues/6
2024-08-16 17:00:21 -06:00
Charlton, Scott R.
124e384237
Closes #54
2024-08-15 11:51:24 -06:00
Darth Vader
aa8cdd0113
Merge commit 'd7222e4f0b773e52ff448f83ba057ec492471ea1'
2024-08-15 17:09:45 +00:00
Darth Vader
a24adae4fc
Merge commit 'd7222e4f0b773e52ff448f83ba057ec492471ea1'
2024-08-15 17:09:45 +00:00
Darth Vader
d7222e4f0b
Squashed 'src/' changes from 2bcb24a8..f627828f
...
f627828f Merge commit 'c1c1f286b61ca73ae3204c7fa4831bb2e3066070'
c1c1f286 Squashed 'phreeqcpp/' changes from b6a23a2..faf8144
d051e14c Merge remote-tracking branch 'usgs-coupled/master'
7ad5a592 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57 )
git-subtree-dir: src
git-subtree-split: f627828fb52a2880ff95d7c341dc335b856fd8c5
2024-08-15 17:09:44 +00:00
Darth Vader
c1c1f286b6
Squashed 'phreeqcpp/' changes from b6a23a2..faf8144
...
faf8144 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57 )
git-subtree-dir: phreeqcpp
git-subtree-split: faf81447ee82e86ce3b2cb9d71fd81316cccfd9f
2024-08-15 17:08:49 +00:00
Darth Vader
f627828fb5
Merge commit 'c1c1f286b61ca73ae3204c7fa4831bb2e3066070'
2024-08-15 17:08:49 +00:00
Charlton, Scott R.
62ebb6ad11
Merge remote-tracking branch 'usgs-coupled/master'
2024-08-15 11:04:30 -06:00
Charlton, Scott R.
a6e10bbb26
Merge remote-tracking branch 'usgs-coupled/master'
2024-08-15 11:04:30 -06:00
Charlton, Scott R
d051e14c0b
Merge remote-tracking branch 'usgs-coupled/master'
2024-08-15 11:04:30 -06:00
Charlton, Scott R.
1e41b0ca7a
50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp ( #57 )
...
Change char* -> const char* for callbacks
2024-08-15 10:12:44 -06:00
Charlton, Scott R.
9e2e1561be
50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp ( #57 )
...
Change char* -> const char* for callbacks
2024-08-15 10:12:44 -06:00
Charlton, Scott R
7ad5a592a7
50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp ( #57 )
...
Change char* -> const char* for callbacks
2024-08-15 10:12:44 -06:00
Charlton, Scott R.
c95b758d4c
Merge pull request #56 from scharlton2/51-iphreeqc_no_fortran_module-is-not-tested-in-github-actions
...
51 IPHREEQC_NO_FORTRAN_MODULE is not tested in GitHub actions
2024-08-14 15:45:58 -06:00
Darth Vader
2d96a18877
Squashed 'src/' changes from 178b05c2..2bcb24a8
...
2bcb24a8 Merge commit '88d5ec20353fab67149768c11765c3c248ee0cea'
88d5ec20 Squashed 'phreeqcpp/' changes from 587223f..b6a23a2
d3b4b10b Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran
128b7a11 reorder classes in global_structures.h to avoid incomplete definitions
8bf2d298 add missing include of stddef.h in IPhreeqc.h if no fortran module
git-subtree-dir: src
git-subtree-split: 2bcb24a86a6da0e35150c73e0421634854a5d7b1
2024-08-14 21:45:07 +00:00
Darth Vader
48ea6ea0ea
Merge commit '2d96a188772ef1fd12575913362d1fa01f198be8'
2024-08-14 21:45:07 +00:00
Darth Vader
950d47e884
Merge commit '2d96a188772ef1fd12575913362d1fa01f198be8'
2024-08-14 21:45:07 +00:00
Darth Vader
88d5ec2035
Squashed 'phreeqcpp/' changes from 587223f..b6a23a2
...
b6a23a2 reorder classes in global_structures.h to avoid incomplete definitions
git-subtree-dir: phreeqcpp
git-subtree-split: b6a23a2457530f9ca6e13fe4f0c226db3bba48af
2024-08-14 21:44:26 +00:00
Darth Vader
2bcb24a86a
Merge commit '88d5ec20353fab67149768c11765c3c248ee0cea'
2024-08-14 21:44:26 +00:00
Charlton, Scott R.
767f32d819
Fixed build_shared_libs syntax
2024-08-14 15:08:34 -06:00
Charlton, Scott R.
5e2ca7ad53
Combined test-clang with test-shared-clang using matrix
2024-08-14 14:11:04 -06:00
Charlton, Scott R.
99e8a5271b
Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran
...
Add missing include of stddef.h in IPhreeqc.h when IPHREEQC_NO_FORTRAN_MODULE is defined
2024-08-14 13:49:05 -06:00
Charlton, Scott R
d3b4b10b79
Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran
...
Add missing include of stddef.h in IPhreeqc.h when IPHREEQC_NO_FORTRAN_MODULE is defined
2024-08-14 13:49:05 -06:00
Charlton, Scott R.
6fccc02306
Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran
...
Add missing include of stddef.h in IPhreeqc.h when IPHREEQC_NO_FORTRAN_MODULE is defined
2024-08-14 13:49:05 -06:00
Charlton, Scott R.
74ab782d6c
Added IPHREEQC_ENABLE_MODULE to matrix for test-clang
2024-08-14 13:19:28 -06:00
