diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 26b93aa4..f90350a2 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -38,16 +38,16 @@ jobs: - name: Setup Conda uses: conda-incubator/setup-miniconda@v4 with: - auto-activate: true + auto-activate: false + activate-environment: base channels: conda-forge - name: Configuring Conda Environment - shell: bash -l {0} run: | conda config --set always_yes yes --set changeps1 no conda config --add channels conda-forge - conda clean -a -y - conda env create -f environment.devenv.yml -n GEMS3K + conda install conda-devenv + conda run -n base python -m conda_devenv - name: Building, Testing & Installing GEMS3K if: matrix.os != 'windows-latest' diff --git a/CMakeLists.txt b/CMakeLists.txt index 38abcf20..0b5051ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16..4.2) # Set the name of the project -project(GEMS3K VERSION 4.5.3 LANGUAGES CXX C) +project(GEMS3K VERSION 4.5.5 LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/GEMS3K/ipm_main.cpp b/GEMS3K/ipm_main.cpp index 325f2954..37ac9d97 100644 --- a/GEMS3K/ipm_main.cpp +++ b/GEMS3K/ipm_main.cpp @@ -875,11 +875,11 @@ long int TMultiBase::MassBalanceRefinement( long int WhereCalledFrom ) degenerate_cause = true; } - if( pm.B[II] < 1e-15 ) // need to remove hardcoded value - { - gems_logger->warn("MBR({}): B[{}]={:.3e}", WhereCalledFrom, II, pm.B[II]); - iRet = 0; // treat as degenerate but not physically negligible, to avoid triggering AIA fallback - } + //if( pm.B[II] < 1e-15 ) // need to remove hardcoded value + //{ + // gems_logger->warn("MBR({}): B[{}]={:.3e}", WhereCalledFrom, II, pm.B[II]); + // iRet = 0; // treat as degenerate but not physically negligible, to avoid triggering AIA fallback + //} } }