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

Commit Graph

  • 9fac273ef2 Merge commit 'ce2280a77a81e5a8214ae01f97e9766e168327cf' Darth Vader 2024-08-29 21:05:25 +00:00
  • 0d2010720b Merge commit 'ce2280a77a81e5a8214ae01f97e9766e168327cf' Darth Vader 2024-08-29 21:05:25 +00:00
  • ce2280a77a Squashed 'src/' changes from 7e60110c..a0bffdbc Darth Vader 2024-08-29 21:05:25 +00:00
  • a0bffdbc3f Merge commit '8f7d206a800852d06bc9a1230320fd670dd34473' Darth Vader 2024-08-29 21:04:42 +00:00
  • 8f7d206a80 Squashed 'phreeqcpp/' changes from c477ba1..fdc0bb5 Darth Vader 2024-08-29 21:04:42 +00:00
  • bf0b9c1685 Merge commit 'ead288422b20c854408e7b5f3e0cfeb42560fc00' Darth Vader 2024-08-29 19:54:50 +00:00
  • ead288422b Squashed 'phreeqc3-doc/' changes from ca3ebafd..7bb51ae7 Darth Vader 2024-08-29 19:54:50 +00:00
  • 7bb51ae783 Whitespace adjustments Charlton, Scott R 2024-08-29 13:48:49 -06:00
  • 672e854d0e Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6' Darth Vader 2024-08-29 19:03:35 +00:00
  • 709f644f8d Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6' Darth Vader 2024-08-29 19:03:35 +00:00
  • 9782e02486 Squashed 'src/' changes from f627828f..7e60110c Darth Vader 2024-08-29 19:03:35 +00:00
  • 7e60110c31 Merge commit '45befa710880429a2a04cbc0294e83e0f2ce66b9' Darth Vader 2024-08-29 19:02:04 +00:00
  • 45befa7108 Squashed 'phreeqcpp/' changes from faf8144..c477ba1 Darth Vader 2024-08-29 19:02:04 +00:00
  • 0c070e5710 Merge commit 'f5b9d3f0a9df756ddee8322eab1cdb4581044f8c' Darth Vader 2024-08-29 19:01:30 +00:00
  • f5b9d3f0a9 Squashed 'phreeqc3-examples/' changes from 2d7d1bca..4a0d366e Darth Vader 2024-08-29 19:01:30 +00:00
  • 0db9072455 Merge commit 'e4059956a82bb8d8d18ea3ce31ae39265af80e8e' Darth Vader 2024-08-29 19:01:22 +00:00
  • e4059956a8 Squashed 'phreeqc3-doc/' changes from cfaa0d9a..ca3ebafd Darth Vader 2024-08-29 19:01:22 +00:00
  • bd1cbceb2c Merge branch 'ml/kinetic-names' into 'poet' Max Lübke 2024-08-29 08:46:47 +02:00
  • 48e65d87ad refactor: Comment out unused code in KineticWrapper::names(), leading to doubling of names Max Lübke 2024-08-29 08:25:14 +02:00
  • 4a0d366eef Updated examples with latest viscosity branch Charlton, Scott R 2024-08-28 16:10:03 -06:00
  • ca3ebafda0 updated release.txt with Tony's viscosity updates. Updated EDL Basic function documentation in HTML. David Parkhurst 2024-08-27 14:50:58 -06:00
  • fead98ad38 Merge branch 'ml/fix-cpp-standard' into 'poet' Max Lübke 2024-08-26 11:22:51 +02:00
  • 674ac498a9 Set C++23 standard for IPhreeqcPOET target Max Luebke 2024-08-26 11:19:58 +02:00
  • 3b69596c77 Added Kinec_v3.ascii to DBS Charlton, Scott R 2024-08-23 13:08:50 -06:00
  • bd62c44578 Added Kinec_v3.dat to CRAN dist Charlton, Scott R. 2024-08-23 11:50:42 -06:00
  • e628a74d08 Merge commit '13380db01c7c73a17b38710d840593fe1d9918bc' Darth Vader 2024-08-22 23:33:44 +00:00
  • 13380db01c Squashed 'database/' changes from c51839c6..5146dd68 Darth Vader 2024-08-22 23:33:43 +00:00
  • edbb05ae8f Merge commit '48526b35940255d9bf1e87e3d738d88182fa783e' Darth Vader 2024-08-22 23:33:40 +00:00
  • 48526b3594 Squashed 'phreeqc3-doc/' changes from 162c3a25..cfaa0d9a Darth Vader 2024-08-22 23:33:39 +00:00
  • 5146dd686e Added Kinec_v3.dat to distribution Updated RELEASE.TXT for IPhreeqc Charlton, Scott R 2024-08-22 17:10:38 -06:00
  • cfaa0d9ad1 Added Kinec_v3.dat to distribution Updated RELEASE.TXT for IPhreeqc Charlton, Scott R 2024-08-22 17:10:38 -06:00
  • f7a1be4e54 Merge commit 'e9b2c29221ea97c7fbab9fdfced5fed601ea2e0f' Darth Vader 2024-08-22 21:43:27 +00:00
  • afb2c0a6d6 Merge commit 'e9b2c29221ea97c7fbab9fdfced5fed601ea2e0f' Darth Vader 2024-08-22 21:43:27 +00:00
  • e9b2c29221 Squashed 'examples/com/' changes from 3ed6cb65..af8d7af7 Darth Vader 2024-08-22 21:43:27 +00:00
  • b98a65380b Kinec_v3.dat should replace kinec.v2.dat David Parkhurst 2024-08-22 09:22:31 -06:00
  • 7f831e87e5 Updated RELEASE.TXT David Parkhurst 2024-08-22 07:24:30 -06:00
  • 79cc7201cf
         Merge pull request #58 from scharlton2/54-fetchcontent_populate-is-deprecated-in-cmake-build Charlton, Scott R. 2024-08-16 18:08:24 -06:00
  • af8d7af7fb Closes https://github.com/usgs-coupled/iphreeqccom/issues/6 Charlton, Scott R 2024-08-16 17:00:21 -06:00
  • 124e384237 Closes #54 Charlton, Scott R. 2024-08-15 11:51:24 -06:00
  • aa8cdd0113 Merge commit 'd7222e4f0b773e52ff448f83ba057ec492471ea1' Darth Vader 2024-08-15 17:09:45 +00:00
  • a24adae4fc Merge commit 'd7222e4f0b773e52ff448f83ba057ec492471ea1' Darth Vader 2024-08-15 17:09:45 +00:00
  • d7222e4f0b Squashed 'src/' changes from 2bcb24a8..f627828f Darth Vader 2024-08-15 17:09:44 +00:00
  • f627828fb5 Merge commit 'c1c1f286b61ca73ae3204c7fa4831bb2e3066070' Darth Vader 2024-08-15 17:08:49 +00:00
  • c1c1f286b6 Squashed 'phreeqcpp/' changes from b6a23a2..faf8144 Darth Vader 2024-08-15 17:08:49 +00:00
  • 62ebb6ad11 Merge remote-tracking branch 'usgs-coupled/master' Charlton, Scott R. 2024-08-15 11:04:30 -06:00
  • a6e10bbb26 Merge remote-tracking branch 'usgs-coupled/master' Charlton, Scott R. 2024-08-15 11:04:30 -06:00
  • d051e14c0b Merge remote-tracking branch 'usgs-coupled/master' Charlton, Scott R 2024-08-15 11:04:30 -06:00
  • 1e41b0ca7a 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57) Charlton, Scott R. 2024-08-15 10:12:44 -06:00
  • 9e2e1561be
         50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57) Charlton, Scott R. 2024-08-15 10:12:44 -06:00
  • 7ad5a592a7 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57) Charlton, Scott R 2024-08-15 10:12:44 -06:00
  • c95b758d4c
         Merge pull request #56 from scharlton2/51-iphreeqc_no_fortran_module-is-not-tested-in-github-actions Charlton, Scott R. 2024-08-14 15:45:58 -06:00
  • 48ea6ea0ea Merge commit '2d96a188772ef1fd12575913362d1fa01f198be8' Darth Vader 2024-08-14 21:45:07 +00:00
  • 950d47e884 Merge commit '2d96a188772ef1fd12575913362d1fa01f198be8' Darth Vader 2024-08-14 21:45:07 +00:00
  • 2d96a18877 Squashed 'src/' changes from 178b05c2..2bcb24a8 Darth Vader 2024-08-14 21:45:07 +00:00
  • 2bcb24a86a Merge commit '88d5ec20353fab67149768c11765c3c248ee0cea' Darth Vader 2024-08-14 21:44:26 +00:00
  • 88d5ec2035 Squashed 'phreeqcpp/' changes from 587223f..b6a23a2 Darth Vader 2024-08-14 21:44:26 +00:00
  • 767f32d819
         Fixed build_shared_libs syntax Charlton, Scott R. 2024-08-14 15:08:34 -06:00
  • 5e2ca7ad53 Combined test-clang with test-shared-clang using matrix Charlton, Scott R. 2024-08-14 14:11:04 -06:00
  • 99e8a5271b Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran Charlton, Scott R. 2024-08-14 13:49:05 -06:00
  • 6fccc02306
         Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran Charlton, Scott R. 2024-08-14 13:49:05 -06:00
  • d3b4b10b79 Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran Charlton, Scott R 2024-08-14 13:49:05 -06:00
  • 74ab782d6c Added IPHREEQC_ENABLE_MODULE to matrix for test-clang Charlton, Scott R. 2024-08-14 13:11:05 -06:00
  • 53da1be2cf
         Merge pull request #49 from SpaceIm/fix/global-structure-incomplete-def Charlton, Scott R. 2024-08-14 12:19:30 -06:00
  • e86f5476a5 Replaced cmake with ctest Charlton, Scott R. 2024-08-14 11:42:38 -06:00
  • 27b079a467 Merge remote-tracking branch 'origin/master' into fix/global-structure-incomplete-def - Upstream merge necessary to rerun pull-request with updated github actions Charlton, Scott R. 2024-08-14 11:29:16 -06:00
  • befffd4ddc
         Merge pull request #53 from scharlton2/52-add-clang-test-builds Charlton, Scott R. 2024-08-14 10:38:46 -06:00
  • 2ecaf72fcd
         Added test-clang and test-shared-clang jobs Charlton, Scott R. 2024-08-13 15:02:09 -06:00
  • 29f1d4098e reorder classes in global_structures.h to avoid incomplete definitions SpaceIm 2024-08-11 21:08:04 +02:00
  • 128b7a1109 reorder classes in global_structures.h to avoid incomplete definitions SpaceIm 2024-08-11 21:08:04 +02:00
  • c43753da18 reorder classes in global_structures.h to avoid incomplete definitions SpaceIm 2024-08-11 21:08:04 +02:00
  • c244641700 add missing include of stddef.h in IPhreeqc.h if no fortran module SpaceIm 2024-08-11 20:55:26 +02:00
  • 0ab4bf1143 add missing include of stddef.h in IPhreeqc.h if no fortran module SpaceIm 2024-08-11 20:55:26 +02:00
  • 8bf2d2989c add missing include of stddef.h in IPhreeqc.h if no fortran module SpaceIm 2024-08-11 20:55:26 +02:00
  • 09b09c7253 Set _WINDLL when WIN32 and BUIDL_SHARED_LIBS Charlton, Scott R. 2024-08-02 17:17:27 -06:00
  • cf53497505 Modified to build gtest statically Charlton, Scott R. 2024-08-02 16:38:08 -06:00
  • 44c7f133e7 Added test-shared (expected to fail) Charlton, Scott R. 2024-08-02 16:22:53 -06:00
  • e63b635632 Merge commit '875145cc20dbdbaca30a21c2d0a89f0200a03deb' Darth Vader 2024-07-11 19:14:29 +00:00
  • 875145cc20 Squashed 'phreeqc3-doc/' changes from e87a48a2..162c3a25 Darth Vader 2024-07-11 19:14:29 +00:00
  • 162c3a25ad Added to Release.txt about dump issue. David Parkhurst 2024-07-11 12:57:59 -06:00
  • 4c58a0f6b7 Merge commit '7c714dfbd3c917247c9c9346799bb3fa1b9dee16' Darth Vader 2024-07-11 17:09:41 +00:00
  • 8d1cd72089 Merge commit '7c714dfbd3c917247c9c9346799bb3fa1b9dee16' Darth Vader 2024-07-11 17:09:41 +00:00
  • 7c714dfbd3 Squashed 'src/' changes from 0da302ae..178b05c2 Darth Vader 2024-07-11 17:09:41 +00:00
  • 178b05c251 Merge commit '9a4caf7def182e3f6aa3caa5024c7af821663b65' Darth Vader 2024-07-11 17:08:34 +00:00
  • 9a4caf7def Squashed 'phreeqcpp/' changes from e4c4cf3..587223f Darth Vader 2024-07-11 17:08:34 +00:00
  • 63940ac188 Merge commit '3a070775e2706970e4b15fbfee94b8926e75a846' Darth Vader 2024-06-25 19:35:20 +00:00
  • 3a070775e2 Squashed 'database/' changes from 307253d3..c51839c6 Darth Vader 2024-06-25 19:35:20 +00:00
  • 95fe648c91 Merge commit '43b0c8675579aa8e041d6a5768a2d5c2e01c4cfa' Darth Vader 2024-06-25 19:35:12 +00:00
  • 43b0c86755 Squashed 'phreeqc3-doc/' changes from 92562d5d..e87a48a2 Darth Vader 2024-06-25 19:35:12 +00:00
  • e87a48a234 Fixed unprintable characters in RELEASE.TXT David Parkhurst 2024-06-24 15:12:48 -06:00
  • c51839c622 Changed back to AmmH David Parkhurst 2024-06-23 15:59:17 -06:00
  • fe87dc05f0 [iphreeqc] Closes #43 - missing phreeqc.dat.90a6449 Charlton, Scott R 2024-06-21 10:33:44 -06:00
  • 4a1b0494fe Merge commit 'ca69fc331449ba700946bc66e17955d45f2dea59' Darth Vader 2024-06-20 21:53:24 +00:00
  • ca69fc3314 Squashed 'database/' changes from b5394351..307253d3 Darth Vader 2024-06-20 21:53:24 +00:00
  • 78f374b831 Merge commit '0e2456f051d9e2ad6f61f899721fa8ab2db1a30c' Darth Vader 2024-06-20 21:53:22 +00:00
  • fcc8cb7f49 Merge commit '0e2456f051d9e2ad6f61f899721fa8ab2db1a30c' Darth Vader 2024-06-20 21:53:22 +00:00
  • 0e2456f051 Squashed 'src/' changes from 1a84cced..0da302ae Darth Vader 2024-06-20 21:53:21 +00:00
  • 0da302aedf Merge commit '2abb0b0bcd4bcae42f84ff001aba7f2ab6df2af7' Darth Vader 2024-06-20 21:52:29 +00:00
  • 2abb0b0bcd Squashed 'phreeqcpp/' changes from 798f8f9..e4c4cf3 Darth Vader 2024-06-20 21:52:29 +00:00
  • 307253d3f9 Fixed AmmH in Amm.dat and comments in phreeqc.dat and phreeqc_rates.dat David Parkhurst 2024-06-19 16:46:48 -06:00
  • 55c337c429 Working on CRAN submission Charlton, Scott R 2024-06-11 13:23:55 -06:00