Skip to content

Commit

Permalink
Merge commit 'cbde10904ca944f8653bfd9021a87660236c4ba2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Darth Vader committed Jan 3, 2025
2 parents bc33455 + cbde109 commit 4a7efb7
Show file tree
Hide file tree
Showing 17 changed files with 11 additions and 7,450 deletions.
8 changes: 6 additions & 2 deletions src/phast/PhreeqcRM/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ jobs:
valgrind:
# if: ${{ false }}
name: valgrind
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -349,7 +353,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-13, ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022]
os: [macos-13, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022]
build_shared_libs: [OFF, ON]
phreeqcrm_with_yaml_cpp: [OFF, ON]
BUILD_TYPE: [Debug, Release]
Expand Down
4 changes: 0 additions & 4 deletions src/phast/PhreeqcRM/.gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
[submodule "pybind/pybind11"]
path = pybind/pybind11
url = https://github.com/pybind/pybind11.git
branch = stable
5 changes: 5 additions & 0 deletions src/phast/PhreeqcRM/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# PhreeqcRM: A reaction module for transport simulators based on the geochemical model PHREEQC

![PyPI - Version](https://img.shields.io/pypi/v/phreeqcrm)
![Conda Version](https://img.shields.io/conda/v/conda-forge/phreeqcrm)
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/phreeqcrm)


Reaction module for reactive-transport simulators. Based on IPhreeqc, allows access to all PHREEQC reaction capabilities. Contains methods for initial and boundary conditions, running reactions on all model cells, transfer of data to and from the module, and parallelization by MPI or OpenMP.

This is the development repository for PhreeqcRM. The official USGS distribution is available at [USGS Release Page](https://www.usgs.gov/software/phreeqc-version-3).
Expand Down
230 changes: 0 additions & 230 deletions src/phast/PhreeqcRM/pybind/CMakeLists.txt

This file was deleted.

124 changes: 0 additions & 124 deletions src/phast/PhreeqcRM/pybind/docstrings.h

This file was deleted.

Loading

0 comments on commit 4a7efb7

Please sign in to comment.