Darth Vader
9f148afd1a
Squashed 'database/' changes from 5146dd68..24d2c771
...
24d2c771 Tony updated OH- viscosity
git-subtree-dir: database
git-subtree-split: 24d2c771f3830a122fc3f91d5f0b185c0128bdfb
2024-09-24 22:03:35 +00:00
Darth Vader
31bddef34c
Merge commit '9f148afd1a324939b329fef5a3c49fad2c08f5d5'
2024-09-24 22:03:35 +00:00
Darth Vader
ca6b882bca
Squashed 'src/' changes from a0bffdbc..ac393756
...
ac393756 Merge commit 'c155685f6393b3cd780a56e72651eb79ea5f4bc1'
c155685f Squashed 'phreeqcpp/' changes from fdc0bb5..e317dd0
git-subtree-dir: src
git-subtree-split: ac393756092b60865e75432d9225f875331b9e25
2024-09-24 22:03:32 +00:00
Darth Vader
492f1d5a95
Merge commit 'ca6b882bcab9708f90c8761e0d4a4d572c57fce7'
2024-09-24 22:03:32 +00:00
Darth Vader
ce2280a77a
Squashed 'src/' changes from 7e60110c..a0bffdbc
...
a0bffdbc Merge commit '8f7d206a800852d06bc9a1230320fd670dd34473'
8f7d206a Squashed 'phreeqcpp/' changes from c477ba1..fdc0bb5
git-subtree-dir: src
git-subtree-split: a0bffdbc3f8363587bb32c8441d6d8352ae3dba6
2024-08-29 21:05:25 +00:00
Darth Vader
0d2010720b
Merge commit 'ce2280a77a81e5a8214ae01f97e9766e168327cf'
2024-08-29 21:05:25 +00:00
Darth Vader
ead288422b
Squashed 'phreeqc3-doc/' changes from ca3ebafd..7bb51ae7
...
7bb51ae7 Whitespace adjustments
git-subtree-dir: phreeqc3-doc
git-subtree-split: 7bb51ae783708bb9f004cc9ba6985ffc95df3ce8
2024-08-29 19:54:50 +00:00
Darth Vader
bf0b9c1685
Merge commit 'ead288422b20c854408e7b5f3e0cfeb42560fc00'
2024-08-29 19:54:50 +00:00
Darth Vader
9782e02486
Squashed 'src/' changes from f627828f..7e60110c
...
7e60110c Merge commit '45befa710880429a2a04cbc0294e83e0f2ce66b9'
45befa71 Squashed 'phreeqcpp/' changes from faf8144..c477ba1
git-subtree-dir: src
git-subtree-split: 7e60110c311f80186965599d128e225096bcb1c3
2024-08-29 19:03:35 +00:00
Darth Vader
709f644f8d
Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6'
2024-08-29 19:03:35 +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
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
