From df835016bf0e701662d6386a2d48c63cb8bc3998 Mon Sep 17 00:00:00 2001 From: svetad Date: Fri, 13 Feb 2026 14:20:40 +0200 Subject: [PATCH 01/28] Try with macos-14 --- .github/workflows/deploy-macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index a6484879..ad99d90e 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -3,7 +3,7 @@ name: deploy-macos on: push: branches: - - LESTO_project + - test_arm release: types: - published @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-latest ] + os: [ macos-14 ] conda_platform: [ osx-arm64 ] artifact_name: [ gemsgui-macos ] From d67e5fd7734a258da1f049d49fda90604c5a4e07 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 07:45:04 +0100 Subject: [PATCH 02/28] Update macOS deployment to use arm64 architecture --- .github/workflows/deploy-macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index ad99d90e..a223b0ab 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-14 ] + os: [ macos-14-arm64 ] conda_platform: [ osx-arm64 ] artifact_name: [ gemsgui-macos ] @@ -73,6 +73,7 @@ jobs: mkdir .build && cd .build cmake -GNinja .. \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_INSTALL_PREFIX=${{ steps.strings2.outputs.deploy-output-dir }} ninja ninja install From f0c2ab483a4be80f4302953f54995af31e9e52c8 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 09:25:32 +0100 Subject: [PATCH 03/28] Change macOS runner to macos-14 from macos-14-arm64 --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index a223b0ab..56230a15 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-14-arm64 ] + os: [ macos-14 ] # arm64 runner by default conda_platform: [ osx-arm64 ] artifact_name: [ gemsgui-macos ] From 740dd14d5ccf8b8e3f244e4bca95ebaef0ed65d6 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 09:34:39 +0100 Subject: [PATCH 04/28] Fix formatting in deploy-macos.yml for CMake command --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 56230a15..d9636149 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -73,7 +73,7 @@ jobs: mkdir .build && cd .build cmake -GNinja .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_ARCHITECTURES=arm64 + -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_INSTALL_PREFIX=${{ steps.strings2.outputs.deploy-output-dir }} ninja ninja install From 03382bfb03f7faf5fe371780d6ce87c53a5666ed Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 10:10:03 +0100 Subject: [PATCH 05/28] Add ARM64 verification and smoke test for GEMSGUI Added verification and smoke test for ARM64 architecture in the deployment workflow. --- .github/workflows/deploy-macos.yml | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index d9636149..9e47553a 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -78,6 +78,42 @@ jobs: ninja ninja install +# ------------------------- + # Verify architecture + smoke test GUI app + # ------------------------- + - name: Verify runner architecture + run: | + echo "uname -m:" + uname -m + echo "RUNNER_ARCH:" + echo "$RUNNER_ARCH" + echo "CPU brand:" + sysctl -n machdep.cpu.brand_string + + echo "Compiler target:" + clang -v 2>&1 | grep Target + + echo "If uname -m != arm64, fail." + if [ "$(uname -m)" != "arm64" ]; then + echo "ERROR: Not running on ARM64 runner" + exit 1 + fi + + - name: Smoke test GEMSGUI binary + run: | + APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" + + echo "Checking that app binary exists:" + ls -l "$APP" + + echo "Running smoke test:" + "$APP" --version || { + echo "ERROR: GEMSGUI failed to run" + exit 1 + } + + echo "Smoke test passed: GEMSGUI launches on ARM64" + # ------------------------- # Post-install adjustments # ------------------------- From 05acb6a1ebb64eebb2eda958888a18322c08d05c Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 10:28:14 +0100 Subject: [PATCH 06/28] -d flag --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 9e47553a..5c628742 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -107,7 +107,7 @@ jobs: ls -l "$APP" echo "Running smoke test:" - "$APP" --version || { + "$APP" -d || { echo "ERROR: GEMSGUI failed to run" exit 1 } From 084ee6f14f2a3c32a9dd5d70cd518c35e3789d1e Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 10:59:53 +0100 Subject: [PATCH 07/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 5c628742..fb93a2a5 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -105,13 +105,12 @@ jobs: echo "Checking that app binary exists:" ls -l "$APP" - - echo "Running smoke test:" - "$APP" -d || { - echo "ERROR: GEMSGUI failed to run" - exit 1 - } - + # + # echo "Running smoke test:" + # "$APP" -d || { + # echo "ERROR: GEMSGUI failed to run" + # exit 1 + # } echo "Smoke test passed: GEMSGUI launches on ARM64" # ------------------------- From 58ed4380301c9ce148dc2301019fb9cf3c6b09fe Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 11:06:50 +0100 Subject: [PATCH 08/28] Disable smoke test for GEMSGUI in deploy-macos.yml Commented out the smoke test section for GEMSGUI in the deployment workflow. --- .github/workflows/deploy-macos.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index fb93a2a5..c1c98319 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -105,14 +105,16 @@ jobs: echo "Checking that app binary exists:" ls -l "$APP" - # - # echo "Running smoke test:" - # "$APP" -d || { - # echo "ERROR: GEMSGUI failed to run" - # exit 1 - # } + echo "Smoke test passed: GEMSGUI launches on ARM64" + # + # echo "Running smoke test:" + # "$APP" -d || { + # echo "ERROR: GEMSGUI failed to run" + # exit 1 + # } + # ------------------------- # Post-install adjustments # ------------------------- From e4665f86e33feb4d120346f10df78dfe63e971ec Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 11:18:12 +0100 Subject: [PATCH 09/28] Refactor GEMSGUI smoke test in deploy-macos.yml Updated smoke test for GEMSGUI binary to include user directory. --- .github/workflows/deploy-macos.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index c1c98319..96aad40e 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -102,18 +102,17 @@ jobs: - name: Smoke test GEMSGUI binary run: | APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" - + DIR="${{ steps.strings2.outputs.deploy-output-dir }} echo "Checking that app binary exists:" ls -l "$APP" + + echo "Running smoke test:" + "$APP" -u --user-dir "$DIR" || { + echo "ERROR: GEMSGUI failed to run" + exit 1 + } echo "Smoke test passed: GEMSGUI launches on ARM64" - - # - # echo "Running smoke test:" - # "$APP" -d || { - # echo "ERROR: GEMSGUI failed to run" - # exit 1 - # } # ------------------------- # Post-install adjustments From 21630241ae1be444f7bfe2886b02c881d505840b Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 11:25:37 +0100 Subject: [PATCH 10/28] Fix syntax error in deploy-macos.yml --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 96aad40e..488724bd 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -102,7 +102,7 @@ jobs: - name: Smoke test GEMSGUI binary run: | APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" - DIR="${{ steps.strings2.outputs.deploy-output-dir }} + DIR="${{ steps.strings2.outputs.deploy-output-dir }}" echo "Checking that app binary exists:" ls -l "$APP" From a0333cb7b71dc7ffe0d32092903a3745e246bb2a Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 11:38:08 +0100 Subject: [PATCH 11/28] Update user directory in smoke test command --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 488724bd..09d2278f 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -107,7 +107,7 @@ jobs: ls -l "$APP" echo "Running smoke test:" - "$APP" -u --user-dir "$DIR" || { + "$APP" -u --user-dir /Users/runner/work || { echo "ERROR: GEMSGUI failed to run" exit 1 } From 30e2c45d7fd6ce2c2de43eb674446e9eaf0324ac Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 12:52:37 +0100 Subject: [PATCH 12/28] Add smoke test for GEMSGUI in deploy workflow Added a smoke test for GEMSGUI to verify functionality after deployment. --- .github/workflows/deploy-macos.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 09d2278f..feb8f574 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -77,7 +77,18 @@ jobs: -DCMAKE_INSTALL_PREFIX=${{ steps.strings2.outputs.deploy-output-dir }} ninja ninja install + - name: Smoke test GEMSGUI + run: | + APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" + + echo "Running smoke test:" + mkdir -p "$HOME/gems-user-dir" + "$APP" -d --user-dir="$HOME/gems-user-dir" || { + echo "ERROR: GEMSGUI failed to run" + exit 1 + } + echo "Smoke test passed" # ------------------------- # Verify architecture + smoke test GUI app # ------------------------- @@ -100,20 +111,7 @@ jobs: fi - name: Smoke test GEMSGUI binary - run: | - APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" - DIR="${{ steps.strings2.outputs.deploy-output-dir }}" - echo "Checking that app binary exists:" - ls -l "$APP" - - echo "Running smoke test:" - "$APP" -u --user-dir /Users/runner/work || { - echo "ERROR: GEMSGUI failed to run" - exit 1 - } - - echo "Smoke test passed: GEMSGUI launches on ARM64" - + # ------------------------- # Post-install adjustments # ------------------------- From 706f0da5fc6bde2e43055fae4e8cee7aa6f6d714 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 13:06:21 +0100 Subject: [PATCH 13/28] Refactor smoke test for GEMSGUI Removed duplicate smoke test commands and streamlined the process. --- .github/workflows/deploy-macos.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index feb8f574..519f1cb9 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -79,16 +79,15 @@ jobs: ninja install - name: Smoke test GEMSGUI run: | - APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" - - echo "Running smoke test:" - mkdir -p "$HOME/gems-user-dir" - "$APP" -d --user-dir="$HOME/gems-user-dir" || { - echo "ERROR: GEMSGUI failed to run" - exit 1 - } - - echo "Smoke test passed" + APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" + echo "Running smoke test:" + mkdir -p "$HOME/gems-user-dir" + "$APP" -d --user-dir="$HOME/gems-user-dir" || { + echo "ERROR: GEMSGUI failed to run" + exit 1 + } + + echo "Smoke test passed" # ------------------------- # Verify architecture + smoke test GUI app # ------------------------- From 5993350bf084cda0aae8243678f3161e72d4e540 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 13:25:21 +0100 Subject: [PATCH 14/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 519f1cb9..ab88d95c 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -77,17 +77,7 @@ jobs: -DCMAKE_INSTALL_PREFIX=${{ steps.strings2.outputs.deploy-output-dir }} ninja ninja install - - name: Smoke test GEMSGUI - run: | - APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" - echo "Running smoke test:" - mkdir -p "$HOME/gems-user-dir" - "$APP" -d --user-dir="$HOME/gems-user-dir" || { - echo "ERROR: GEMSGUI failed to run" - exit 1 - } - echo "Smoke test passed" # ------------------------- # Verify architecture + smoke test GUI app # ------------------------- @@ -109,7 +99,18 @@ jobs: exit 1 fi - - name: Smoke test GEMSGUI binary + - name: Smoke test GEMSGUI + run: | + APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" + + echo "Running smoke test:" + mkdir -p "$HOME/gems-user-dir" + "$APP" -d --user-dir="$HOME/gems-user-dir" || { + echo "ERROR: GEMSGUI failed to run" + exit 1 + } + + echo "Smoke test passed" # ------------------------- # Post-install adjustments From 02fde99ca4b7fd7aa3110a23918b034225641b01 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 13:30:42 +0100 Subject: [PATCH 15/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index ab88d95c..eeb4dba2 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -105,7 +105,7 @@ jobs: echo "Running smoke test:" mkdir -p "$HOME/gems-user-dir" - "$APP" -d --user-dir="$HOME/gems-user-dir" || { + "$APP" -u --user-dir "$HOME/gems-user-dir" || { echo "ERROR: GEMSGUI failed to run" exit 1 } From a4d49e650515a613ee0b9f95cdbd274e44954392 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 13:44:08 +0100 Subject: [PATCH 16/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index eeb4dba2..faa05dc9 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -105,7 +105,7 @@ jobs: echo "Running smoke test:" mkdir -p "$HOME/gems-user-dir" - "$APP" -u --user-dir "$HOME/gems-user-dir" || { + "$APP" -u "$HOME/gems-user-dir" || { echo "ERROR: GEMSGUI failed to run" exit 1 } From 7682096995aa85477398e50ff6a4f586352b8749 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 13:54:34 +0100 Subject: [PATCH 17/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index faa05dc9..77bf92cb 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -78,6 +78,17 @@ jobs: ninja ninja install + + # ------------------------- + # Post-install adjustments + # ------------------------- + - name: Check deploy + run: | + cd ${{ github.workspace }} + cp -r "Resources" "${{ steps.strings.outputs.deploy-name }}/gem-selektor.app/Contents" + cp "Resources/rungems3-mac.sh" "${{ steps.strings.outputs.deploy-name }}/rungems3.sh" + cp "Resources/README-macos.txt" "${{ steps.strings.outputs.deploy-name }}/README.txt" + # ------------------------- # Verify architecture + smoke test GUI app # ------------------------- @@ -112,15 +123,6 @@ jobs: echo "Smoke test passed" - # ------------------------- - # Post-install adjustments - # ------------------------- - - name: Check deploy - run: | - cd ${{ github.workspace }} - cp -r "Resources" "${{ steps.strings.outputs.deploy-name }}/gem-selektor.app/Contents" - cp "Resources/rungems3-mac.sh" "${{ steps.strings.outputs.deploy-name }}/rungems3.sh" - cp "Resources/README-macos.txt" "${{ steps.strings.outputs.deploy-name }}/README.txt" # ------------------------- # ZIP packaging From ee6af774320cd3627ddfc0a94012fd3f0094a321 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 14:11:25 +0100 Subject: [PATCH 18/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 77bf92cb..6495c0ae 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -89,6 +89,9 @@ jobs: cp "Resources/rungems3-mac.sh" "${{ steps.strings.outputs.deploy-name }}/rungems3.sh" cp "Resources/README-macos.txt" "${{ steps.strings.outputs.deploy-name }}/README.txt" + - name: Install timeout tool + run: brew install coreutils + # ------------------------- # Verify architecture + smoke test GUI app # ------------------------- @@ -116,7 +119,7 @@ jobs: echo "Running smoke test:" mkdir -p "$HOME/gems-user-dir" - "$APP" -u "$HOME/gems-user-dir" || { + gtimeout 10 "$APP" -u "$HOME/gems-user-dir" || { echo "ERROR: GEMSGUI failed to run" exit 1 } From 60bfe638ce5d61a82c41551150d5ef5fcec79682 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 14:28:55 +0100 Subject: [PATCH 19/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 6495c0ae..17819eba 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -117,12 +117,20 @@ jobs: run: | APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" - echo "Running smoke test:" - mkdir -p "$HOME/gems-user-dir" - gtimeout 10 "$APP" -u "$HOME/gems-user-dir" || { - echo "ERROR: GEMSGUI failed to run" - exit 1 - } + echo "Running smoke test with timeout:" + set +e + gtimeout 10 "$APP" -u "$HOME/gems-user-dir" + EXIT_CODE=$? + set -e + + if [ "$EXIT_CODE" -eq 0 ]; then + echo "App exited normally (rare but OK)" + elif [ "$EXIT_CODE" -eq 124 ]; then + echo "App timed out (expected for GUI) — smoke test passed" + else + echo "App crashed with exit code $EXIT_CODE" + exit 1 + fi echo "Smoke test passed" From ef443c6ac02ebfb88ba5769341a3587165c1dff1 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sun, 15 Feb 2026 14:34:27 +0100 Subject: [PATCH 20/28] Update deploy-macos.yml --- .github/workflows/deploy-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 17819eba..cf108080 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -120,7 +120,7 @@ jobs: echo "Running smoke test with timeout:" set +e gtimeout 10 "$APP" -u "$HOME/gems-user-dir" - EXIT_CODE=$? + EXIT_CODE=$? set -e if [ "$EXIT_CODE" -eq 0 ]; then From d0626a90c0baf4fd58c6b34ade131da0246fc19d Mon Sep 17 00:00:00 2001 From: svetad Date: Wed, 18 Feb 2026 20:07:48 +0200 Subject: [PATCH 21/28] Recalculate GEMS3K export systems --- .github/workflows/deploy-linux.yml | 2 +- .github/workflows/deploy-macos.yml | 2 +- Modules/gemsgui_version.h | 6 +++--- Modules/m_proces.cpp | 2 ++ Resources/projects/CASHNK/phase.CASHNK.ndx | Bin 2056 -> 2056 bytes Resources/projects/CASHNK/phase.CASHNK.pdb | Bin 125192 -> 125192 bytes Resources/projects/CASHNK/projec.CASHNK.ndx | Bin 118 -> 118 bytes Resources/projects/CASHNK/projec.CASHNK.pdb | Bin 46927 -> 46927 bytes Resources/projects/CASHNK/syseq.CASHNK.ndx | Bin 4148 -> 4148 bytes Resources/projects/CASHNK/syseq.CASHNK.pdb | Bin 383448 -> 388658 bytes .../projects/CalcDolo/phase.CalcDolo.ndx | Bin 460 -> 574 bytes .../projects/CalcDolo/phase.CalcDolo.pdb | Bin 16674 -> 19773 bytes .../projects/CalcDolo/projec.CalcDolo.ndx | Bin 118 -> 118 bytes .../projects/CalcDolo/projec.CalcDolo.pdb | Bin 9749 -> 9749 bytes .../projects/CalcDolo/syseq.CalcDolo.ndx | Bin 329 -> 329 bytes .../projects/CalcDolo/syseq.CalcDolo.pdb | Bin 16794 -> 16794 bytes .../projects/ClaySorMo/phase.ClaySorMo.ndx | Bin 5419 -> 5419 bytes .../projects/ClaySorMo/phase.ClaySorMo.pdb | Bin 133770 -> 133770 bytes .../projects/ClaySorMo/projec.ClaySorMo.ndx | Bin 118 -> 118 bytes .../projects/ClaySorMo/projec.ClaySorMo.pdb | Bin 111071 -> 111071 bytes .../projects/ClaySorMo/syseq.ClaySorMo.ndx | Bin 67195 -> 67195 bytes .../projects/ClaySorMo/syseq.ClaySorMo.pdb | Bin 4792673 -> 4792673 bytes .../projects/Flowline/phase.Flowline.ndx | Bin 1144 -> 1201 bytes .../projects/Flowline/phase.Flowline.pdb | Bin 49766 -> 49766 bytes .../projects/Flowline/projec.Flowline.ndx | Bin 118 -> 118 bytes .../projects/Flowline/projec.Flowline.pdb | Bin 18311 -> 18311 bytes .../projects/Flowline/syseq.Flowline.ndx | Bin 48100 -> 48100 bytes .../projects/Flowline/syseq.Flowline.pdb | Bin 1725825 -> 1730774 bytes .../projects/GEOTHERM/phase.GEOTHERM.ndx | Bin 6445 -> 6445 bytes .../projects/GEOTHERM/phase.GEOTHERM.pdb | Bin 93904 -> 93904 bytes .../projects/GEOTHERM/projec.GEOTHERM.ndx | Bin 118 -> 118 bytes .../projects/GEOTHERM/projec.GEOTHERM.pdb | Bin 46606 -> 46606 bytes .../projects/GEOTHERM/syseq.GEOTHERM.ndx | Bin 530 -> 530 bytes .../projects/GEOTHERM/syseq.GEOTHERM.pdb | Bin 98990 -> 98990 bytes .../projects/Kaolinite/phase.Kaolinite.ndx | Bin 346 -> 460 bytes .../projects/Kaolinite/phase.Kaolinite.pdb | Bin 12045 -> 12045 bytes .../projects/Kaolinite/projec.Kaolinite.ndx | Bin 118 -> 118 bytes .../projects/Kaolinite/projec.Kaolinite.pdb | Bin 15933 -> 15933 bytes .../projects/Kaolinite/syseq.Kaolinite.ndx | Bin 10647 -> 10647 bytes .../projects/Kaolinite/syseq.Kaolinite.pdb | Bin 405818 -> 405818 bytes .../projects/PitzerTHE/phase.PitzerTHE.ndx | Bin 9181 -> 9238 bytes .../projects/PitzerTHE/phase.PitzerTHE.pdb | Bin 208299 -> 208299 bytes .../projects/PitzerTHE/projec.PitzerTHE.ndx | Bin 118 -> 118 bytes .../projects/PitzerTHE/projec.PitzerTHE.pdb | Bin 23495 -> 23495 bytes .../projects/PitzerTHE/syseq.PitzerTHE.ndx | Bin 19290 -> 19290 bytes .../projects/PitzerTHE/syseq.PitzerTHE.pdb | Bin 972976 -> 976085 bytes Resources/projects/Solvus/phase.Solvus.ndx | Bin 1486 -> 1543 bytes Resources/projects/Solvus/phase.Solvus.pdb | Bin 136675 -> 136675 bytes Resources/projects/Solvus/projec.Solvus.ndx | Bin 118 -> 118 bytes Resources/projects/Solvus/projec.Solvus.pdb | Bin 13399 -> 13399 bytes Resources/projects/Solvus/syseq.Solvus.ndx | Bin 932 -> 932 bytes Resources/projects/Solvus/syseq.Solvus.pdb | Bin 62204 -> 65262 bytes .../projects/TestPNTDB/phase.TestPNTDB.ndx | Bin 61 -> 61 bytes .../projects/TestPNTDB/phase.TestPNTDB.pdb | Bin 51203 -> 51203 bytes .../projects/TestPNTDB/projec.TestPNTDB.ndx | Bin 118 -> 118 bytes .../projects/TestPNTDB/projec.TestPNTDB.pdb | Bin 38811 -> 38811 bytes .../projects/TestPNTDB/syseq.TestPNTDB.ndx | Bin 195 -> 195 bytes .../projects/TestPNTDB/syseq.TestPNTDB.pdb | Bin 26665 -> 26665 bytes .../projects/TestSUP98/phase.TestSUP98.ndx | Bin 61 -> 175 bytes .../projects/TestSUP98/phase.TestSUP98.pdb | Bin 30498 -> 30498 bytes .../projects/TestSUP98/projec.TestSUP98.ndx | Bin 118 -> 118 bytes .../projects/TestSUP98/projec.TestSUP98.pdb | Bin 49866 -> 49866 bytes .../projects/TestSUP98/syseq.TestSUP98.ndx | Bin 128 -> 128 bytes .../projects/TestSUP98/syseq.TestSUP98.pdb | Bin 262127 -> 262127 bytes 64 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-linux.yml b/.github/workflows/deploy-linux.yml index 9c757611..55773606 100644 --- a/.github/workflows/deploy-linux.yml +++ b/.github/workflows/deploy-linux.yml @@ -2,7 +2,7 @@ name: deploy-linux on: push: branches: - - process_reset_err + - test_arm release: types: - published diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index ad99d90e..77dbf1f3 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -3,7 +3,7 @@ name: deploy-macos on: push: branches: - - test_arm + - test_arm1 release: types: - published diff --git a/Modules/gemsgui_version.h b/Modules/gemsgui_version.h index d1cf6663..b3d33e51 100644 --- a/Modules/gemsgui_version.h +++ b/Modules/gemsgui_version.h @@ -1,8 +1,8 @@ #pragma once -#define GEMSGUI_VERSION "3.11.0" -#define GEMSGUI_VERSION_HASH "3d18f3e7" -#define GEMSGUI_GIT_BRANCH "LESTO_project" +#define GEMSGUI_VERSION "3.11.1" +#define GEMSGUI_VERSION_HASH "df835016" +#define GEMSGUI_GIT_BRANCH "test_arm" #define GEMSGUI_OSX "Linux" #define GEMSGUI_COMPILER_ID "GNU" #define GEMSGUI_COMPILER_VERSION "13.3.0" diff --git a/Modules/m_proces.cpp b/Modules/m_proces.cpp index 01936cbc..6c7c709d 100644 --- a/Modules/m_proces.cpp +++ b/Modules/m_proces.cpp @@ -1081,6 +1081,7 @@ void TProcess::pe_text_analyze() } } + // calc function for Method of golden section double TProcess::f_proc( double x ) { @@ -1095,6 +1096,7 @@ double TProcess::f_proc( double x ) // PRof->CalcEqstat( &pep->kdt, pep->kst, pep->c_Tau ); // calc current SyStat pep->Loop = 1; CalcEquat(); + gems_logger->trace("golden section {} {}", pep->c_Eh,pep->c_Nu); return( pep->c_Nu ); } diff --git a/Resources/projects/CASHNK/phase.CASHNK.ndx b/Resources/projects/CASHNK/phase.CASHNK.ndx index fb370e5955a7dd093aa7ccc19712d476d2bef61b..5f21eab1d15df9d49ae8a52083ca52ef20137043 100644 GIT binary patch delta 367 zcmeAW=nznFclC9040bg%Ff=eRw6wG|w9q#&(l;_NGGj2bv@$iFs1VA?J+aIJNUR4D zFMz~kMMe-A1tuqh$unS*l?fzn2PVtGiM(eQnEaQS1E>nbQ)7_;vp~8){25^WMivl%BUHb*6eB|?CrCd?1gM{LWh*0t z6*ovEh83hTh7}@yaS9_t7B5Kr99aAuRD9<$n79KQNWB9aM7`k_MuvU-AoZ_-A|SWk p|H#1b8|>ECV3o1#5OJwLF!5M+kO}9Z;*4pG3?JD+CY%R}0|1=tS)c#_ delta 367 zcmeAW=nznFclC9040bg%Ff=eRw6wG|Fx59S)HgCPGG#C{wlX%Gs1VAiJh99INUR4D zFMz~kMMe-A1tuqh$unS*l?fzn2PVtGnbQ)7_;vp~8){25^WMivl%BUHb*6eB|?CrCd?1gM{LWh*0t z6*ovEh83hTh7}@yaS9_t7B5Kr99aAuRD9<$n79KQNWB9aM7`k_MuvU-AoZ_-A|SWk p|H#1b8|>ECV3o1#5OJwLF!5M+kO}9Z;*4pG3?JD+CY%R}0|5EFT-*Qv diff --git a/Resources/projects/CASHNK/phase.CASHNK.pdb b/Resources/projects/CASHNK/phase.CASHNK.pdb index bff4cfcc2dbd7f359e1b4324d36f980c1534bf9c..7990d286f3a9df25d5d280027a0848468142156b 100644 GIT binary patch delta 76 zcmeCU#NKgq!O+sm)O4f5wKdEFf2TJ8 fT(kY>8pd)%5NCSvJ;rvHjHQ#qxBt7x$i)Q!ud5q} delta 75 zcmeCU#NKgy!O+;s*leT1wKdF(&A6L? euG#)`4P&_>h%>$T9%K7t;WHxJ`R+6R;sgM1ml=ux diff --git a/Resources/projects/CASHNK/projec.CASHNK.ndx b/Resources/projects/CASHNK/projec.CASHNK.ndx index 9fc738f641a318b5189e728873c015a9a534f852..732e45cfac5f3b4f56d2e113fa8b77624fae1ff2 100644 GIT binary patch delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHJzvs%E%4?$E673 delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|f)H#F2YGB7e_Ff_I@Hk+sr%E%7@#}f$N diff --git a/Resources/projects/CASHNK/projec.CASHNK.pdb b/Resources/projects/CASHNK/projec.CASHNK.pdb index 4b62d49a9818d27c38071fbb364a10060d9ae41d..3d9be157f98d807556b0f5309f028d2ee37f4208 100644 GIT binary patch delta 52 zcmX^Aj_Le6CIxp_Unj?4S3?6s0~13_OG`rweFGzXBLgEd2183LQ`3zKS6i3`{!ZQe Iqb1x30J1|6?EnA( delta 52 zcmX^Aj_Le6CIxp_Unj?4S3?6s0~13_OG^V&eM3WiBLgE-218>jW3!D4S6i4Dn{jXc I(GqS10If6-BLDyZ diff --git a/Resources/projects/CASHNK/syseq.CASHNK.ndx b/Resources/projects/CASHNK/syseq.CASHNK.ndx index 34e7740f854adc807f5b52ab32053ad81304fed0..7ce274356cbc1c7cfe29f7421338955a1d84be2b 100644 GIT binary patch delta 607 zcmX|;zb^zq6vt<8cW-a3-7Uz;qL@O?k6?H2WI2SmW?8mjP)5BhN4ga*<*rayN%tt|t`Lu6I`F0I(5I%t&XHontcv?L zR7_qF|A^a3nhQ3QnA}cc|Be`F4!kKkpWKsKyM+@6TJ(nVU6qw$2lIi}1XaxmtCke% z3UQzKPCVpv7A$hS<&Z~r9>fawd~l@GfLtS<5r2pyI{H_76Wl26_%gn_ps=!uQ(aL{ zX~aZ{xI?@rep}7ZVf2SRtUe75R*lZOO2LVdsjFJbH8cF_S!FZLcs}l1H=|w}#w>yV m2(Ko-wu@+;cV!5!gRkTdYT(q*;teG+_ z%Sf8Z6lW!Ksf^8HeBRC#dEGuKAky}4m{wTkodVW*$A%X^4SS*}-@gi6SLHZ#hW?rl zbC{?Psu*1QrX8>2!%RhpK}JAb5nMe6cfypTd!%PXboYtP0S)+86qxe|olaAX!G<6A zANetPOZ+3&0yGyK2QXO+VE>6|O9s4)ioALzaB&?cwk7usH+4T(8aSA@r3myS!>LAt zsCS6x#1CRarn6vI##bA(0HJqwV zJu!@l67iJyOzi6;Frm&nJ*>V|399O(r-E>$COkDvnOZ{by!p7D5T1|w4mGzIg}l!2 kAEB$^OZvL&jO+M=uA22KrYro{imHs-Yz$IrQVGgf2;kx7sT=s=3on zy(q1crgA^9mHepp&1hB>u2}NpR7=*?S*99JTW;f+G5wY8edd{Gp6~Phe4o$f^FH%! zmCrBfm~ZVPTI;nUK*ZjRoQMcx&fOXSfv_HeAQ(bm1B5~n z?1N<34?jQ(q(T~;hBJ^0XF&#ea1PEx4cvuVsDpcOAL^k2nxGk!&;qUS2-=_>9>WuO z3M%M^9(V@55FS2CHzaOb(K!q@%#;p(VNXPKGVE}&VmRhVSv-aAhvXn5AF3~>=k>oE z1!Pi(+9NxE7G+(vW?O$+B4ucJ^_8>3GC_Fw2-^<;Xu6q}W|S2ZvuI>18ZzHwlgP6} z$AA3IRp4IYY0|c(uUc({st$(_MQ&oCxKwV}wcm$5mS*f}-<*BMQzp1Dc%nq^S&b*} zD3qy$Xx;Vu+%0+6Jk@Rfc{!53NH|c$slIjyTX^jAfCk}efsL)Hxne|v>in}UyTklZ z@Q(64CAHb(>WtjiGdIO!Nl`m*wk=8U$nTNN+8K8U3v}Q5Fs3ILdmd7pn;R>^E*Oi4 z2Os8n&~481j&@~X17H6l`7=m_;l92@l?B6MEOEE%t;!{QEKj`s5=5-R+8u+pM@DVO z%DkNmpBzlU=9uLy2{nzv2FUgG23hgg$ls?Etyjb&PDRumMQ{qbyx2ByodRRF1DGGg8waLp{$!dGqJ>MfYCf6-qEsbT(wv+qr2Xf1L#V|P@cd#WVfD?%m z>(oL-!bJlMJf-URBBL^n;6{=OS=-!19y^unlIk@|3QH=qYwO>Umn@Yd&$bPcp-0kA ztz#Kc?=%>Hj)*0=-g&rhws|*Ma#Y2dCpDoQE7gM8ZYt7+`{3~I3-**&bN8EqDh>Jg zWWsaD+im3aA<7kNHKx+p-l+_NOQ~&o7qkQ@aWc+wMZSN93FS}pW0G4cvb6e&hCR!k zDpFWAh@%I{=o-HB8>0@={ij`u!kfmFR_IjRo5`hWB5i+l_G!_R0It-tfKopJxK4q- z4(Nmb_PvGgpPiwu`?1D4VCkX7^Ud17Loe5H6^^2fg6gq`7Km62{<(ERv|8Y4F=`#r z!a)tf^5T+mZlw-1$%$>>jd2ORm%&5bPYp)DystP9KFM7j<7O5LhMiBOu zJVk>h>NAsbZoX}QiKCx6X(Ik;!{ouoUhuK`QwiZ8F#3SdRKO?BXY2eJ`^Q9a2>qa3 NKsTom2QD&q{Rag?ytDuS delta 126 zcmV-^0D=Fq+!xrh7a&JPO+rCaMKLfjFf=haIXN&jFEKGMGB7eV05LK;H8+tU838`A zI;#P*?E#PklTZQ(m*7JI1d|@~6O&LD6}Rrw16cu+z(yLApZrpnfOrE!gRlsPum}OS gum}Px)t7*I1O%5oLjxLz`P~AC`P~Dz`P~HH`wnX^DF6Tf diff --git a/Resources/projects/CalcDolo/phase.CalcDolo.ndx b/Resources/projects/CalcDolo/phase.CalcDolo.ndx index 66fda23fae7bbfb0ce71d0625a06d1187d511df9..e4feb9090d5f5211500769e249f756c2bb679de0 100644 GIT binary patch delta 219 zcmX@ZypN^c-PPC0G1%46z|g?N(9+V<&_dt9NZ-i7$c(|z(#q770SGvO*cOOu*%%lY zcQZ0D__H%Ga03Mr6%-U416_SQ9TgN33**yM^MC?SkXWdo;F4IDnOY1JQBY8FWMFUv z>g7lWin%)m`$iaex+tV47NclQ&s9+HOi4}5L1TzJZaxk%5sJgQ2CBsVM^xa00O{5ZAIX zFfi_BWMJ@T-)R2YAz4L*!^V-FfkEK!)JzqXL@UQYS07JDtHi?i^wc~cW#y7smYG^? zr5qQ>!voaD0K#>3E`EN&etwDCxnAULiH`a6jbAUv0Uc3UDyaz~uHdFzoytWZcFNjXW(C_a7)|&uT1v9`m z9U|bHj@m^!kcT>8v#rcu#!0F{jEs{TRfQ)%P!^i}*Xr(OMk%6HxgQ1y~p&UGB7k|Ff_9=u$-t6%E$}=#{US? diff --git a/Resources/projects/CalcDolo/projec.CalcDolo.pdb b/Resources/projects/CalcDolo/projec.CalcDolo.pdb index b1ba5c56f5f724910a9bde6d57f79cb6dba22476..2905fe668b97305a829e1b0d79d141a7033ade9a 100644 GIT binary patch delta 96 zcmbR0Gu21I-PPC0G1%46z|g?N(9+V<&_dt9NZ-i7$c(|z(#q6yqk^^=i@@KhnVbE^ oY&aR?C-=z91IaaD@(h@KCoRjIk{3UjM*$?G10py3D4b*k0O9}|l>h($ delta 60 zcmbR0Gu21I-PPC0G1%46z|g?N(9+V<$VA`JK;Ou~(3ru{%*w!Wqk^^=iq!O+agz+$7q6Lpr?$ERja zRcyM6u$+MIVgnw}`00AQq$HhU}lTRzjPWBO&n9R>DF}Xp= zWAYkdHBLdG8b$^W29L=LRiq~e=w7JTnx9tZ$dqzmIfJozXG`$`#*z$%YKXYvZ+#LP7WY@1fh1;)io+gdT5*ewCSDd`=o3C zHrw6p#6h~1wf+Ai8Yj@u(9Q#sR4Q(^y;#>51B-TIZjsufc{ z*)nf7{JE4Vz}|lT_R6&fFWMenuxHEtdEf0K-X%Vq^S{yR!l&-rzDWi4Y<9Y@ADKzn zuL>*F;yui0$64Qy8GHV_UF)LD&kwBjMsrq6L%=JedkXu%?7L(**K+IrBM)}n^EAE+ z=eIN@5mEq=N7o255Jsb01QSpAyrE-qgTB_}1=<4q7Cti%aIW!oSZ10Xx4_}+{S2& delta 474 zcmbQ$%s8u=QNi8S*U2&1)zHAuz{Jqf($d&a-@sVk$iUE;!O+Oc$Yi6!6Ln^$1$C1Z zETuLtV&h}k>}|`;$n3=6Gb$-w%#||z zX~URuj-z=0HrqdwRixUlRoU@aoz`e~I%ad7N$rnK+eKTKNoUvotC(q5zHrsk#>52s z&GnLh%#x;jvegN7@m|IhU|+jZP;TPEi?-n@$CsX-_uWoV;P9h4{~N6?eCodKn^a(b zlvC#QBQq)c)oD}j{5-^HCmY`T#N+&TyR~jto*!84jpnS4@3!4Dx~H)Jex`-iT+6Nd zU7xC4_cXo==Wl$ML`VTd9$h2MKp2f~5lno6Tt?R927N7s+ia@K53Y`OI1lzmg1w2) c%mbWjyd6$di(lz`D`Yb{(IRBCoI#Bs0Kjn2?EnA( diff --git a/Resources/projects/ClaySorMo/phase.ClaySorMo.ndx b/Resources/projects/ClaySorMo/phase.ClaySorMo.ndx index 36a413b3dc9daf30cf1c2ef1c71c4796e29e44e8..cc55d1af39e1af20259b09daeb14e3a29b43e244 100644 GIT binary patch delta 632 zcmXZSM@|B97>031sltdYMpup)8ygrR3MLjnWMxb=Zd6e82qyM+1u}NM0SkM(gEi_Q zY*3s0Z8hXf&!v0>Mxq6b!Xn^k`=|oYO`WH8&eE zIW#fq70qxeHGIkcs3ID8gSH|m-8hFw_=>(_S;ue#Z_#d*-h=aajBnUrlXV<7@eUn! z>AkpsC-{zON3GH2s539p4!PUHdvrRb#BdQ$@dF!OvSx4_AJA1IJ&sFwhM(BvmURMm z@bTYjL-Y8|E#Z-iWjx0MHmlMnaaWCa)fr9GhO&u4^D$pTxA|O!4#kqOS}dyJE|u#( zT)_+c!WOTrS=_@X^pr_Y;woO^H@23`I)(fAjB17Seq6&V{6T-EtkZaaFIZY7J%#Id Hjlbd_jS-M0 delta 632 zcmXZSM@|B97>031snTpQx^l!=h7Al@z{HBk%9v=}sG#T(OziCnX6$+c7WQ@rYt%#7 zu$;j8p1Aq_XP)=V1#>|)mF(~79!lzAJ=~*}zgt)3BF_6QDw9{s?CeEL+-Zl9-U4p-ME0K_q!O+sm)U;7ys{*6r1vY`d zQ!`amCf{%Wus!@DqYVo)P+7#w2=n$ eVZ?$Yy!O+;s*sM`us{*6r1-2z- z+?gsWlkc~G*dBh7(T0T?C@_86RmL(=2L=c*gwhw>*BOORSG>k(!)Fv8&cHAs`E>lh zdIko=>4I{MvfDeZF`h8eEH{YvaE59CQRRm5!DUGNxHtg;Mj)SM`u+`!rjt7rd8Y5; HWV!$V;)*RG diff --git a/Resources/projects/ClaySorMo/projec.ClaySorMo.ndx b/Resources/projects/ClaySorMo/projec.ClaySorMo.ndx index c56f9e919c85c5d3fe9ca52e6c65ab98adaaf84c..7ea1eb7bcf3c41981ac2ca89ce7d8e4ab86deb97 100644 GIT binary patch delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHJzvs%E$=-$EOJ7 delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|f)H#F2YGB7e_Ff_I@Hk+sr$|wo|#~BFZ diff --git a/Resources/projects/ClaySorMo/projec.ClaySorMo.pdb b/Resources/projects/ClaySorMo/projec.ClaySorMo.pdb index 0bb4cabd1c9973367c7dafaee18e5d0776bb7b4a..00adf75542a6e9ecaf9d3f9549f57716978e26d8 100644 GIT binary patch delta 63 zcmccrnC<>!HU)QAUnj?4S3?6s0~13_OG`rweFGzXBLgEd2183LQ`1I;tqP0{ZfpX7 Tr)H|COzywkxn19#aYGgWX@V2n delta 63 zcmccrnC<>!HU)QAUnj?4S3?6s0~13_OG^V&eM3WiBLgE-218>jW3xtutqP0{Zfr}; TxHDB$Cima&+^+A=xFHJwUJnx! diff --git a/Resources/projects/ClaySorMo/syseq.ClaySorMo.ndx b/Resources/projects/ClaySorMo/syseq.ClaySorMo.ndx index cb9851bdaee923b714aa487ce0e6e93c31252048..083d8bc3dbb8efa5791a7d0a9fdc72ada69e4743 100644 GIT binary patch literal 67195 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 U*4ZFl{b*iFG}&fnthEyV2diJaz5oCK literal 67195 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 K%_d`&jrc#ipTrOV diff --git a/Resources/projects/ClaySorMo/syseq.ClaySorMo.pdb b/Resources/projects/ClaySorMo/syseq.ClaySorMo.pdb index 1dd87b95322eb5a6fb54d65e941365a3d3f5d457..766bcbae224d47d58c48231be3788a906ca8124f 100644 GIT binary patch delta 2091 zcmciDc~DbF90%}S0x^IDkVClynNn-^^!r_P3ke`Ayz;UhBEN zMy)^=E{zHenJMK4a0AA3g+d`$zzN`ScmX^<;tGQU0}wpz41~lmW-<}NDl>#uSRtf= z!pKyN^z%h=7!{Zu72Pn-aWT=jm|)qwqH>NgR?_v2E)JT!IK0(TUocU?=C-0PSGx^F zDh5V?0gQnOV1gll1x$e%Fb6|{1z-b9UMgmvh z2He3Y-~l{=7w`t7fe#o1e8E^S4)_6ozySe(3wR(9j0Y0{9|Qpb5Q1PJ0t65P5=a0A zLO`g7NS(;oPM0imGZ|uukpJt=N%Y-p?4VJ_;W})zy+$LC$4x^R=E#fY7=?JS6WBfB z`u{}#j7p`mdnfwSKSg6>T0)3eGrgdSK~|O=#i0c#5iLSVC>f=oW$1gf06aQbY_*K zx#G;K*~^TniBto-bW)#4M3o#rHndm~r90hTJ!Nm7Oos$3#=Ps5=|;L;UE|2d%IAh3|G7Yh6P_{b}{B4Bf4ZEiJ1zi7C1KE$hD)IK3Y?F1ead zG9nTv)jB@eC~xm(^Qy=;#nz^M!zDtpv$ea?(X3W%xy|It_5CTN`!D6?btMZ(#*F62 zysjH$c*kK$i5+h@-FLc1GJnq5VZUyQ zRkvUOp-x_E`K?RNbCH zRlB&#Kd)?gTq*G&nv+=e{+PJfD16ubv|P!a$c9EIfmE{Y_wvfxAT_yhL~*gyA&Xoq zo#g#AG?O&H$!lOAl(DIV8Sau<{Wer0FS3h8>$30d zYx2pnhmPLsT+b)l%2&rLAv!&Z;-=Wk4noo?L!HX3tr72xnVGh;B84Q+)TBS77m#L! zt@gjYxIv<-JM&hTWRkpyuahnFjU;vwpB{v&u#D-7t1Fz6zw_A9bAzrByVnij(|{H$n+ey#|)a!vk)ZE&GN?Q~$8i&T=5e`3{hZ#DTwpka>=$tI1d<~;sw zCE0+E76I#=d7_tV-e{G%e3Sy*?#`MP%O?3429r%Sblc|qEFGN}#g zZau}*Hr?&i8b-tV;BoM};k?0h!|(oCxBKE^{RaAM73R@P^DS6((ojDuI`*c8sXr^> zRflR0wK?9U;K&U_&(V_juKIkpvodP>larsq^ziQbhCj@<(&}c`K$r%4_W0DZ>EJLO b)_<94KY5tP24BB0AO({^xW?BnBB( z3y4+9g@FO#N};#V+gB(OiM)NighDSLZyzB==;QA@j{@tdF@++9nPEbqAo->g%5Elw zqNSV=i8teo-tg)(*uZ-n0YG61q0dRlzhWVzO)YoZf)|BVY`ufCfy!6hH@4 zfhqV5n1N}40n7mtOa~T#1uTITum(237R&&4fDP<{18@XRz!`9W3*Z7*FcZuIZonPP z20Y*a_&@+Wffw)wLf`{F2fknq@B?$fJRk!8Knx^63Q&Ln83+J@+S5Da#rZ|$UR3+N4zT+po^Egpi z-zi5Y)Tv1W`F*D16=H7B1)m7fgk#Fm#Y z>J{Q$nF9nJiII9Q=2{LureYpv0#%`Z$MCS91@8RN*SUul=S9oL8}x~ny0rw8N$Z1KhV?Xdg&=PLy~JgbUn>$xBs%{!Mi6C=AsuG+87!~b-8DADgI zlvvw-2;Cr&hB!`)l@JV;K2rqAqf*wR!p&_Svhveci&-og<;XYMZ2dvcAUd0V|v@O+}v;Y%9>ieqGV}&T{p02#%`m?Z*L|t7)aMyf~ zAziGzIjwtOmJu=efMIW#h8qpjaGjhur$TVtM4uGim1geZ>AL>yF(>G7@;iO(qiecW zl5y+PTZZWxH|Cf98Y-*mEf_ajkFT=l@Qfije90+CD=HZsE}RmiV0;`NS>Qm=czUIC r#@6@Uy+79e6u&z7Nq3w6fAk046~rpIdw2o`P=X+!(((ksb4UIIBZDJ6 diff --git a/Resources/projects/Flowline/phase.Flowline.ndx b/Resources/projects/Flowline/phase.Flowline.ndx index 305c98ccd8b8bb8c267301ef3575b83f5fcdbe5e..f6898114e396788a6d9adc612b3722b90386e390 100644 GIT binary patch delta 242 zcmeytv5~Xh-PPC0G1%46z|g?N(9+V<&_dt9NZ-i7$c(|z(#q770SH8Z*cOOu*%%lY z&6yY&CMhv6hyw)@6%-U416_SQ9TgN33**yM^MC?SkXWdo;OgQL?*S74(r2bIF#O_R zVBjwXa&j|)swcYXGxAR?vj7t7LBtCnFq!O+sm)RX}TM1a^9h-=vx z7#Pi&7#JogF))ZvwA##eWj=_r`Qx%K*3GqS{uB6AR5)yYaWF6l{GFPqqB8l`wB<~u prjxrDd}R4zov?Rv!@}Dvn*}D=FmCRjXU#bIyffG4EAuBQ0RZTID>?uG delta 119 zcmaFX!u+g-*~;D3*U2&1)zHAuz{Jqf($dI8-@sVk$iT>e!O+ag*pdMVgn`%=h-=vx z7#Pi&7#JogF)&C>wA##eW*P$n2j|AuU96jH+59K)C@XW={Ni9>5Lc~=+x%dDHQQ!^ U2{w$I`{!9RGO}$xJ%6?m0CLqH&j0`b diff --git a/Resources/projects/Flowline/projec.Flowline.ndx b/Resources/projects/Flowline/projec.Flowline.ndx index 5e767b483f1e22450c34e84f70e6dc320462e467..b0391933ffaa21796cf5cf99827b9ace8d91a096 100644 GIT binary patch delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHJzvs%E%1>$EgVB delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|l&H!#*WGB7e=Ff_9=GMK0k%E$%)#^eaj diff --git a/Resources/projects/Flowline/projec.Flowline.pdb b/Resources/projects/Flowline/projec.Flowline.pdb index 80f9317f4781b82104436a2517b6815199bfea01..6ddb833df5f5f752cdb9a255c828ab5b6f84f52c 100644 GIT binary patch delta 58 zcmZqgXKe3hRB(6ob#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHQlISWXvY;cWS1J N%H(b~{l)FZA^^GA4`~1Z delta 58 zcmZqgXKe3hRB(6ob#e@LH8e0ZFfp{Wv@|l&H!#*WGB7e=Ff_9=GT5kKWXz_eS{0|F NGP#>ge{s992mq|b4srkh diff --git a/Resources/projects/Flowline/syseq.Flowline.ndx b/Resources/projects/Flowline/syseq.Flowline.ndx index dd9c01bb1c286e1344d90bc7721eab2525defb76..50ad93ba96324fcd569540e0468a4ce161245055 100644 GIT binary patch literal 48100 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 literal 48100 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 VE{4Sjg1Z=4Oc30~v#tJ3{2$IAIq3iZ diff --git a/Resources/projects/Flowline/syseq.Flowline.pdb b/Resources/projects/Flowline/syseq.Flowline.pdb index 7886b5300853eaf615d60876094edaaf64a71bf7..207540902aca89409a5714ff7d6d7e424dfe58f5 100644 GIT binary patch delta 1700 zcmai!2~ZPP9L6^>!~lU1Bq8AvCRkCLl0*b^>~0VO+Nf1jM9~Pgwx%MN6^d08&`KGK zt!$L3@k9hUJb(bsRLKHGL8T~IsHlJ_iUn&x2Rw@Q1zlUyar$O{^UeQy^Y+cRFRet~ zepRguQ_P%2H~?;S zp3J42V?H3Q4xC>-x<`%eUNQ+gJjV*0tdWc?J1z_xAa z`NLmdgshMetERfHk}b&9MN!G8tcQ`dyRROujy@(MuP;qctvU{mb(30Bt|;LH8p*;! z+~W)yxNNNbXm~#o&3k@*6SF@}wxVH;E5xn4NQXb;;INaZpB-eG?7)=$oQBC&H+^gO_Xim?QFP$1j(Rc5|XGhM| z3!TG8_ey?TV@8>gh@+kz`Sz&0H(sJyy{=A8bHq#DDA7O+SnB`PiGItz_r(Y?@IEC5 zEj8h>_nn=yu(BEfdS@5krbEs^n=hM}2@P8mwkBO0CC^=;#HaPup!9p`bBE48L_6!3 z_p36La=RF+uWq9r<%$}MPkxky#i*NTDZtv@O|Pw8aY%OY9a~qNLY+z2!oo3YH{df8 zv=&;6)n>Wc&mSv$>+SurT&54jpX8Q1R748GavD4^XL&G2m)mL#dHvj}yeK?;>C=5T zf>6Af!H)I;V!XT{hNbQZ!{@Ry-2?Xo;k2Yn_t`I2;I&0xJc{<=j$7RA zt;KgTGS7&OJ7iklz=D7mOjxYSo9s8DhwC4ZhGQvDB{7Tk$&;#lBr(~}$S71PQ;wyvbBkOAGI92jq03||5)O20xmTOiZUFjZVm>V};?>VO&u2NGKg8f2i>%A$-hD`kWc1S zm0YjsKm-{9^O?0ux!J=1eD4hY%YezcVWZcsSEhQyX(JJjK5OoZxWU6SMdcFhJ5boU@FHIZNF@G+HX9>%gJi*EWs+vgYTDHvWVeJ~!kA?yiIh zH*1{Z3t6>M@=M8LA5~;EyoJ*8+T{Z|(T?D@Zl#9aE1p*le{b4z+*X?b+}!XtfMNJ* delta 271 zcmcb1F|%=Xrn$STuajf2tD%9Rfr+7|rKORHzJam6k%5r`gQ1y~ks$*RoMmEQum#e! zYzz#H$(#%f$($Plb=W2*NKFn{%(A(W?LF({dMB0bOGBkjFilR74w$@7lyCBfSgGkx zBcz^A-msi|^97T$jFT65ux_3v^h%ReMTOJ-vQm4RLws$2-@iL;QZC>ou zzSxNoh?#(x8Hibcm=%cGfS4VKIe?fGh`E568;E&;m=}oofS4bM1%Ox(h=qVy7>GrH WSQLoGfLI)eC4g9R`(h`ldqM!USYA&6 diff --git a/Resources/projects/GEOTHERM/phase.GEOTHERM.ndx b/Resources/projects/GEOTHERM/phase.GEOTHERM.ndx index f69c1ad720a5561f4fa11dd666fdca4baa54a3dc..9470782bf5376df9d768760c9fe6277cd7f3267e 100644 GIT binary patch delta 717 zcmXZXH%iDkWJw+ zh?!v#ThYWbj0lyz0*7!5pD;5_Y8%esIYx%dUWvoFjn9}BA+;Un@dB-pvRB~eq&Lx)P7vYdyG$!y#Z(N1b?tNRq6n4 Q-~%dYvNz%^p5m|g2P@{Ni~s-t delta 717 zcmXZX$1;Oa9ENdG5|JXhtc2*yBwr#%ED%IkSQ#6=-h$rmAoJ<%4vgM!L1(xHHR=V( z|CwxlbI$vm&DnBoxoiP{bFHt%uQ(NFnd0?&ogRmxI9yJbCrWWwy32#MR*e!IstB_! zJcm)UHDVj8c!6=zvRC0S?%)gN#7J$&dAvkztnAe|g1h*N_Bg2>xPVuv)5>0hqqv7} zn5&c8iHmrR@$s_za18hH9rN^3yKo6_P@f=sEso;>eqg>qYBw(9ZA7bTH)e%fol#y) z;30;vz$AMQuHYRS%(B7A8vV#Z|mVqeXV3B~$IR*utkN?#K9rMM?6a57+Pk zP06x1;544#Hx{Qz?Z@?qRyC9&KQpIF3*Zc%;t!UjNgcoqe8j|b*&A^d&+r#ZGo%jU RCO)AhQ}!mD!*l!-{{c_)w(tM| diff --git a/Resources/projects/GEOTHERM/phase.GEOTHERM.pdb b/Resources/projects/GEOTHERM/phase.GEOTHERM.pdb index 38a80de8df76c32b0d973eba56a1adf9ddeb8847..e37b2618ceaf1150244c352665d071252beec67d 100644 GIT binary patch delta 56 zcmca`m-WJ3Rt0xgUnj?4S3?6s0~13_OG`rweFGzXBLgEd2183LQ`1I;tqP1U!kGpB MPTkHO!FW^*0OF7kod5s; delta 56 zcmca`m-WJ3Rt0xgUnj?4S3?6s0~13_OG^V&eM3WiBLgE-218>jW3xtutqP1U!kL$t Mac}32U_2@Y0Nk7p)Bpeg diff --git a/Resources/projects/GEOTHERM/projec.GEOTHERM.ndx b/Resources/projects/GEOTHERM/projec.GEOTHERM.ndx index fed41040e0bd55ef4f6132881b8e5de10569bd0f..19760a155403b6f4659fd357f1acdac68d71b163 100644 GIT binary patch delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHJzvs%E$u%$EpbD delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|f)H#F2YGB7e_Ff_I@Hk+sr$|wr}#~}#p diff --git a/Resources/projects/GEOTHERM/projec.GEOTHERM.pdb b/Resources/projects/GEOTHERM/projec.GEOTHERM.pdb index 86cb82868bab62ab4cace836111313a7d1e67016..4578039019ed091afb2720ab1bd720bd51b63fd4 100644 GIT binary patch delta 52 zcmeBs!_@bNNx|LK*U2&1)zHAuz{Jqf($dgE-@r)U$iT>q!O+sm)O4dlDjT!F->I8B I*xJ?u0E@j3Hvj+t delta 52 zcmeBs!_@bNNx|LK*U2&1)zHAuz{Jqf($c_G-_TIs$iT>y!O+;s*leRhDjV|>Gw#hD HY;EfShPDoF diff --git a/Resources/projects/GEOTHERM/syseq.GEOTHERM.ndx b/Resources/projects/GEOTHERM/syseq.GEOTHERM.ndx index ecd3a978796e27e92504a63b5b3128eb6e336391..234a8ff35f721b21b0f3202842817664145e5788 100644 GIT binary patch delta 103 zcmbQlGKodO-PPC0G1%46z|g?N(9+V<&_dt9NZ-i7$c(|z(#qIqqJk*L41NX%Q3eKv ui4A&_|1$D$GO#c*R0G9$CN?-R0tvl|A4M2>CbKaDd6PZCWDl4;4q!O+sm*l41HDC3NcW<7V< zrhK28siHFZV{OG|hr0%BEE||MFipQu$tWSY&be@wj0Xc0NMBxYbm38T^SH;g(;2H6 z=P%A}WvpL*=A?Pq$ASZ;3vPVda4P@6p=FdjKh&ti3jS>E&V!GA?yIBz0cJ(`{EBQVE@gwM9$@a0+(2- zt$_N0ymF6e|6e8?2z4(zcFHpGz#E^`4RbGL9SG2B-86S)a{U4J_e*@^eJlHbDn& z<{y}yrFkLI!^|Nr?iYt9(5H+*TvvB6Md_yV?R1;}syRFT7j3bXTjXN*_SgYC{TU)Y z{GN`st@92&F^{-n=W(8u>q-^d0{b6RG?sincEPUq?bZd~k8Q9!wsT%#>d!=L2>$?F z{P~ann@;cFVE1h1rR&?)%h&})?%P%>#$h`>PL)wXJpR~)mur^pusdgM>HFZ^WjndL z31_}7k(@lyU$H*xmEuKhbuoLG4PqAi@7>~#v->T3TX%x}0(;emDeV9AzuA4s3-;-o z6lS;l-+VdSJ>CwM3w!@;&2hK?;q6=Q`-Ig&dVzP%XSe6};RUZ`O???0VvSjJjb~o9 z+Zo7e(CuYoui-9kEd1x4eUi=WGgi$ zqf`C2WIWm*W1rl!Y8LN-%UiqNP6X14@2@ZTFo)s5+q;cVs+iag$X!dB#>)C^f4fMD zi)0Dofy(rGdSUX9_PdA%#my+Zwm-Qo(=gTk&wi1wA9@VtAKbrJW9Pi2hYSbm#nxn{ zo~ygN-}>Oj@5<*7+e>!Oe-eC^@xX*dZaL3WZtU+6>(%b>J!a1mF)#i96Sf0cCjwV_ zML*vE@%Yc1W+8X>PdQSdcq8H2{v!LU@147^?{8ogsXkM5bHB<${m!O+0U&~T!HDC6RdW<7V< zVlTudsHjZ-SX;5#;jRH2^F)S;lLIp(C&&5lamim^adhEPb#sC6X;q917U#Ay*6-`y zX3hMu;J^&ePQ7KP@(&c6nXLXPZF}Gz%RPhbuM!VP?@D@pg)#5Id(nuM3IP@eBz`X7 z=a`;#;M2UTf8SIj9_Xw%;dV$a?7;6^3+Ale7k{A1b?f5&axMoBD{%-|F{vL=mr%IH z^ETlC|IJg!Vl5I6y!mbLH0om3fkW(Ze;2Pzu0POzuRY_Fv&Dhvc=1r1{+I)I#Ke7e z8ZaEN6BAI;%4IuXb#gL?Zd1_#)AWe*x$iO$yi9uSGP%F#fZORiA>Xd&A1HV)SL)*_Xatn1zHnrS1(e!=35_ZC}|Rev(y9y?(7*y;JrgO?m^FWxUZ zpW}Ji&UI7T`R7Z*=iC37qOs)ru?u#+Z?`V^er$uC?)2AE*ZwD1L-+^a;>or)d^h)R zu-m%wz%$P(8M~RR@2>8gyrErL^v_fy$2t4A+uhjtX06!NOLmt-cTc-Kx!+&8{^H6< ztp4eu_As-5iY&BA(2lh`c;T>G&B^)p-#jFue?R zHvrY~{dEMJ3sYAgA!)=T1Jro2;Yx{{(`GxEgzWskI~0HxKQ#O7%^F)7o{V@@FkD zUSWI~eY3~PDlV~MdZPxTBs(;6CpTU;WQRnkz~n+H%gOS!9PBODnz4+pxq*Dm$qv#S UlMOaRZBIyGoW-~~=uONt0KZ=b>Hq)$ diff --git a/Resources/projects/Kaolinite/phase.Kaolinite.ndx b/Resources/projects/Kaolinite/phase.Kaolinite.ndx index 4041fda912f9aedcfcf7ca215f38fb4a7711bb12..71e68d78b654c92bc1a6604e255504652f677b10 100644 GIT binary patch delta 215 zcmcb`bcVU!-PPC0G1%46z|g?N(9+V<&_dt9NZ-i7$c(|z(#q770SMTE*cOOu*%%lY zk1;YZ6aqz9fC7mM3JQ*au0EcQ3JQsZ@#(2~KmjO7EL2c%Ni54uEry9GD9ll3U`Ph) z6$EQ64E79}=%#Nam=09o?ilPF;pw7~o>+`xPI|6_f@exy5K=clC9040bg%Ff=eRw6wG|w9q#&(l;_NGGj2bv@$hi00MR(wguu^HUtr=r4PGlzwNLE!JyOcj;QUb2%|7&#^{5D}gH zk5h57CNKZwFm<=h8A>LsV5P}GGayPQuTn1-;{}?ZY|YG&2s9o96s#9K<1LtMtl==R YM1Uy5K=clC9040bg%Ff=eRw6wG|GSN3M);BURGGH(?vobYh00LGZwguu^HU_foN78l*}gY;&hZ6&n}Oc~AfV)~7A` diff --git a/Resources/projects/Kaolinite/projec.Kaolinite.ndx b/Resources/projects/Kaolinite/projec.Kaolinite.ndx index b338b148e8f4ca09d5bba24655f64fb51ff56157..197b61bb5da9c3fbec391c039dea9ce95fe18079 100644 GIT binary patch delta 37 scmXRblXZ9Xb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtnT~8^Op60Iez>% delta 37 scmXRblXZ9Xb#e@LH8e0ZFfp{Wv@|l&H!#*WGB7e=Ff^Me8^Oo{0Ia*R OOtx2I+pJ|E%m)DXq7YU9 delta 58 zcmdm6v$sap-PPC0G1%46z|g?N(9+V<$VA`3Sl`IN$biAnY@_T`eYP0gsyG#u$=z%+ OlkJt*HftFO^8otPc@-4YsZwQ^ZTOM9?% z5w=(nR;HC{W`dYlm?7A*K{oXt877qWM}`K5E`pwZ+xoM+*N)vbZsRrX{rheAVZYj% z`rE1-Y7+58yeyGUrxU5!@#O4eJXsME6*tGrLUh|4-RDL3u7VJ9t|$!QRCJHt!h&Uw zw6#9m+POSd8;f<+b+&ds78|+6hu@F9i#{es9*V`1<)fbrKYn;(2!D(Z;i`;8VorHH zGZBx+^5%!|H;Bseti+^R5@pd(%J@X0uibdJiRg)EBW5<4K#Q_w6KHYk3KHdLac8Fq zv}o)yfff(GXaX%dHj=17i>Kc-ffnnxnm~)*ohHy?%U%+dXtC=H6KL^Sp9!@1>N^u? zaqJ|C6k2@$g9)_w`J4%~xb&L|vP?`9Z#7+ zi%*}=Oq8x1o^>MwC*#VAzF~MgrZUX61L@E`Fb>9@ihgk{k z&JAzmgxw%;UfjQhgm!1qP7^pU2KJi3dGYc=6KGL;goJiy?r{@naqvujIF$XMmaD~i z6KK&iL_)i>Boye0RG`J>LKA3lxX1)r^c0iO?tFLVIJKxmi}s`mw5XbE0xb&fAferP za-j*d*w$nMEmpReK#S^j655?tKVbqbPOmkA79V$;K#SGABDgziH=96<$vaG-#o0Y3 z&|=R4655?>`b?lj{eTIym^x?zEzX@Gq20Ovya}{eH)H}W8bWTCzu*mH*`3oT+LF@YnpK4Ah!q@~IPTFkE@p~W|4p$W9O)Mx@N z2AWNv#m+VoT72tPnLvxBYfYdK1m_Up75+tD!P;0!L))s6KJvelnJzWXmUSk3+@~4_WizzcqphamZ2`#?r3KM8??=2?KqP5NhT68TE!Nu3J z*aTW^YcYWqpSPJni=&T|(Bk{?853x6`6Ux*QP^VwEs8gh(BezHZvri9c9}qnrhO*R bqWwz}b8wyg*&`;<;`L)D(Bh-P|A>D9<8<^+ literal 10647 zcma*seQ4Bm0LSs~+(S;HjAbS^IYF2P!@JvVZcSH<)&^!K>tPcj-4YsZwQ^ZTYxZF2 zD$KBm9!#sHnF(TIv5Y}2GqS1w$S|R1e`IK2=pyLpce6jcdu{A)<2GL7-oM-3hx^sn zExNI`u`Ur$#LE*^RaMFIx$&~O$#^mz5*62_%0u+ACAut#F5Lwo%_T}59LV>iWO$<)Pf(zkyzHH1GVhA=TBktj>W zGZXQ6EUzYnzd_7PWhExplPHh=QpP(H{p_0COhk7)8!@}t1X`50m_UmgR+31e#VuVX z(4wi^1X|qttO>N}+(@DVEgpZ(1X`@$W&$lX?=*oHTlbQfhZeg&Gl3SL44OcTFTXQ^ z7DtYgs6>nJe=va-Kc6;%7UzF6ffnIU5>;q%X?~8L!K={X>dQ=^#jL3&&>|iak&L6o z{5dAjq9JJlEpD$iffmbdB9TCg_C+Sp;?X-zpv5!ym_Un{?jsRBFtUz=Hy<>C7CRm@ zffgS>otY?Im7aBD11ICkiGCqH9xF4y92|O;IKVSka>JO68?#w-E0xb@Vd;mstp zJC83mffjwuCeUJ4s|mEI?I5AudHEwI(BkA;6KL^auL-nRvsnapXZ;ovXfb7n3A8x1 z#{^pJ=_jGx*)wPYEfx)#K#S?aCeY&a2np@Z{bx*|#kx@wXwevQvpj=0j%RnyoRk~B z&iKlnCb;;1>B$R+LEwlSE6x?6#rIK(2^^922@^OXt<@&bqNa|77T>hRCeY%1lL@pK zYB7NpJKITU@vU2J0xg!UHGvk@y(ZA&s?8*{_|Cm$0xiDXZUQZ~?=gWEPxX_~;=6m$ z1X@%MnLvx8VH0Ta>j()gzC&kBpv8NmCeWfM@O7jLEtXCa!Nr%lGB3-!DCrl(=TJMNO19;nlT|1fWQ%{iB6q^(Bk{OD3=6|$l!)N5;!8mFPlJ%vu}{l z;>+nXffiGCn?Q>>`%R$5f&mg*d`k|QK#LW}OrXV@6DH8&#h*xM@ohV60xkB9nm~&~ z|Cm6FlN0mxpQ^=o?g|rVkw4u8T1=Z|0xe2QNoeuaR+vDGJFYi@7HthC(4u>Z2rj-& zOHH6fU#khU__W;wS{#0ugcjeAPnbZ93(uKAi^5GN(4zQt5?XwTcTJ#0-7XVo(Y((D bT6BC)q73KRpFC&+EnYcd0xdom{*U+NMhF`33+!{Unj?4S3?6s0~13_OG`rweFGzXBLgEd217F|gNgETOsB*r+S{=m z=wW0y$+>aj8`g;n_%_$FxpDBQsBpUfnp7H9jL9!4N$0%B$$X4(FxhqZVX*x<83 zm9L-%i-XhxIibzk7p2X^uk;|_X8m-^y5mhlMYPd+H-hel*4{)&ugFGEapCN z{mhb{h94yd4j1l!Bhl;Z5Eu80Lt=WzWX6rM&!>L+etd(D%?x&a)!6o(_6zbBt4-Q5 d-yWjGZwlkVi3>QU8)P%{G0JV1o64BY2mowCgy{eP delta 654 zcmdn>NMhF`33+!{Unj?4S3?6s0~13_OG_gYeFI~CBLgD?217F|(~0tOOo#a<+S{?k ztFtlO=G-{(4eP`Oe4A_8+&K7@l{wviaxgH+xr7HQD^LF@$0WM>i^3V^$-8AFWmy;* z7#Kjfu8tvLlWSbuZzPfF6K69zO`agkGkt#{6B03PF|)zs1pPUa*I9B*uT@}`n?8RU zE6?OSwIlVmEsxz;`Lz)IQVK$|Fs{jSM- zGTtoaK9H#O{?cDAJBPTqUmOB(r??mQ3*Wl6(e_W3`jS)8&uyR278dW!k+=KkEXE$D z>S(wB!v|C*w;j>ptawWq~<)y$ptJL=W{iGSb3Y!zTNF##l?TkQYb)y36* z;h&<*Cm6TcnfteWy&u|O=iTGUKZCQ$PQ>U>y3j#y2e$~GyRl#I+h3W|@y;jQ!5-B) z|4TPs9FVJ)7;1xhbxIT;w3bf-JMW0cq)F2Zt^aeE*S%M*40I`;yl diff --git a/Resources/projects/PitzerTHE/phase.PitzerTHE.ndx b/Resources/projects/PitzerTHE/phase.PitzerTHE.ndx index 44a365082e265af8d85a742a83bf830ff7164a7d..16a94952635f2197b3867ee834b4cb74a514b6ea 100644 GIT binary patch delta 1100 zcmXxd$5Rtw7{~FAflcTwu>=DP*jsip;*dC^L1Ks+FI*fOMu|Jti!Uqf>$z4i;<^oBZzH+@!kZDUnA#06+!A7&4dydF1V55B=_r?d+(<0l+jBJDCfh7YlzRPtH44X@y5 z99Jgoay*WYu+SrU47cM|{DR}X(zap;KE|TKk~iTFyoO(K!Vqawcmkhb@leU*xD&7A zH=H<3+7);bpJItm^4YixZ{T;FR4%QFr|=n;4wrlm?#7$=0|S0(JN+K3%|C)k_UEK! z6*AAoJ=lvsQLmJCC3fKp^k|YNa4+7%UuaZGy9!U^OY~MtJ`eZdZTyYF8fjPK8SxL< C69}sS delta 1052 zcmXxe$8Hl*0EOXka7%TH9l$0bvFXh-BM{h#Kmv|K2^)6wF3JPY5_(xj1EGT{Yl?u- z%LAAW0tDGpLvK6g{4yiWr#t7rvfSO)n@wjk?JdpoGL~tXOGWlu<2X3{oo+px^E zHPLXNocm63-%h__c=BGuI2SaGqOSC0kJ)v8lFM5cr_m$lql0<$6=`q64R`_HVZ5K} z0^E=H3r3v=Z@t^5dUazXUc~p9@M&L&2k-#~{Mx7CCR`MVI(ff-ODA98|EZ~P(*5p$ zd{{8*#Dluk9MrlQFX2ZVTC9CB9>hmjT%x@Nx8P;`gu_Zzm*63Mj3s5-r(*|R!9E;b zuDTQt;}a~c&^`k@u?Iinh>+?sJc3WLtWtXhx8ha&f+MR`m*Y`>51 zMs)=q!{=BL)}F=fcpbmt=!oh{JdUB-i1Q(maMw_+S{v@b8~7c^^jBSlC-4PU4$wXm zcj8U_fnx`%uEvx2604%xXW=fqg+FmzOf?saI2|$lvmD>AuzHZ%Y}}2v@fRlRRM+6C zf?=nxZiu_q)T_YSO~!nF^mT=4JI zOcj;s_6p306r3|kixRW*%XHoIOG=89GZJ&M6*QdPH5FX*gB5b~Q?@HAGIKC(Pe^9G L!nhr1{yGi-|28fw delta 152 zcmZ2|n`iZH9%pw~Unj?4S3?6s0~13_OG_hDeM19%BLgEN215fYLvscoSOCPfKwQhl zz`%Hhg@Ium2Ll5WP{2@unc)n}Mr$j!=32J)S~f-?X4+oM#=J$6Pg$A6W*<;(*6i?P yW##Gi3e1P5pH*dMXJ<&$)z;P3-F{n@`6A==2TIJIjES2W>n}5I|Et2hjspN)bS2>c diff --git a/Resources/projects/PitzerTHE/projec.PitzerTHE.ndx b/Resources/projects/PitzerTHE/projec.PitzerTHE.ndx index e389386a26ce008f74c148a1d2b0322b2cad8635..49d71037747977d3e8ca5b2c4585d380f3e959d1 100644 GIT binary patch delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHJzvs$|wi`$FB(N delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|l+H#E>UGB7e?Ff_0-G@Gap%BT(i#`g&C diff --git a/Resources/projects/PitzerTHE/projec.PitzerTHE.pdb b/Resources/projects/PitzerTHE/projec.PitzerTHE.pdb index 0f2c9db2336dfe435a4ac42be58853315ca87ffd..e837ccfc081ad9b9f8101f065f8e1950036f70c7 100644 GIT binary patch delta 53 zcmX@Uo$>f~Mg@0QUnj?4S3?6s0~13_OG`rweFGzXBLgEd2183LQ`3zKscbBQf2U?{ J?qstI1pu4G4+j7M delta 53 zcmX@Uo$>f~Mg@0QUnj?4S3?6s0~13_OG_hDeM19%BLgEN215fYL$i$vscbA+v%`}& Jce2@q0sxqX4yOPB diff --git a/Resources/projects/PitzerTHE/syseq.PitzerTHE.ndx b/Resources/projects/PitzerTHE/syseq.PitzerTHE.ndx index 3751d6abd37b7c27c845265856778f4052ee40c9..f7a522365fc8f0a587b8519bf5296e89941b57c8 100644 GIT binary patch literal 19290 zcmb8%c~Dh#0LAeOA!rCjYHE&xO{0_=?*b2auHiD8Yepn)*~@HY)X^9;z$L_GA~PK{ z$32ILvU1Fcv2w(;3>DLMTc&ayGcwc3l2LoO(8=@s{f_+MieEllejF|c^y@pgS9(TY z*W-GUU7yeArX_e16B0d%DUR#wl9cEK9%4frr+eV%f^f$P36F4`;z-Bw2L9mwr=ERo z{NxAw_l@fp7uS1S=idH|p~-Q92T%PEfnT_FzX?3Jo=bmx=`X$OL!7KejuUfZiA3+^ zR9)yovrwm`@wJJ5+5Vi%k5l&q1HZcbG=nR4%?WY*q_8GXQQR%Wd4v)J>#xK$ih2!P zi3lVu=4g#-)FKHF5Q4e2HxMHri=H zm-D)bt1nbkbo?nI$TNb8z!UUb|0NRmyTxgt&Q!V<)X3$ZMUqj`eUzZ!1S%em5){cs#b=KT3QnNnWJ^Ke zH7fj*1qCNiG4oDAkz!PwE)W!)Kt+s4P^20aMe_v(Cs6TfS3!|xRJ14&6r4asQa?fA zGb+m02ntT1V#fn^Md0mO{c>M^P_@-6R5cR z6+ywnhl;XOf`SvM_+Xu&;Ne4s@4TSk1S$r-BPe+IP_et=P1d^{mlLS?@qIzT!-tA7 z%>)G}P%+^XyCTuNohM`MiXaJ8T-+}xc=+&I%<3p8IDv|VKMD#SK2$VK6%?F6MZ4pI zf`<4ne`ghl&~bf`SvMn0t?);Ne3>%sfHC2~@P~Vpk-Y zw{zWMyCO&e73F;e1rHxy3-4+{!3k7!873%r_)xL)4MD*PRO}utD0ui#G2%Tz!3k81 zeo|2I@S)>1O+Eh;l3&;c=%B9ajl@>1S&py%dSW^Z|CrcFzY>dkOV3+HVXlrA1d5*LBR=B#Ge)vJbb9wK1fh-0u`Gt2nrrPRAgoe3QnM6z|A*X-xEmY;X}o- zae{&qsQA9Qpy1&{#k7fnf)l97Zf93`&D$B7XIBJCpyGTdLBYd^*J9-yLBR=BEJza+ zJbb7~SR^Pofr{8Zf`W$+728${3QnM6!%#uN!-tBDazVifRHTm*6g+&WII>AlZ~_&d zKQ1VE_)w8sDJVFBigA+#1rHx88toAjoIu5y0ztvUhl=Ij2ntT1qG-OL;Ne3>=R;x6 z63c%KdpUuM+e++;6!UiO|J|+#l0Ze-8bQIshu0$KoS@(YD$>>q3LZXGvw zf`W$+uSL^?f`SvMC|)cmc=%9JS|cbpfr>V(1qBZuDpLOu6r4cC+iwU89zIl5g@s%1 zJJUFUik|NY3LZXGjJicoZ~_(kwh0OzK2+4S78IO7g}+)*@bIBxMh8K`2~_;~t)SrH zLq$xIpx^{53J(hk9zIm8>mevOfr@5-*cCqWc6tZc6+sfHD6JI~JbZX9c4i6+PM{(s zqOtWJ+{eR*iV=Q6!3k9Cyj4)}@S);FwxHkyDze%(c1kQC4)XEvp`u`_px^{5YVQ&h zJbb8VGFwn^0u`&gf`W$+6>DD-6r4asdb*(C;X_5zazVifR2&{8oK7A-RDArJpx^{5 za=1mc{dvMpo2~?clBq(_JP;o3;P;dej3n~Q#4<9O~-7Y9Nfr{8Yf`W$+6_M=) z1t(Ck;TyXm$QK2nVx?GE92qMpIDv|y7(v0qhl<>11O+Ehaa$Wf!NZ4&M!AB5 z6R0SQ7Zf~vs965Ipx^{5(vk%Q4<9NzFAx-*Kt)wgLBYd^iml581t(B3a-dxiiH8IQ4<9NHZ4eZkKt=wef`W$+6*(UY3QnLRYJ#BP;X_5lr-FhLs8}^k zQ1I}fV%Zmhf)l7nC=wLr;j3IIB+RQdY=w|8PtL(IAz|K&Denpi^DBGUR(rzoRV*dD zgoOFkto_$Q!u&c?@r#f!AMpM)Lc)AH5Bx18%%}6|uxRToN|O0>);19m=F?f+T1c2r zXPXW}!hAa4PP8X1UnkJBhmbIz&VBa@3G?anX9@}P>HPB%Az?n9h1t>0S@TC--DLCW zoHtcSm`~@6vxS8DbS_#bB+RFC=?WoXKAkIGwq$uTBqlnpr-Pf~1fSx<9H(RO`@9Ip35$qyoLNzh;|>18V=uh? z%7`&fbnhD9Ek3@>@b+B-8GXI+!6#4cH^CpcH9rYHxt`0veEBzhtHYeE`i|53<`Rj% zE2)~$rKWY9qK4Nex@8A)t~^i8D-8bV%IgfR*f}-K36R2?Kt4{AEGRgEifxbE6~Xsswab0=oj~n^2Zt|hwOtV+fr`u_g2KF=6{UiL6R0@yf}r5x z!)q~gtDxWnDspoK1rHx8s=gEyoIpjr$%2B14;A_Q1O+EhF}F}q@bICc*%3j(2~^zw zo}l32Lq&0wpx^{5K3*m$c=%A^zbGg;fr?%q3JM-RRP3sEi}fzY8S0tLZ^JJV|5h8(#f4&wJJbZX9Cbtz7oIu6Q1A>Bw4;4*P1O+EharZGn z!NZ4&<(&luCs48Otf1iGLq$p-LBR=BbaCoi@4>~ulF2~@P`U{@rW zw{zKSyCOsa6(wB-1rHxy3*RC^!3k7!=qD(6_)xK9rJ&#hDs~ML6g+&W7_d=LZ~_&B zo);86e5g3SMNn`86_sNJ1rHx8@+t%cCs6U~BtgN$hl-fJf`SvMh{oR6s6R0?wCn$LMP%-aELBR=B6ucoQc=%A!{!qB{ zuH_$weVjnWZAErPvUxkdK4DjcNT8y4v7q4L!)uXqK~Qi46{)KQ1rHx8ZjY#IeMFKu zfr|1{LBYd^icez&1t(DP)K)>k!-tAM%evOTk0f&f701666g+&WIMYT@Z~_$*_X!Ff zK2#KV1qCNi5q(5Z@bICc`NM*O6R22NB`A3KP*KuTP;dej2^R$g4<9Ph`U?t9prWi^ zl=U7w#k`#r!|aL>2~_lJDkymP@LCKVDJVFBii2^2f`<{>4}=y5h8(#<<)|MhYzpCj!Z$p2~;FU zHniS@`+4|KF(4o)IDv{CjRge{A1aP#3kpu4BI~Y(PLbuqL4F=SROF2l6r4as^?ibZ zhYuAoQv?MkP_fV_D0ui#vE*$*!3k8Prwa-mK2#*l6BL|4#o=DU>Ez)<#rF3F1t(CE zlO-s4_)yV*ouJ?ZDk7e-Dr#P%>3`52`_!rkl|aRuQG$Yp53j|9azVifRJ55OD0ui# z5&gZO-~=i*O%)V8e5hFTtDxWnDtgQk6g+&WaQ_q(oIu6?1%iTy4;5R_3kpu4BD+LT z@bIA`^Oi{4J-F-P1S&3W5EMLos5sh4P;dejGs*-74<9PV-ytYCfr_}@f`W$+6;Z7O z1t(Ck_D8!S#3u!zVu5Q{gh-$w{g9yG;X_42M?t{}RD5$nQ1I}fVoP^H!3k6hzaS`h z_)wAYgrMLAD$dr8w%vofE)O3nejh3*IDv|SSV6(Vhl<>n1O+Ehaa&74!NZ4&`niIF z6R0R|BPe+IP%-ayLBR=BqX72?`!QROEajC^&(N=#heghYuBzUkD0Lpkm>8 zLBYd^in-qk3QnLRp+HcWhp%j=kT9=SzxhJKJUIu8g@k!8#;z9<<~R26&Gv-lvsj9D z3JLR@S*ss}g!yfx^fw`4KH%Leg@pNZ?)^(hm`~@6;f<`fC`sniSsf!J%%`*PP9b4F zoh@4n3G?Y(lW0#^K2M<2LqfuQI`=#(B+REXkSQe0r}OmFLc)AH^RpW{=gl8=b-m`( zIenavFrUu1rU(i1>6|rFNSIIOocTh+d^+c^uqQ146MM-9Az?n9@0SS)^XXi*`v!^Z et6y*9$``Y`{v(aG@0NqlHRm74Nvru%O#cFIKN?>E diff --git a/Resources/projects/PitzerTHE/syseq.PitzerTHE.pdb b/Resources/projects/PitzerTHE/syseq.PitzerTHE.pdb index 8632ea410a43d51e0336ef67d6bb7b4dcabfcf7b..c0ac03e1f417912cc3f1cd5648350ac85091d6e4 100644 GIT binary patch delta 1221 zcmZ{idrVVT7{Kqnl=c=%h4CmXfm|Mu;GDF@j+R1i0TEauXmA7~Ee@9PjMFG&VYcO= z5GNB$fx~ovIM{~CcsihCFz;=_Fwi-0I9x!40pfs|b|~^#!cI%T_{Yx8?~m`E?|$F; z&i%D_NFNSKiP)GUQISb80=|HMP#}>=1ma-6Fj&YJzJ~}TVIe{t;cj2)h#(?e*gN)V zi74XMk>ScLQ!@=}Ci)~!f0baMOuaG4-B6f_av$RwnET7C+MK5BM3e~}Ei4W=_W|k) z#y`TnK!Szk2S#AX#Syqrh)T7A<9e4bd;yV+0^nSPZHjQj3BllQ5`3&#D%B>#n(F}3 zXwpw#;)m#eijEKJgYou?`|)$&aujz5%Ldc|^c+Loz-1BkmYoy{2LcK1kM6ec)J_+< zwZ_g2lRMwqP5=XI2aP7{(eP2{&+_T1rLX((s#w~CAc`+GMA4C|dxf8zR?^WGv*+>p zleB9nRnPvIOSi;Vy}ehKMK5O(uJipOxwV?pZndeNEcA9`HhG`1w$IN)Oe(7)v>W8e zt%#bD<%d!9s4QJ}pnstAHmSIa8KQDH)&$%B%6Ap6bebc1uD~?6MYNME7p_;XzkDEj z_to#Yc_;KTQx6g5W>m<%Z!Xt9Fqz0V+aBJNUzyI{q;^L1*{ZC&rk|cL2Om>icNWHH^ZuZ2{k*UE?_LwxGB+7_xnzS99x{KWOr4-w>wK1) z$|tGj#`D?>9&vBno%P9(9J01<=-aq7sK1hOn>77 zGbIy5`mv>e=ZopVGzTxO0AdVc2Vp?$AxsDhf5`sNPL%4_?l*-63GX7sF?}hH2 zD?^4YbylSWE?oF(+YKJ#j|3tja7~28fDs(W!GZ`opdAUAEViWO(UwzV)vKQG)1%sd zhK{Gp=@&`zf|#~cIyPQM|J5Hvvr=#V**uy_rwp|v?_J^BRC!(ehvV@DzY5jleDhS9 zif2>BX2O$(l*s^DnI-Raz9J$;>(Bcw(A!Mv4(_kN*Y{L5 z@Uo_yjn&JFioEQtik!LMP#JY5Qkts{buG+5$k6q}p1O!_WnQ<>3h16iEo^#c{wraF zgE@XrcNLZGj+YDtgknFj#}$T+B5~Pl3xz`jCC(PbE3~yUsPtdnyE*OD_x~$ zpHs+KKv%$kj?~Yfo`7!R;y_--Wr|D43T1SsW>@ryX3j}B;|clBSnJA9pDhj?k=xRI d%w)G5|Gp`wJsg%HSlc5w13?ql3s9lh*nh^($F2YX delta 608 zcmcb5(t5*2YXx^#Unj?4S3?6s0~13_OG_hDeM19%BLgEN215fYL-UCWqO6m+85m3^ zT4`_06=0jh#L-;Kw!M~(@xI6Of(S+yMz-k_Z5Tzj&(dM~#5%n|mXT+Aybq(m^c6-- zf|GTsw6`A!Wju0?iIr#iMt>%m$rG|zw)-11o@U(szmzeFW%`Fn9C6bh@Gx?0&%Dp~ zj**?0fti7cfnoZGWF~P@1_tBFyPRd8Z)1RgRo#=P3kGl)PPa2<5}Gcc#KAND_Cr3i z=?9p3Ii|n&W?`Ey|A#cjN&N zpB-BB*u)R)&yg<7cfw-@RGxJ@UKu^x{8H?V6^6o#l{z+0|NRuY#S%kG*HrWk1;Ouh+_tkKFUj?%WNQ z#!cU*+r_v`vx*$_c4%c5-(<3Ng(Z(jvx0FFgMIzR8o7zKhwM?UwVIgqi18!m0kGjf z;?T^WCo+|u?f0ME+308aVgIJLCA)TKJlVg(_2&0O`rqt>Ch%{4{et&EDR)wG#<~yt zH_qfbvAL=E-Tr|0CpJxwf6S-FUT$__n$woL>G!-@#HAP<3ZACFcy+|r!5kzi_rcz6 zdxX>MvZpqaKQbz?LmVeC-EcXd0jU}#`sXlZF_XrXUlq;F(kWX51S>h|bQKac0jU}#`sXlZF_WTJ0itZ!ssWWZo#Xk}=?00fdiYzxG-Yzz#H zix?RgjMNwyCIST}mRT^$PFxQnUI2;7ii{vK3QSH0lV`vrD-%fE4osGV$qiugC74uV z2FXT)$ths+ESO|t0g2m#$qF#J5lp@UlQFCclee-8a9+<~WSGp#z#uz0h83j#99Uce H%mVTOi-YkOE>`Ag*O& zU|?Lt$iQHv#=tOPqg6D^=D92n7$-kq;h65w$;dLX>i_*7IlY??S3 z7zF-K%~VmDzW+UA3!4HMY`^Qxcz|ts0t+L{bOS|3p~>%GUYxw=8qf9#!HmI&0Bi>< A7XSbN delta 134 zcmaF7n&a_m4l8$8Unj?4S3?6s0~13_OG_gYeFI~CBLgD?1|vf&LjwjNkOX2|Ag*O& zU|?Lt$iQHv#=tOfqg6Buo2xe?!vxOFlUW`yPIu^JWSMNiA>BNOZTlQH#+5Ey%E}xz jO`Hr2ro7wlhcL3UPk)}x=+30zJ2~)<;r0tbjKYTjC7>aF diff --git a/Resources/projects/Solvus/projec.Solvus.ndx b/Resources/projects/Solvus/projec.Solvus.ndx index 1caffc7fdaa367cd7f5d2d87442c8d30fc226425..5598e28cfc361fa3fe29fde4bd72e1fb2afac4d1 100644 GIT binary patch delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHJzvs$|wQ=$Fd0T delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|l&H!#*WGB7e=Ffz0D^xXqnx G=X3#onGWRu diff --git a/Resources/projects/Solvus/syseq.Solvus.ndx b/Resources/projects/Solvus/syseq.Solvus.ndx index 4ffaf3a1b33069aa4421622ed52fb2176d5916d6..98d8be53f44926093d0c26452c7851ea75067123 100644 GIT binary patch delta 218 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 Id-Xq!O+sm)O4dlDjSR7->I3K n3sOEXO|Ik&nphyT`7UR7EJQRXT{jLWGWjm&)6El(6*B?=Xw4nt delta 85 zcmZpkz}!56S;5`a*U2&1)zHAuz{Jqf($dI8-@sVk$iT>e!N}0c&~T$dDjSPiW>wtg lf|L(TlPfuc7#TO8;hYl-5zI-~jbmh-e1`Me<_X7&83FS^8lV6G diff --git a/Resources/projects/TestPNTDB/projec.TestPNTDB.ndx b/Resources/projects/TestPNTDB/projec.TestPNTDB.ndx index 31278b3a5c685864683e4c24661bff3dfb01f1ee..6f138a04a621c2ac6c3020f75486ee4f2b341eb8 100644 GIT binary patch delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv^2EPH!#vSGB7e@FtoHXHJzvs$|wc^$FvCX delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|l&H!#*WGB7e=Ffz0oiN diff --git a/Resources/projects/TestPNTDB/projec.TestPNTDB.pdb b/Resources/projects/TestPNTDB/projec.TestPNTDB.pdb index 2182b41bc9b16b289d8ba6634d6d1721290ff100..848e4b5847cfe34bba81b8b31dfd37b1ae8d54dc 100644 GIT binary patch delta 53 zcmbQeo@w@aCIxp_Unj?4S3?6s0~13_OG`rweFGzXBLgEd2183LQ`3zKscbBQf2U?{ J?qn012mpsK4zU0L delta 53 zcmbQeo@w@aCIxp_Unj?4S3?6s0~13_OG_gYeFI~CBLgD?1|vf&L&J>v C!V3NX delta 47 zcmX@ic$iVa-PPC0G1%46z|g?N(9+V<$VA`3Sl`IN$biAf(8|zoqCz|)|HK9-Mt%Sm CT?*U) diff --git a/Resources/projects/TestPNTDB/syseq.TestPNTDB.pdb b/Resources/projects/TestPNTDB/syseq.TestPNTDB.pdb index ede03cfd57435d70f6d134fc0fad134099bd8bbe..f96e158779bf3ea938f76ce8904b2a39770a1971 100644 GIT binary patch delta 7726 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 HkgWd#DWg#Q diff --git a/Resources/projects/TestSUP98/phase.TestSUP98.ndx b/Resources/projects/TestSUP98/phase.TestSUP98.ndx index 88f004fc8af1ab2d7103aa73e0580b9c4cf90eb2..840ed9306d68bded9d4e423773e5d73602bdb5cf 100644 GIT binary patch literal 175 zcmZ>F^>uO#b~Q9GG%zu=w6rv|&^IvBH!?6XV=%O|GBsrY0wy4~1>#yZ1_s79AR(Ux z5@ujXR8UZG40QGJbW~7CER0W2%>xQRL1LkTf=gmqW@<4^L_q;$fFMw>Ogd1^-7(lV h!qY_|J+T-?XL_!Jf@exF^>uO#b~Q9GG%zu=w6rub(Kj&GH!?6XU@$VYGBjg=0$U(m%f`UK*ajrzvltkd GfC2zgp9qcs diff --git a/Resources/projects/TestSUP98/phase.TestSUP98.pdb b/Resources/projects/TestSUP98/phase.TestSUP98.pdb index 11dc46a720929bd40c7f6d360bd9d276afc69a3b..2122189738827e783c51b2a2db10c03879d2b040 100644 GIT binary patch delta 128 zcmZ4Vj&adDMss&pUnj?4S3?6s0~13_OG`rweFGzXBLgEd2183LQ&R>YU;<)WAg*O& zU|?(m67pFa19jLYCP?wAsBqW_W-%}b{+*hsqO!T0?PNM5<7WF(CdSR-`L2v$`3j&8 OsQjveDJ)?5$BY1KZXaF% delta 146 zcmZ4Vj&adDMsIglUnj?4S3?6s0~13_OG_gYeFI~CBLgD?1|vf&Lo)^_um#e!Yzz#H zZ9qaki-Ca&C@`mhfdRw^NyukybTne)Q%5d=!7W>v*0D{t;*JDEN)KxlG6>Br6C Z`L2v$`3j(NsQjveDJ($w%>kvC7yOb delta 40 vcmXRbQ*d|nb#e@LH8e0ZFfp{Wv@|l&H!#*WGB7e=Ffz0q!O+sm)O4dlDjSR7->I3K JJJ}rf004?|4;KIc delta 53 zcmX@r%6zJoS;5`a*U2&1)zHAuz{Jqf($dI8-@sVk$iT>e!N}0c&}^eZDjUm`tg5)p IootSK0Ei9_&j0`b diff --git a/Resources/projects/TestSUP98/syseq.TestSUP98.ndx b/Resources/projects/TestSUP98/syseq.TestSUP98.ndx index c7053629922f2553ae9fd2f3a0dc8d886b050083..51ac2dadb44c4869c8f961a4065ce46f9e5ad14a 100644 GIT binary patch delta 42 xcmZo*Y+zJyclC9040bg%Ff=eRw6wG|w9q#&(l;_NGGj2bv@$lHs1VO60RYUR2@e1O delta 42 xcmZo*Y+zJyclC9040bg%Ff=eRw6wG|GSN3M);BURGGH(=v@$fCs1VO62ms6P2>Jj3 diff --git a/Resources/projects/TestSUP98/syseq.TestSUP98.pdb b/Resources/projects/TestSUP98/syseq.TestSUP98.pdb index e32a369a76346a785084818b18f01141773a36f0..c66b7e6155f81c19bfd4d7d0ce9bb951bc015723 100644 GIT binary patch delta 72 zcmV-O0Js0|{}1o~4fX}3<10;3)QYKQW#0=M$71N~1=sTnZ< delta 72 zcmV-O0Js0|{}1o~40;3)QVu$jt0=M$71N~1np%@DQ From 513145957cad786704bdce64e05243c53620cccb Mon Sep 17 00:00:00 2001 From: svetad Date: Mon, 23 Feb 2026 19:35:25 +0200 Subject: [PATCH 22/28] Implemented GEMSGUI dark/light mode for Ubuntu --- App/main.cpp | 4 +--- GUI/Dialogs4/SettingsDialog.cpp | 3 +++ Modules/gemsgui_version.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/App/main.cpp b/App/main.cpp index ee725bb3..5251d01a 100644 --- a/App/main.cpp +++ b/App/main.cpp @@ -28,9 +28,7 @@ #include #include -#include "visor.h" #include "GemsMainWindow.h" -#include "GEMS3K/jsonconfig.h" class TIntegApp: public QApplication { @@ -80,7 +78,7 @@ TIntegApp::TIntegApp(int& c, char** v): void TIntegApp::InitMainWindow() { pVisorImp = new TVisorImp(argc, argv); - // styleHints()->setColorScheme(static_cast(pVisorImp->getColorScheme())); + styleHints()->setColorScheme(static_cast(pVisorImp->getColorScheme())); pVisorImp->show(); // init Help Window pVisorImp->GetHelp(); diff --git a/GUI/Dialogs4/SettingsDialog.cpp b/GUI/Dialogs4/SettingsDialog.cpp index 413c69c4..9b5be9e2 100644 --- a/GUI/Dialogs4/SettingsDialog.cpp +++ b/GUI/Dialogs4/SettingsDialog.cpp @@ -17,6 +17,8 @@ //------------------------------------------------------------------- #include +#include +#include #include "ui_SettingsDialog4.h" #include "SettingsDialog.h" @@ -96,6 +98,7 @@ void SettingsDialog::CmApply() pVisor->setDefaultBuiltinTDB(ui->pBuiltinTDB->text().toStdString()); + qApp->styleHints()->setColorScheme(static_cast(pVisorImp->getColorScheme())); //pVisor->setLocalDoc(pLocalDoc->isChecked()); //pVisorImp->Update(true); diff --git a/Modules/gemsgui_version.h b/Modules/gemsgui_version.h index b3d33e51..676d076c 100644 --- a/Modules/gemsgui_version.h +++ b/Modules/gemsgui_version.h @@ -1,7 +1,7 @@ #pragma once #define GEMSGUI_VERSION "3.11.1" -#define GEMSGUI_VERSION_HASH "df835016" +#define GEMSGUI_VERSION_HASH "a2450002" #define GEMSGUI_GIT_BRANCH "test_arm" #define GEMSGUI_OSX "Linux" #define GEMSGUI_COMPILER_ID "GNU" From 774c9e0f89e412ad26ec7f058adcacd11d5089e7 Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 24 Feb 2026 11:34:58 +0200 Subject: [PATCH 23/28] Fix logging in process --- Modules/m_proces.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/m_proces.cpp b/Modules/m_proces.cpp index 6c7c709d..0a7dd9e4 100644 --- a/Modules/m_proces.cpp +++ b/Modules/m_proces.cpp @@ -1096,7 +1096,7 @@ double TProcess::f_proc( double x ) // PRof->CalcEqstat( &pep->kdt, pep->kst, pep->c_Tau ); // calc current SyStat pep->Loop = 1; CalcEquat(); - gems_logger->trace("golden section {} {}", pep->c_Eh,pep->c_Nu); + gems_logger->trace("golden section c_Eh={} c_Nu={}", pep->c_Eh,pep->c_Nu); return( pep->c_Nu ); } From 348bb16dd5084746653b928566ad92a9642ba2ff Mon Sep 17 00:00:00 2001 From: svetad Date: Wed, 25 Feb 2026 18:57:01 +0200 Subject: [PATCH 24/28] Added a menu flag to expand/collapse the tree view with the phases composition. --- .github/workflows/deploy-linux.yml | 2 +- GUI/Dialogs4/GemsMainWindow.cpp | 4 ++++ GUI/Dialogs4/GemsMainWindow.h | 7 ++++++- GUI/Dialogs4/GemsMainWindow4.ui | 9 +++++++++ GUI/Services4/model_tree.cpp | 12 ++++++++++-- GUI/Services4/model_tree.h | 5 +---- Modules/gemsgui_version.h | 2 +- 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-linux.yml b/.github/workflows/deploy-linux.yml index 55773606..19ddba92 100644 --- a/.github/workflows/deploy-linux.yml +++ b/.github/workflows/deploy-linux.yml @@ -2,7 +2,7 @@ name: deploy-linux on: push: branches: - - test_arm + - test_arm1 release: types: - published diff --git a/GUI/Dialogs4/GemsMainWindow.cpp b/GUI/Dialogs4/GemsMainWindow.cpp index 46eb1552..e00d480f 100644 --- a/GUI/Dialogs4/GemsMainWindow.cpp +++ b/GUI/Dialogs4/GemsMainWindow.cpp @@ -83,6 +83,7 @@ TVisorImp::TVisorImp(int c, char** v): ui->setupUi(this); GEMS3KGenerator::default_type_f = GEMS3KGenerator::f_json; ui->action_Use_ThermoFUN->setChecked(GEMS3KGenerator::default_type_f>=GEMS3KGenerator::f_thermofun); + ui->actionExpanded_view->setChecked(getPhaseExpandMode()); (void)statusBar(); //setMinimumSize( 300, 200 ); @@ -222,6 +223,9 @@ TVisorImp::TVisorImp(int c, char** v): GEMS3KGenerator::default_type_f = GEMS3KGenerator::f_json; } }); + connect( ui->actionExpanded_view, &QAction::toggled, [&](bool checked){ + setPhaseExpandMode(checked); + }); connect( ui->action_calcMode, SIGNAL( triggered()), this, SLOT(CmCalcMode())); connect( ui->actionDataBaseMode, SIGNAL( triggered()), this, SLOT(CmDataBaseMode())); diff --git a/GUI/Dialogs4/GemsMainWindow.h b/GUI/Dialogs4/GemsMainWindow.h index 31273919..62e2354b 100644 --- a/GUI/Dialogs4/GemsMainWindow.h +++ b/GUI/Dialogs4/GemsMainWindow.h @@ -28,7 +28,6 @@ #include #include #include "module_w.h" -#include "v_vals.h" QT_BEGIN_NAMESPACE class QLabel; @@ -162,6 +161,7 @@ class TVisorImp: public QMainWindow int charWidth; int charHeight; int colorScheme=0; + bool phaseExpandMode = false; char TCpoint[32]; // Step point ID for stepwise mode @@ -214,6 +214,11 @@ class TVisorImp: public QMainWindow updateTime = updInterval; } + void setPhaseExpandMode(bool expand_all) + { phaseExpandMode = expand_all; } + bool getPhaseExpandMode() const + { return phaseExpandMode; } + const char* version(); const char* getGEMTitle(); const QFont& getCellFont() const diff --git a/GUI/Dialogs4/GemsMainWindow4.ui b/GUI/Dialogs4/GemsMainWindow4.ui index f598f005..68b532e2 100644 --- a/GUI/Dialogs4/GemsMainWindow4.ui +++ b/GUI/Dialogs4/GemsMainWindow4.ui @@ -114,6 +114,7 @@ + @@ -1301,6 +1302,14 @@ Import JSON files... + + + true + + + Expanded view + + diff --git a/GUI/Services4/model_tree.cpp b/GUI/Services4/model_tree.cpp index a59a9f9e..fbb43af4 100644 --- a/GUI/Services4/model_tree.cpp +++ b/GUI/Services4/model_tree.cpp @@ -16,7 +16,7 @@ // E-mail gems2.support@psi.ch //------------------------------------------------------------------- -#include +#include #include #include #include @@ -26,7 +26,7 @@ #include "m_param.h" #include "CalcDialog.h" #include "CalcCheckDialog.h" -#include "GemsMainWindow.h" +//#include "GemsMainWindow.h" TreeLine::TreeLine(int aiPh, int aiDC, int aiDCPh): iPh( aiPh), iDC( aiDC), iDC_Ph( aiDCPh), UGval('J') @@ -611,6 +611,14 @@ void TTreeView::printList( std::fstream& ff ) } } + void TTreeView::resetList() + { + ((TTreeModel *)(model() ))->setupModelData(); + if(pVisorImp->getPhaseExpandMode()) { + expandAll(); + } + } + void TTreeView::slotPopupContextMenu(const QPoint &pos) { QModelIndex index = indexAt( pos ); diff --git a/GUI/Services4/model_tree.h b/GUI/Services4/model_tree.h index 97c4f513..60c56300 100644 --- a/GUI/Services4/model_tree.h +++ b/GUI/Services4/model_tree.h @@ -159,10 +159,7 @@ class TTreeView: public QTreeView public: TTreeView( QWidget * parent = 0 ); void printList( std::fstream& ff ); - void resetList() - { - ((TTreeModel *)(model() ))->setupModelData(); - } + void resetList(); }; diff --git a/Modules/gemsgui_version.h b/Modules/gemsgui_version.h index 676d076c..0329dfa7 100644 --- a/Modules/gemsgui_version.h +++ b/Modules/gemsgui_version.h @@ -1,7 +1,7 @@ #pragma once #define GEMSGUI_VERSION "3.11.1" -#define GEMSGUI_VERSION_HASH "a2450002" +#define GEMSGUI_VERSION_HASH "774c9e0f" #define GEMSGUI_GIT_BRANCH "test_arm" #define GEMSGUI_OSX "Linux" #define GEMSGUI_COMPILER_ID "GNU" From 43515f17cbff20e687550dc81828038f8e5c8885 Mon Sep 17 00:00:00 2001 From: svetad Date: Wed, 25 Feb 2026 19:51:43 +0200 Subject: [PATCH 25/28] made Windows deploy --- .github/workflows/deploy-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-windows.yml b/.github/workflows/deploy-windows.yml index 258d1582..747f2877 100644 --- a/.github/workflows/deploy-windows.yml +++ b/.github/workflows/deploy-windows.yml @@ -2,7 +2,7 @@ name: deploy-windows on: push: branches: - - LESTO_project1 + - test_arm release: types: - published From 7ebeb76548c85987bb71281d610a12f085541e64 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Sat, 7 Mar 2026 05:41:58 +0100 Subject: [PATCH 26/28] Update deploy workflow for macOS Removed ZIP packaging step and added ad-hoc signing for .app bundle. --- .github/workflows/deploy-macos.yml | 36 +++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 30d53546..40ea8901 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -3,7 +3,7 @@ name: deploy-macos on: push: branches: - - test_arm1 + - test_arm release: types: - published @@ -134,15 +134,6 @@ jobs: echo "Smoke test passed" - - # ------------------------- - # ZIP packaging - # ------------------------- - - name: Create zip archive for GitHub release - run: | - cd ${{ github.workspace }} - zip -r ${{ steps.strings2.outputs.deploy-output-name }} ${{ steps.strings.outputs.deploy-name }} - # ------------------------- # DMG packaging (system Qt) # ------------------------- @@ -159,6 +150,31 @@ jobs: /Users/runner/miniconda3/envs/GEMSGUI/lib/qt6/bin/macdeployqt gem-selektor.app -verbose=2 -dmg mv gem-selektor.dmg "${{ github.workspace }}/macos-${{ steps.strings.outputs.deploy-name }}.dmg" + + - name: Ad-hoc sign .app bundle + run: | + cd "${{ steps.strings2.outputs.deploy-output-dir }}" + + echo "Removing quarantine flags..." + xattr -dr com.apple.quarantine gem-selektor.app || true + + echo "Ad-hoc signing bundle..." + codesign --force --deep --sign - gem-selektor.app + + echo "Verifying signature..." + codesign --verify --deep --strict gem-selektor.app + spctl --assess --verbose gem-selektor.app || true + + + # ------------------------- + # ZIP packaging + # ------------------------- + - name: Create zip archive for GitHub release + run: | + cd ${{ github.workspace }} + zip -r ${{ steps.strings2.outputs.deploy-output-name }} ${{ steps.strings.outputs.deploy-name }} + + # ------------------------- # Upload artifacts # ------------------------- From 5fdc6b63266d8967807ce32147e35612757d4077 Mon Sep 17 00:00:00 2001 From: svetad Date: Tue, 10 Mar 2026 13:20:27 +0200 Subject: [PATCH 27/28] Use a fixed path to help files, and remove from the GUI the path to 'doc/html'. --- GUI/Dialogs4/HelpWindow.cpp | 2 +- GUI/Dialogs4/SettingsDialog.cpp | 22 +- GUI/Dialogs4/SettingsDialog4.ui | 500 +++++++++++++++----------------- GUI/Services4/visor.cpp | 11 +- GUI/Services4/visor.h | 23 -- Modules/gemsgui_version.h | 2 +- 6 files changed, 244 insertions(+), 316 deletions(-) diff --git a/GUI/Dialogs4/HelpWindow.cpp b/GUI/Dialogs4/HelpWindow.cpp index 3796f083..a394c93a 100644 --- a/GUI/Dialogs4/HelpWindow.cpp +++ b/GUI/Dialogs4/HelpWindow.cpp @@ -108,7 +108,7 @@ HelpWindow::HelpWindow( QWidget* parent): //End Ui form - QString collectionFile = QString( pVisor->docDir().c_str() )+ QLatin1String("gems3help.qhc"); + QString collectionFile = QString::fromStdString(pVisor->localDocDir())+ QLatin1String("gems3help.qhc"); // "/home/gems/gemworks/gems3/shared/doc/html/gems3help.qhc"; findLine = nullptr; diff --git a/GUI/Dialogs4/SettingsDialog.cpp b/GUI/Dialogs4/SettingsDialog.cpp index 9b5be9e2..4b43eae1 100644 --- a/GUI/Dialogs4/SettingsDialog.cpp +++ b/GUI/Dialogs4/SettingsDialog.cpp @@ -37,20 +37,15 @@ SettingsDialog::SettingsDialog (QWidget* parent) setWindowTitle( "GEM-Selektor: Settings and preferences" ); ui->pUpdateInterval->setValue( pVisorImp->updateInterval() ); - ui->comboBox->setCurrentIndex(pVisorImp->getColorScheme()); - ui->pLocalDocDir->setText(pVisor->localDocDir().c_str()); - ui->pRemoteHTML->setText(pVisor->remoteHTML().c_str()); - //pLocalDoc->setChecked(pVisor->localDoc()); - //pRemoteDoc->setChecked(!pVisor->localDoc()); - ui->pSysDBDir->setText(pVisor->sysGEMDir().c_str()); - ui->pUserDBDir->setText(pVisor->userGEMDir().c_str()); - ui->pUserDBDir->setText(pVisor->userProfDir().c_str()); + ui->pLocalDocDir->setText(QString::fromStdString(pVisor->localDocDir())); + ui->pSysDBDir->setText(QString::fromStdString(pVisor->sysGEMDir())); + //ui->pUserDBDir->setText(pVisor->userGEMDir().c_str()); + ui->pUserDBDir->setText(QString::fromStdString(pVisor->userProfDir())); ui->pFontRawName->setText(cellFont.toString()); ui->pNumDigits->setValue(pVisor->getDoubleDigits()); ui->pUpdateInterval->setValue(pVisorImp->updateInterval()); ui->pConfigAutosave->setChecked(pVisor->getConfigAutosave()); - // pConfigAutosave->setChecked( true ); if( pVisor->getElemPrMode() ) { ui->rbNewPrMode->setChecked( true ); @@ -86,21 +81,14 @@ void SettingsDialog::accept() void SettingsDialog::CmApply() { pVisorImp->setCellFont(cellFont); - pVisorImp->setColorScheme(ui->comboBox->currentIndex()); pVisor->setDoubleDigits(ui->pNumDigits->value()); pVisorImp->setUpdateInterval( ui->pUpdateInterval->value() ); pVisor->setConfigAutosave( ui->pConfigAutosave->isChecked() ); pVisor->setElemPrMode(ui->rbNewPrMode->isChecked()); - - pVisor->setLocalDocDir(ui->pLocalDocDir->text().toStdString()); - pVisor->setRemoteHTML(ui->pRemoteHTML->text().toStdString()); - + //pVisor->setLocalDocDir(ui->pLocalDocDir->text().toStdString()); pVisor->setDefaultBuiltinTDB(ui->pBuiltinTDB->text().toStdString()); - qApp->styleHints()->setColorScheme(static_cast(pVisorImp->getColorScheme())); - //pVisor->setLocalDoc(pLocalDoc->isChecked()); - //pVisorImp->Update(true); } diff --git a/GUI/Dialogs4/SettingsDialog4.ui b/GUI/Dialogs4/SettingsDialog4.ui index 14b59b20..d43c4aaa 100644 --- a/GUI/Dialogs4/SettingsDialog4.ui +++ b/GUI/Dialogs4/SettingsDialog4.ui @@ -32,6 +32,242 @@ true + + + + Here you can change font for the data screen forms + + + Change &font... + + + Alt+H + + + + + + + Font in data fields + + + false + + + pFontRawName + + + + + + + Currently applied font for data screen forms + + + + + + + QFrame::Shape::HLine + + + QFrame::Shadow::Sunken + + + + + + + + 0 + 0 + + + + Creation/Extension of Modelling Projects + + + + + + Keyword of default built-in TDB + + + + + + + + 0 + 0 + + + + Here, type a TDB name that will be used by default when a new independent project is created + + + + + + + Switch on to select elements and copy all related data from default database into new project + + + &Make an independent project + + + true + + + + + + + Switch on to select files from default database and link them to form a new project + + + Make a project with &linked built-in TDB files + + + + + + + + + + + Auto + + + + + Light + + + + + Dark + + + + + + + + Automatically save configuration on exit + + + true + + + + + + + Color Scheme + + + + + + + + 0 + 0 + + + + Database Folders + + + + + + Program resources folder + + + false + + + + + + + + 0 + 0 + + + + QFrame::Shape::Panel + + + QFrame::Shadow::Sunken + + + false + + + + + + + User's projects folder + + + false + + + + + + + + 0 + 0 + + + + QFrame::Shape::Panel + + + QFrame::Shadow::Sunken + + + false + + + + + + + Help file + + + + + + + + 0 + 0 + + + + QFrame::Shape::Panel + + + QFrame::Shadow::Sunken + + + false + + + + + + @@ -211,249 +447,6 @@ - - - - Color Scheme - - - - - - - QFrame::Shape::HLine - - - QFrame::Shadow::Sunken - - - - - - - - 0 - 0 - - - - Database Folders - - - - - - Program resources folder - - - false - - - - - - - - 0 - 0 - - - - QFrame::Shape::Panel - - - QFrame::Shadow::Sunken - - - false - - - - - - - User's projects folder - - - false - - - - - - - - 0 - 0 - - - - QFrame::Shape::Panel - - - QFrame::Shadow::Sunken - - - false - - - - - - - - - - - 0 - 0 - - - - Paths to Help Contents - - - - - - Help file - - - - - - - - 0 - 0 - - - - - - - - &HTML source - - - - - - - true - - - - 0 - 0 - - - - - - - - - - - Currently applied font for data screen forms - - - - - - - - 0 - 0 - - - - Creation/Extension of Modelling Projects - - - - - - Keyword of default built-in TDB - - - - - - - - 0 - 0 - - - - Here, type a TDB name that will be used by default when a new independent project is created - - - - - - - Switch on to select elements and copy all related data from default database into new project - - - &Make an independent project - - - true - - - - - - - Switch on to select files from default database and link them to form a new project - - - Make a project with &linked built-in TDB files - - - - - - - - - - Font in data fields - - - false - - - pFontRawName - - - - - - - Here you can change font for the data screen forms - - - Change &font... - - - Alt+H - - - - - - - Automatically save configuration on exit - - - true - - - @@ -461,31 +454,10 @@ - - - - - Auto - - - - - Light - - - - - Dark - - - - - pLocalDocDir - pRemoteHTML rbNewPrMode rbOldPrMode pNumDigits diff --git a/GUI/Services4/visor.cpp b/GUI/Services4/visor.cpp index c2c49273..008a9d78 100644 --- a/GUI/Services4/visor.cpp +++ b/GUI/Services4/visor.cpp @@ -60,7 +60,6 @@ const char *VISOR_DAT = "visor.data/visor.dat"; const char *DEFAULT_DB_DIR = "DB.default/"; const char *IMAGES_SRC_DIR = "img/"; const char *HELP_DB_DIR = "help/"; -const char *HELP_SRC_DIR = "doc/html/"; const char *RESOURCES_DIR = "/Resources/"; const char *DEFAULT_USER_DIR= "/Library/Gems3/"; const char *DEFAULT_PR_DIR= "projects/"; @@ -282,9 +281,6 @@ TVisor::TVisor(int c, char *v[]): // LocalDir = userGEMDir(); LocalDocDir = SysGEMDir + HELP_DB_DIR; - //RemoteDocURL = "http://gems.web.psi.ch/doc/html/"; - RemoteHTML = SysGEMDir + HELP_SRC_DIR; - LocalDoc = true; DefaultBuiltinTDB = "psi-nagra"; // PSI-Nagra TDB update TT 03.04.2013 // DefaultBuiltinTDB = "kernel"; temporary for using old Nagra-PSI (2003) dataset // DefaultBuiltinTDB = "psinagra"; // To be used after update to PSI-Nagra 2012 @@ -303,7 +299,6 @@ TVisor::TVisor(int c, char *v[]): gui_logger->info("UserGEM : {}", UserGEMDir); gui_logger->debug("UserProj : {}", UserProfDir); gui_logger->debug("LocalDoc : {}", LocalDocDir); - gui_logger->debug("LocalHTML: {}", RemoteHTML); } TVisor::~TVisor() @@ -704,8 +699,6 @@ void TVisor::toSettingsCFG() win_cfg_object["config_autosave"] = pVisor->getConfigAutosave(); win_cfg_object["local_dir"] = QString::fromStdString(LocalDir); win_cfg_object["local_doc_dir"] = QString::fromStdString(LocalDocDir); - win_cfg_object["remote_doc_url"] = QString::fromStdString(RemoteHTML); - win_cfg_object["local_doc"] = LocalDoc; win_cfg_object["current_mode"] = ProfileMode; win_cfg_object["current_project"] = rt[RT_PARAM]->PackKey(); win_cfg_object["current_system"] = rt[RT_SYSEQ]->PackKey(); @@ -750,9 +743,7 @@ void TVisor::fromSettingsCFG() pVisor->setDoubleDigits(visor_conf.value_or_default("double_precision", pVisor->getDoubleDigits())); pVisor->setConfigAutosave(visor_conf.value_or_default("config_autosave", pVisor->getConfigAutosave())); setLocalDir(visor_conf.value_or_default("local_dir", LocalDir)); - setLocalDocDir(visor_conf.value_or_default("local_doc_dir", LocalDocDir)); - setRemoteHTML(visor_conf.value_or_default("remote_doc_url", RemoteHTML)); - setLocalDoc(visor_conf.value_or_default("local_doc", LocalDoc)); + //setLocalDocDir(visor_conf.value_or_default("local_doc_dir", LocalDocDir)); ProfileMode = visor_conf.value_or_default("current_mode", ProfileMode); setDefaultBuiltinTDB(visor_conf.value_or_default("default_built_in_TDB", DefaultBuiltinTDB)); lastProjectKey = visor_conf.value_or_default("current_project", lastProjectKey); diff --git a/GUI/Services4/visor.h b/GUI/Services4/visor.h index 0a3afcaa..fbc53cb3 100644 --- a/GUI/Services4/visor.h +++ b/GUI/Services4/visor.h @@ -52,8 +52,6 @@ class TVisor //std::string ServerGems3Dir; std::string LocalDocDir; - std::string RemoteHTML; - bool LocalDoc; // obsolete std::string ImgDir; bool isElementsProfileMode = true; @@ -139,30 +137,9 @@ class TVisor LocalDir = localDir; } - std::string docDir() const { - return LocalDocDir; - // return (LocalDoc) ? LocalDocDir : RemoteDocURL; - } const std::string& localDocDir() const { return LocalDocDir; } - void setLocalDocDir(const std::string& localDir) { - LocalDocDir = localDir; - } - - const std::string& remoteHTML() const { - return RemoteHTML; - } - void setRemoteHTML(const std::string& remoteURL) { - RemoteHTML = remoteURL; - } - - bool localDoc() const { // obsolete - return LocalDoc; - } - void setLocalDoc(bool local) { // obsolete - LocalDoc = local; - } // const std::string& serverGems3Dir() const { // return ServerGems3Dir; diff --git a/Modules/gemsgui_version.h b/Modules/gemsgui_version.h index 0329dfa7..a8d440c3 100644 --- a/Modules/gemsgui_version.h +++ b/Modules/gemsgui_version.h @@ -1,7 +1,7 @@ #pragma once #define GEMSGUI_VERSION "3.11.1" -#define GEMSGUI_VERSION_HASH "774c9e0f" +#define GEMSGUI_VERSION_HASH "43515f17" #define GEMSGUI_GIT_BRANCH "test_arm" #define GEMSGUI_OSX "Linux" #define GEMSGUI_COMPILER_ID "GNU" From a8641c3e9326ef38114b77c90599335ade7eeaf8 Mon Sep 17 00:00:00 2001 From: George Dan Miron <44091914+gdmiron@users.noreply.github.com> Date: Wed, 11 Mar 2026 11:04:04 +0100 Subject: [PATCH 28/28] Refactor macOS deployment workflow Updated deployment workflow for macOS to remove DMG creation and add DMG packaging step with signing. --- .github/workflows/deploy-macos.yml | 59 ++++++++++-------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/.github/workflows/deploy-macos.yml b/.github/workflows/deploy-macos.yml index 40ea8901..0aea660b 100644 --- a/.github/workflows/deploy-macos.yml +++ b/.github/workflows/deploy-macos.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-14 ] # arm64 runner by default + os: [ macos-14 ] conda_platform: [ osx-arm64 ] artifact_name: [ gemsgui-macos ] @@ -78,7 +78,6 @@ jobs: ninja ninja install - # ------------------------- # Post-install adjustments # ------------------------- @@ -92,22 +91,13 @@ jobs: - name: Install timeout tool run: brew install coreutils -# ------------------------- + # ------------------------- # Verify architecture + smoke test GUI app # ------------------------- - name: Verify runner architecture run: | echo "uname -m:" uname -m - echo "RUNNER_ARCH:" - echo "$RUNNER_ARCH" - echo "CPU brand:" - sysctl -n machdep.cpu.brand_string - - echo "Compiler target:" - clang -v 2>&1 | grep Target - - echo "If uname -m != arm64, fail." if [ "$(uname -m)" != "arm64" ]; then echo "ERROR: Not running on ARM64 runner" exit 1 @@ -116,55 +106,45 @@ jobs: - name: Smoke test GEMSGUI run: | APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor" - - echo "Running smoke test with timeout:" set +e gtimeout 10 "$APP" -u "$HOME/gems-user-dir" EXIT_CODE=$? set -e - - if [ "$EXIT_CODE" -eq 0 ]; then - echo "App exited normally (rare but OK)" - elif [ "$EXIT_CODE" -eq 124 ]; then - echo "App timed out (expected for GUI) — smoke test passed" - else + if [ "$EXIT_CODE" -ne 124 ] && [ "$EXIT_CODE" -ne 0 ]; then echo "App crashed with exit code $EXIT_CODE" exit 1 fi - echo "Smoke test passed" - # ------------------------- - # DMG packaging (system Qt) + # macdeployqt (NO DMG) # ------------------------- - - name: Clean previous DMG - run: | - hdiutil detach /Volumes/gem-selektor || true - rm -f gem-selektor.dmg - - - name: Create DMG with macdeployqt + - name: Run macdeployqt (no DMG) shell: bash -l {0} run: | conda activate GEMSGUI cd "${{ steps.strings2.outputs.deploy-output-dir }}" - /Users/runner/miniconda3/envs/GEMSGUI/lib/qt6/bin/macdeployqt gem-selektor.app -verbose=2 -dmg - mv gem-selektor.dmg "${{ github.workspace }}/macos-${{ steps.strings.outputs.deploy-name }}.dmg" - + /Users/runner/miniconda3/envs/GEMSGUI/lib/qt6/bin/macdeployqt gem-selektor.app -verbose=2 + # ------------------------- + # Ad-hoc signing + # ------------------------- - name: Ad-hoc sign .app bundle run: | cd "${{ steps.strings2.outputs.deploy-output-dir }}" - - echo "Removing quarantine flags..." xattr -dr com.apple.quarantine gem-selektor.app || true - - echo "Ad-hoc signing bundle..." codesign --force --deep --sign - gem-selektor.app - - echo "Verifying signature..." codesign --verify --deep --strict gem-selektor.app - spctl --assess --verbose gem-selektor.app || true + # ------------------------- + # Create DMG (signed app inside) + # ------------------------- + - name: Create DMG + run: | + cd "${{ steps.strings2.outputs.deploy-output-dir }}" + hdiutil create -volname gem-selektor \ + -srcfolder gem-selektor.app \ + -ov -format UDZO gem-selektor.dmg + mv gem-selektor.dmg "${{ github.workspace }}/macos-${{ steps.strings.outputs.deploy-name }}.dmg" # ------------------------- # ZIP packaging @@ -174,7 +154,6 @@ jobs: cd ${{ github.workspace }} zip -r ${{ steps.strings2.outputs.deploy-output-name }} ${{ steps.strings.outputs.deploy-name }} - # ------------------------- # Upload artifacts # -------------------------