From f068ff46629368fb0dce758e0d7a5dbaaada667b Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Mon, 4 May 2026 16:15:45 +0200 Subject: [PATCH 1/6] Update project version from 4.5.3 to 4.5.4 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38abcf20..01996219 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.4 LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) From b565600ee2028da427a7b05fb8f9a60ba07a9cfe Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Thu, 14 May 2026 15:30:06 +0200 Subject: [PATCH 2/6] Change hardcoded value check to preprocessor directive Replaced hardcoded value check with preprocessor directive for conditional compilation. --- GEMS3K/ipm_main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GEMS3K/ipm_main.cpp b/GEMS3K/ipm_main.cpp index 325f2954..e2ee966b 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 + #} } } From c2a27f9d2102a6112a51e5b1ef2d2334dfa3da45 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Thu, 14 May 2026 15:32:40 +0200 Subject: [PATCH 3/6] Update project version to 4.5.5 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01996219..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.4 LANGUAGES CXX C) +project(GEMS3K VERSION 4.5.5 LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) From 3d63e06d1382990e491e3d0be12eb29da73a6b59 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Thu, 14 May 2026 15:35:38 +0200 Subject: [PATCH 4/6] Remove hardcoded value check from ipm_main.cpp Commented out code that checks for hardcoded value in pm.B[II]. --- GEMS3K/ipm_main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GEMS3K/ipm_main.cpp b/GEMS3K/ipm_main.cpp index e2ee966b..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 + //} } } From 7d85aa1a6d66aa7e851fbaad009800792ada705c Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sat, 16 May 2026 13:27:25 +0200 Subject: [PATCH 5/6] back to conda-devenv Updated Conda setup in CI workflow to use version 3 and modified activation settings. Adjusted environment configuration commands for better compatibility. --- .github/workflows/ci-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 26b93aa4..7304599c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -36,18 +36,18 @@ jobs: uses: actions/checkout@v4 - name: Setup Conda - uses: conda-incubator/setup-miniconda@v4 + uses: conda-incubator/setup-miniconda@v3 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' From fe4d605f9ee972c947a3be4a104f8535dc60ba7d Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sat, 16 May 2026 13:33:36 +0200 Subject: [PATCH 6/6] Update Miniconda setup action to version 4 --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7304599c..f90350a2 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -36,7 +36,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Conda - uses: conda-incubator/setup-miniconda@v3 + uses: conda-incubator/setup-miniconda@v4 with: auto-activate: false activate-environment: base