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
Darth Vader
19d988cc22
Merge commit '1ec7448cb08f1cc2917b33e3337946a8da23208f'
2024-06-11 00:57:31 +00:00
Darth Vader
1ec7448cb0
Squashed 'src/' changes from 2b17f7ca..279b8435
...
279b8435 [iphreeqc] Fixed for R
git-subtree-dir: src
git-subtree-split: 279b84357dd36426396d7916436c373d319d2082
2024-06-11 00:57:31 +00:00
Charlton, Scott R
53d7a25636
[iphreeqc] Fixed for R
2024-06-10 18:55:01 -06:00
Charlton, Scott R
8dbfe3bddb
[iphreeqc] Added the following databases:
...
* Kinec.v2.dat
* phreeqc_rates.dat
* PHREEQC_ThermoddemV1.10_15Dec2020.dat
to R package
2024-06-10 16:21:10 -06:00
Charlton, Scott R
5a877d74be
[iphreeqc] More noRemap conversions
2024-06-10 16:18:29 -06:00
Charlton, Scott R
a30ab54e6f
[iphreeqc] Working on noRemap conversion
2024-06-10 15:46:34 -06:00
Charlton, Scott R.
1493788979
[iphreeqc] Updated for latest databases
2024-06-10 14:17:50 -06:00
Darth Vader
f6094a96e6
Squashed 'database/' changes from 4fc5a196..b5394351
...
b5394351 Merge branch 'viscosity' of github.com:dlparkhurst/phreeqc3-1 into viscosity
7d53e27f formatted rate parameters for phreeqc_rates.dat
git-subtree-dir: database
git-subtree-split: b5394351dec7c541519a422ad42495fd9ec1945b
2024-06-10 01:32:15 +00:00
Darth Vader
7350d18f48
Merge commit 'f6094a96e6404f3f68c5f4e97d32e4ddb1552884'
2024-06-10 01:32:15 +00:00
Darth Vader
f6eef43b74
Squashed 'database/' changes from 9bf3c42d..4fc5a196
...
4fc5a196 [phreeqc3] Updated databases
git-subtree-dir: database
git-subtree-split: 4fc5a196119c09ee6337f6c13618c8031bc6acaa
2024-06-08 00:05:43 +00:00
Darth Vader
802a569c22
Merge commit 'f6eef43b74b93154fbc8d09988a2a7628fa9a4a8'
2024-06-08 00:05:43 +00:00
Darth Vader
a186ba7c06
Squashed 'phreeqc3-examples/' changes from b3aa6834..2d7d1bca
...
2d7d1bca [phreeqc] Updated for latest databases From merge pull request #65 from dlparkhurst/viscosity
git-subtree-dir: phreeqc3-examples
git-subtree-split: 2d7d1bcae1bf1bf91e2ceab5e0d499ffa1c99db4
2024-06-07 21:57:03 +00:00
Darth Vader
72fef24c63
Merge commit 'a186ba7c06c9851eab58b0554c0a772f129a6ee1'
2024-06-07 21:57:03 +00:00
Darth Vader
b27777460b
Squashed 'database/' changes from e39a5d3c..9bf3c42d
...
9bf3c42d 20240607b pitzer.dat
bab2c2e2 20240607a database22.zip
9064885f 20240607 database2.zip from Tony
a4a7ecab Tony's change to Sr and NH4, SC_Ohm and rate_xmpls, basicsubs.cpp error
git-subtree-dir: database
git-subtree-split: 9bf3c42d7c3df8472e2e83b0138032fe8697990b
2024-06-07 21:57:02 +00:00
Darth Vader
bed50e7725
Merge commit 'b27777460b923f047497dcfe78b622c74cf2f0bb'
2024-06-07 21:57:02 +00:00
Darth Vader
ed24ec246b
Squashed 'src/' changes from 79511203..2b17f7ca
...
2b17f7ca Merge commit '8024ee12891fde0332b86544b2b18010a91fde15'
8024ee12 Squashed 'phreeqcpp/' changes from e2f4d06..ceab9a1
git-subtree-dir: src
git-subtree-split: 2b17f7ca917334c9d668b1d63a6499118cd1273f
2024-06-07 21:56:59 +00:00
Darth Vader
9c0615491a
Merge commit 'ed24ec246bbfdcd57adbd0d4a9e8fe088a5de5b7'
2024-06-07 21:56:59 +00:00
Darth Vader
0153e46ff7
Merge commit '9ba726de0f8b36a9143922bf148f6a259982756a'
2024-05-29 19:06:22 +00:00
Darth Vader
9ba726de0f
Squashed 'src/' changes from fb3f60ce..79511203
...
79511203 Merge commit '067a8b1aaa326cecf6a1b5a167fe88448ef1e0b2'
067a8b1a Squashed 'phreeqcpp/' changes from 3d5242f..e2f4d06
git-subtree-dir: src
git-subtree-split: 795112031bb1ef92c0eb3c07aea03ea7b222093e
2024-05-29 19:06:21 +00:00
