Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions GEMS3K/ipm_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
//}
}
}

Expand Down