Skip to content

Commit 4a7efb7

Browse files
author
Darth Vader
committed
Merge commit 'cbde10904ca944f8653bfd9021a87660236c4ba2'
2 parents bc33455 + cbde109 commit 4a7efb7

17 files changed

+11
-7450
lines changed

src/phast/PhreeqcRM/.github/workflows/ci.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ jobs:
130130
valgrind:
131131
# if: ${{ false }}
132132
name: valgrind
133-
runs-on: ubuntu-latest
133+
strategy:
134+
fail-fast: false
135+
matrix:
136+
os: [ubuntu-24.04, ubuntu-22.04]
137+
runs-on: ${{ matrix.os }}
134138
steps:
135139
- uses: actions/checkout@v4
136140

@@ -349,7 +353,7 @@ jobs:
349353
strategy:
350354
fail-fast: false
351355
matrix:
352-
os: [macos-13, ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022]
356+
os: [macos-13, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022]
353357
build_shared_libs: [OFF, ON]
354358
phreeqcrm_with_yaml_cpp: [OFF, ON]
355359
BUILD_TYPE: [Debug, Release]

src/phast/PhreeqcRM/.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "pybind/pybind11"]
2-
path = pybind/pybind11
3-
url = https://github.com/pybind/pybind11.git
4-
branch = stable

src/phast/PhreeqcRM/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# PhreeqcRM: A reaction module for transport simulators based on the geochemical model PHREEQC
22

3+
![PyPI - Version](https://img.shields.io/pypi/v/phreeqcrm)
4+
![Conda Version](https://img.shields.io/conda/v/conda-forge/phreeqcrm)
5+
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/phreeqcrm)
6+
7+
38
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.
49

510
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).

src/phast/PhreeqcRM/pybind/CMakeLists.txt

-230
This file was deleted.

src/phast/PhreeqcRM/pybind/docstrings.h

-124
This file was deleted.

0 commit comments

Comments
 (0)