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

4167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
b6d35e21c7 Squashed 'phreeqc3-doc/' changes from 7bb51ae7..db48f0f6 
db48f0f6 Fix typos

git-subtree-dir: phreeqc3-doc
git-subtree-split: db48f0f69e9b2ec1880a62418e598777bc79ddcf
 2024-10-08 20:05:40 +00:00
Darth Vader
5589061192 Merge commit 'b6d35e21c7104a57e96316423cbc296179e02514' 2024-10-08 20:05:40 +00:00
Darth Vader
6dc784c5e9 Squashed 'phreeqc3-examples/' changes from 4a0d366e..8d50b95a 
8d50b95a Updated output files for current version

git-subtree-dir: phreeqc3-examples
git-subtree-split: 8d50b95a9fe30f7fedc2d189b361c7849a68df01
 2024-09-24 22:03:36 +00:00
Darth Vader
c97ce7fb50 Merge commit '6dc784c5e91beeb719846fcee40b21dcfde28f81' 2024-09-24 22:03:36 +00:00
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
Max Lübke
e02969c891 Merge branch 'ml/remove-cpp20-api' into 'poet' 
Improve interoperability with exclusive Cpp language features

See merge request naaice/iphreeqc!9
v0.1 		2024-09-10 18:18:56 +02:00
Max Luebke
e3c3e890df refactor: Enable std::map::contains only when cpp >= 20 is defined 2024-09-10 18:09:51 +02:00
Marco De Lucia
9722151735 Selfcontained input in app/ipqEngine 2024-09-10 17:29:52 +02:00
Max Lübke
8c2e1ce8e8 refactor: Update printVectorsAsTable function in ipqEngine.cpp 
- Added "Array Index" column to the table output
 2024-09-10 15:18:49 +02:00
Max Lübke
e42c120518 Add 'app' directory from golem branch 2024-09-10 15:08:55 +02:00
Max Lübke
6fd2e96411 refactor: Update C++ standard to c++20 in IPhreeqcPOET target 2024-09-10 09:11:28 +02:00
Max Lübke
324810368e feat: remove header dependency to c++20 features 2024-09-10 09:11:13 +02: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
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
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
Darth Vader
afb2c0a6d6 Merge commit 'e9b2c29221ea97c7fbab9fdfced5fed601ea2e0f' 2024-08-22 21:43:27 +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
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