diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab5a2871..9506faeb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,10 +11,14 @@ jobs: with: submodules: recursive - run: sudo apt update - - run: sudo apt install build-essential cmake libblas-dev liblapack-dev python3-dev python3-networkx python3-numpy python3-scipy python3-matplotlib python3-nose2 + - run: sudo apt install build-essential cmake libblas-dev liblapack-dev + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - run: pip install numpy scipy matplotlib nose2 networkx - run: cmake -D CMAKE_BUILD_TYPE=${{ matrix.btype }} -D WRAP_PYTHON=ON . - run: make -j 2 - - run: nose2-3 --output-buffer + - run: nose2 test-base-linux: runs-on: ubuntu-latest strategy: @@ -40,11 +44,14 @@ jobs: with: submodules: recursive - run: brew update - - run: brew install cmake openblas superlu python 1>/dev/null || true - - run: pip3 install --user networkx numpy scipy matplotlib nose2 + - run: brew install cmake openblas superlu 1>/dev/null || true + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + - run: pip3 install networkx numpy scipy matplotlib nose2 - run: cmake -D CMAKE_BUILD_TYPE=${{ matrix.btype }} -D WRAP_PYTHON=ON -D PYTHON_EXECUTABLE=$(python3-config --prefix)/bin/python3.11 -D PYTHON_LIBRARY=$(python3-config --prefix)/lib/libpython3.11.dylib -D PYTHON_INCLUDE_DIR=$(python3-config --prefix)/include/python3.11 -D USE_OPENMP=OFF . - run: make -j 2 - - run: ~/Library/Python/3.11/bin/nose2 --output-buffer + - run: nose2 --output-buffer test-base-mac: runs-on: macos-latest strategy: diff --git a/src/cp/hucocks.cxx b/src/cp/hucocks.cxx index 29c474dc..da6b4aed 100644 --- a/src/cp/hucocks.cxx +++ b/src/cp/hucocks.cxx @@ -458,11 +458,6 @@ double HuCocksPrecipitationModel::dG_df(double f, double T) const dc_eff += a; } - // Get the effective equilibrium concentration - double ceq_eff = 1; - for (auto ci : ceq_) - ceq_eff *= ci->value(T); - return -kboltz_ * T / vm_ * dc_eff / c_eff; }