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
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
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
afb2c0a6d6
Merge commit 'e9b2c29221ea97c7fbab9fdfced5fed601ea2e0f'
2024-08-22 21:43:27 +00: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.
124e384237
Closes #54
2024-08-15 11:51:24 -06: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
Charlton, Scott R.
a6e10bbb26
Merge remote-tracking branch 'usgs-coupled/master'
2024-08-15 11:04:30 -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.
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
950d47e884
Merge commit '2d96a188772ef1fd12575913362d1fa01f198be8'
2024-08-14 21:45:07 +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.
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
Charlton, Scott R.
53da1be2cf
Merge pull request #49 from SpaceIm/fix/global-structure-incomplete-def
...
Reorder several classes in global_structures.h to avoid incomplete definitions
2024-08-14 12:19:30 -06:00
Charlton, Scott R.
e86f5476a5
Replaced cmake with ctest
2024-08-14 11:42:38 -06:00
Charlton, Scott R.
27b079a467
Merge remote-tracking branch 'origin/master' into fix/global-structure-incomplete-def
...
- Upstream merge necessary to rerun pull-request
with updated github actions
2024-08-14 11:29:16 -06:00
Charlton, Scott R.
befffd4ddc
Merge pull request #53 from scharlton2/52-add-clang-test-builds
...
Added test-clang and test-shared-clang jobs
2024-08-14 10:38:46 -06:00
Charlton, Scott R.
2ecaf72fcd
Added test-clang and test-shared-clang jobs
2024-08-13 15:02:09 -06:00
SpaceIm
c43753da18
reorder classes in global_structures.h to avoid incomplete definitions
2024-08-11 21:08:04 +02:00
SpaceIm
0ab4bf1143
add missing include of stddef.h in IPhreeqc.h if no fortran module
...
when IPHREEQC_NO_FORTRAN_MODULE is defined, the type of the last parameter of SetBasicFortranCallback is size_t, which is defined in stddef.h
2024-08-11 20:55:26 +02:00
Charlton, Scott R.
09b09c7253
Set _WINDLL when WIN32 and BUIDL_SHARED_LIBS
2024-08-02 17:17:27 -06:00
Charlton, Scott R.
cf53497505
Modified to build gtest statically
2024-08-02 16:38:08 -06:00
Charlton, Scott R.
44c7f133e7
Added test-shared (expected to fail)
2024-08-02 16:22:53 -06:00
Darth Vader
875145cc20
Squashed 'phreeqc3-doc/' changes from e87a48a2..162c3a25
...
162c3a25 Added to Release.txt about dump issue.
git-subtree-dir: phreeqc3-doc
git-subtree-split: 162c3a25ad948a0f262b15e6b0a7a1eff374e4f3
2024-07-11 19:14:29 +00:00
Darth Vader
e63b635632
Merge commit '875145cc20dbdbaca30a21c2d0a89f0200a03deb'
2024-07-11 19:14:29 +00:00
Darth Vader
7c714dfbd3
Squashed 'src/' changes from 0da302ae..178b05c2
...
178b05c2 Merge commit '9a4caf7def182e3f6aa3caa5024c7af821663b65'
9a4caf7d Squashed 'phreeqcpp/' changes from e4c4cf3..587223f
git-subtree-dir: src
git-subtree-split: 178b05c251c6d7acc6e19bb19a27a23b51a0d895
2024-07-11 17:09:41 +00:00
Darth Vader
8d1cd72089
Merge commit '7c714dfbd3c917247c9c9346799bb3fa1b9dee16'
2024-07-11 17:09:41 +00:00
Darth Vader
3a070775e2
Squashed 'database/' changes from 307253d3..c51839c6
...
c51839c6 Changed back to AmmH
git-subtree-dir: database
git-subtree-split: c51839c62249bbad9126d4e7aca71a3e4c598a76
2024-06-25 19:35:20 +00:00
Darth Vader
63940ac188
Merge commit '3a070775e2706970e4b15fbfee94b8926e75a846'
2024-06-25 19:35:20 +00:00
Darth Vader
43b0c86755
Squashed 'phreeqc3-doc/' changes from 92562d5d..e87a48a2
...
e87a48a2 Fixed unprintable characters in RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: e87a48a23412f2981e305c8f291b4340d05569a1
2024-06-25 19:35:12 +00:00
Darth Vader
95fe648c91
Merge commit '43b0c8675579aa8e041d6a5768a2d5c2e01c4cfa'
2024-06-25 19:35:12 +00:00
Charlton, Scott R
fe87dc05f0
[iphreeqc] Closes #43 - missing phreeqc.dat.90a6449
2024-06-21 10:33:44 -06:00
Darth Vader
ca69fc3314
Squashed 'database/' changes from b5394351..307253d3
...
307253d3 Fixed AmmH in Amm.dat and comments in phreeqc.dat and phreeqc_rates.dat
git-subtree-dir: database
git-subtree-split: 307253d3f96635e2bd94cf6deecd72ac9dcbcb82
2024-06-20 21:53:24 +00:00
Darth Vader
4a1b0494fe
Merge commit 'ca69fc331449ba700946bc66e17955d45f2dea59'
2024-06-20 21:53:24 +00:00
Darth Vader
fcc8cb7f49
Merge commit '0e2456f051d9e2ad6f61f899721fa8ab2db1a30c'
2024-06-20 21:53:22 +00:00
Darth Vader
0e2456f051
Squashed 'src/' changes from 1a84cced..0da302ae
...
0da302ae Merge commit '2abb0b0bcd4bcae42f84ff001aba7f2ab6df2af7'
2abb0b0b Squashed 'phreeqcpp/' changes from 798f8f9..e4c4cf3
git-subtree-dir: src
git-subtree-split: 0da302aedfffccd97d50d919d1c3e696859de899
2024-06-20 21:53:21 +00:00
Charlton, Scott R
55c337c429
Working on CRAN submission
2024-06-11 13:23:55 -06:00
Darth Vader
e8782e0482
Merge commit '231f8e36589ed86c2270d0915bb91cc74b4a15ef'
2024-06-11 00:59:17 +00:00
Darth Vader
231f8e3658
Squashed 'src/' changes from 279b8435..1a84cced
...
1a84cced Merge commit 'a9c4ef8324b6c59ba5cf0d78fc0d8ef93b33923f'
a9c4ef83 Squashed 'phreeqcpp/' changes from ceab9a1..798f8f9
git-subtree-dir: src
git-subtree-split: 1a84cced60c5d09270cee34d3f18a16d267012c8
2024-06-11 00:59:16 +00:00
