From 5f08d7f4f33736454c0722f12baff8895ca793d0 Mon Sep 17 00:00:00 2001 From: Mark Messner Date: Wed, 11 Jan 2023 16:07:18 -0600 Subject: [PATCH] Correct test error --- .github/workflows/test.yml | 7 ++++--- src/cp/hucocks.cxx | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab5a2871..ae0026af 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - btype: [Release, Debug] + btype: [Release] steps: - uses: actions/checkout@v2 with: @@ -14,7 +14,7 @@ jobs: - run: sudo apt install build-essential cmake libblas-dev liblapack-dev python3-dev python3-networkx python3-numpy python3-scipy python3-matplotlib python3-nose2 - run: cmake -D CMAKE_BUILD_TYPE=${{ matrix.btype }} -D WRAP_PYTHON=ON . - run: make -j 2 - - run: nose2-3 --output-buffer + - run: nose2-3 test-base-linux: runs-on: ubuntu-latest strategy: @@ -44,7 +44,8 @@ jobs: - run: pip3 install --user 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: which nose2 + - 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; }