From 24fbb48167c62ac185a9b312725a5e2143caca13 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 18:19:15 -0700
Subject: [PATCH 01/29] Switch from micromamba action to miniforge

---
 .github/workflows/test.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 84cbf2d..75371ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ env:
   BUILD_DIR: _build
 
 jobs:
-  build-and-test:
+  build-test-unix:
     if:
       github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
 
@@ -19,18 +19,23 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - uses: mamba-org/setup-micromamba@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
-          micromamba-version: latest
+          miniforge-version: latest
+          activate-environment: fbld
           environment-file: environment.yml
 
+      - name: Show conda installation info
+        run: |
+          conda info
+          conda list
+
       - name: Build and install HeatModelF
         run: |
           pushd ./external/bmi-example-fortran

From 4d2a58777703ceeb7382cf9dfc59278defb19dd3 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 18:20:36 -0700
Subject: [PATCH 02/29] Only test on python=3.13

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75371ee..8c3fea4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 env:
   BUILD_DIR: _build
+  PYTHON_VERSION: 3.13
 
 jobs:
   build-test-unix:
@@ -30,6 +31,7 @@ jobs:
           miniforge-version: latest
           activate-environment: fbld
           environment-file: environment.yml
+          python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Show conda installation info
         run: |

From 5508b17762eb55fc1f266ce5265335f1f54f2f2b Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 18:22:19 -0700
Subject: [PATCH 03/29] Set up Windows job

---
 .github/workflows/test.yml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c3fea4..0138469 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -59,3 +59,39 @@ jobs:
         run: |
           python heatf_ex.py
           python pymt_heatf_ex.py
+
+  build-test-windows:
+    if:
+      github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+
+    runs-on: windows-latest
+
+    defaults:
+      run:
+        shell: pwsh
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          miniforge-version: latest
+          activate-environment: fbld
+          environment-file: environment.yml
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Show conda installation info
+        run: |
+          conda info
+          conda list
+
+      - name: Build and install HeatModelF
+        run: |
+          pushd ./external/bmi-example-fortran
+          cmake -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
+          cmake --build ${{ env.BUILD_DIR }} --target install --config Release
+          popd
+
+      - name: Build and install package
+        run: |
+          make install

From e1667896f690bb2537070b9d4afcf95c32b3ae52 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 18:37:06 -0700
Subject: [PATCH 04/29] Checkout submodule on Windows

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0138469..435e414 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -72,6 +72,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
+
       - uses: ilammy/msvc-dev-cmd@v1
       - uses: conda-incubator/setup-miniconda@v3
         with:

From bf375a68ae56a0db62c1056069d8e8c38b2b8e47 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 18:48:04 -0700
Subject: [PATCH 05/29] Back to micromamba, I guess

---
 .github/workflows/test.yml | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 435e414..d0e4518 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,6 @@ on: [push, pull_request]
 
 env:
   BUILD_DIR: _build
-  PYTHON_VERSION: 3.13
 
 jobs:
   build-test-unix:
@@ -26,17 +25,10 @@ jobs:
         with:
           submodules: true
 
-      - uses: conda-incubator/setup-miniconda@v3
+      - uses: mamba-org/setup-micromamba@v2
         with:
-          miniforge-version: latest
-          activate-environment: fbld
+          micromamba-version: latest
           environment-file: environment.yml
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - name: Show conda installation info
-        run: |
-          conda info
-          conda list
 
       - name: Build and install HeatModelF
         run: |
@@ -76,17 +68,11 @@ jobs:
           submodules: true
 
       - uses: ilammy/msvc-dev-cmd@v1
-      - uses: conda-incubator/setup-miniconda@v3
+
+      - uses: mamba-org/setup-micromamba@v2
         with:
-          miniforge-version: latest
-          activate-environment: fbld
+          micromamba-version: latest
           environment-file: environment.yml
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - name: Show conda installation info
-        run: |
-          conda info
-          conda list
 
       - name: Build and install HeatModelF
         run: |

From 4cd86766199306af5b3f4be61f735aaf100e61cc Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 19:07:02 -0700
Subject: [PATCH 06/29] Set the FC environment variable

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d0e4518..6b49f8a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -74,6 +74,10 @@ jobs:
           micromamba-version: latest
           environment-file: environment.yml
 
+      - name: Set the FC environment variable to the Fortran conda compiler
+        run: |
+          echo "FC=flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
       - name: Build and install HeatModelF
         run: |
           pushd ./external/bmi-example-fortran

From a367e80589a552a93438668a606fe45f43317ae0 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 19:27:18 -0700
Subject: [PATCH 07/29] Use an absolute path to flang

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6b49f8a..6c29d59 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,7 +76,7 @@ jobs:
 
       - name: Set the FC environment variable to the Fortran conda compiler
         run: |
-          echo "FC=flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "FC=C:\Users\runneradmin\micromamba\envs\fbld\Library\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Build and install HeatModelF
         run: |

From a3cc21c33483924eef816e530061cbc5f30c5f99 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 19:57:11 -0700
Subject: [PATCH 08/29] Use ninja build backend

---
 .github/workflows/test.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6c29d59..ee7ec1c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,12 +78,14 @@ jobs:
         run: |
           echo "FC=C:\Users\runneradmin\micromamba\envs\fbld\Library\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      - name: Build and install HeatModelF
+      - name: View environment variables
         run: |
-          pushd ./external/bmi-example-fortran
-          cmake -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
+          ls env:
+
+      - name: Configure, build, and install HeatModelF
+        run: |
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=$env:CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
-          popd
 
       - name: Build and install package
         run: |

From 4243fc31ea6735624830b4d8db7591d29d7b171e Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 20:33:23 -0700
Subject: [PATCH 09/29] Set PREFIX environment variable

---
 .github/workflows/test.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ee7ec1c..bdeed06 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -74,9 +74,13 @@ jobs:
           micromamba-version: latest
           environment-file: environment.yml
 
-      - name: Set the FC environment variable to the Fortran conda compiler
+      - name: Set the PREFIX environment variable
         run: |
-          echo "FC=C:\Users\runneradmin\micromamba\envs\fbld\Library\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Set the FC environment variable
+        run: |
+          echo "FC=$env:PREFIX\Library\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: View environment variables
         run: |
@@ -84,8 +88,8 @@ jobs:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=$env:CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release
-          cmake --build ${{ env.BUILD_DIR }} --target install --config Release
+          cmake ./external/bmi-example-fortran -B $env:BUILD_DIR -LA -G Ninja -DCMAKE_INSTALL_PREFIX=$env:PREFIX -DCMAKE_BUILD_TYPE=Release
+          cmake --build $env:BUILD_DIR --target install --config Release
 
       - name: Build and install package
         run: |

From 75a191b9d8235c84bc4fda45f4c77a9cabbd7077 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Tue, 17 Dec 2024 20:56:23 -0700
Subject: [PATCH 10/29] Use contexts for env vars in cmake call

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bdeed06..dba7136 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,11 +76,11 @@ jobs:
 
       - name: Set the PREFIX environment variable
         run: |
-          echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld\Library" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Set the FC environment variable
         run: |
-          echo "FC=$env:PREFIX\Library\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "FC=$env:PREFIX\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: View environment variables
         run: |
@@ -88,8 +88,8 @@ jobs:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B $env:BUILD_DIR -LA -G Ninja -DCMAKE_INSTALL_PREFIX=$env:PREFIX -DCMAKE_BUILD_TYPE=Release
-          cmake --build $env:BUILD_DIR --target install --config Release
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_BUILD_TYPE=Release
+          cmake --build ${{ env.BUILD_DIR }} --target install --config Release
 
       - name: Build and install package
         run: |

From 92fb7542bb0131469dac526354ae9f8aec779727 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Wed, 18 Dec 2024 10:45:13 -0700
Subject: [PATCH 11/29] Make a LINKER variable pointing to the VS linker

---
 .github/workflows/test.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dba7136..3e23ab2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -82,13 +82,17 @@ jobs:
         run: |
           echo "FC=$env:PREFIX\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
+      - name: Make a LINKER environment variable
+        run: |
+          echo "LINKER=$env:VCToolsInstallDir/bin/Host$env:RUNNER_ARCH/$env:Platform/link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
       - name: View environment variables
         run: |
           ls env:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_BUILD_TYPE=Release
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_LINKER=${{ env.LINKER }} -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
 
       - name: Build and install package

From a64c012175cf5c99d1c90e5c8fa671d8b11b41db Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Wed, 18 Dec 2024 11:12:54 -0700
Subject: [PATCH 12/29] Quote LINKER variable in cmake call

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3e23ab2..e04fb9c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -84,7 +84,7 @@ jobs:
 
       - name: Make a LINKER environment variable
         run: |
-          echo "LINKER=$env:VCToolsInstallDir/bin/Host$env:RUNNER_ARCH/$env:Platform/link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: View environment variables
         run: |
@@ -92,7 +92,7 @@ jobs:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_LINKER=${{ env.LINKER }} -DCMAKE_BUILD_TYPE=Release
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_LINKER="${{ env.LINKER }}" -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
 
       - name: Build and install package

From 66e102e4111e83300a8a0c21f231a461773f0ff1 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Thu, 19 Dec 2024 13:00:42 -0700
Subject: [PATCH 13/29] Checkout bmi-example-fortran v2.1.4

---
 external/bmi-example-fortran | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/bmi-example-fortran b/external/bmi-example-fortran
index 98b4e33..74df8d8 160000
--- a/external/bmi-example-fortran
+++ b/external/bmi-example-fortran
@@ -1 +1 @@
-Subproject commit 98b4e3394db6f2b032d8945c125e77435c6d5d03
+Subproject commit 74df8d888433c43fc7f7b96109a445bead9972d2

From 20a8f4f426d6cc7995fa1c88ba2c51546e8e0fe1 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Thu, 19 Dec 2024 13:17:46 -0700
Subject: [PATCH 14/29] Restructure for flang 19

---
 .github/workflows/test.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e04fb9c..bb0d133 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -73,6 +73,8 @@ jobs:
         with:
           micromamba-version: latest
           environment-file: environment.yml
+          init-shell: >-
+            powershell
 
       - name: Set the PREFIX environment variable
         run: |
@@ -80,11 +82,11 @@ jobs:
 
       - name: Set the FC environment variable
         run: |
-          echo "FC=$env:PREFIX\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "FC=$env:PREFIX\bin\flang-new.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      - name: Make a LINKER environment variable
-        run: |
-          echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # - name: Make a LINKER environment variable
+      #   run: |
+      #     echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: View environment variables
         run: |
@@ -92,7 +94,7 @@ jobs:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_LINKER="${{ env.LINKER }}" -DCMAKE_BUILD_TYPE=Release
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
 
       - name: Build and install package

From a36cef4a73213f582894c8aa5e309aedbcd68451 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Thu, 19 Dec 2024 13:40:39 -0700
Subject: [PATCH 15/29] Use build isolation with pip install

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 620a8a0..648a886 100644
--- a/Makefile
+++ b/Makefile
@@ -87,4 +87,4 @@ dist: clean ## builds source and wheel package
 	ls -l dist
 
 install: clean ## install the package to the active Python's site-packages
-	python -m pip install . -v
+	python -m pip install . -v --no-build-isolation

From de31738039019f6dd70eb2dc5df47ed2892ea077 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Thu, 19 Dec 2024 13:41:40 -0700
Subject: [PATCH 16/29] CONDA_PREFIX is now available

---
 .github/workflows/test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bb0d133..e5017e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,13 +76,13 @@ jobs:
           init-shell: >-
             powershell
 
-      - name: Set the PREFIX environment variable
-        run: |
-          echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld\Library" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # - name: Set the PREFIX environment variable
+      #   run: |
+      #     echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld\Library" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Set the FC environment variable
         run: |
-          echo "FC=$env:PREFIX\bin\flang-new.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "FC=$env:CONDA_PREFIX\Library\bin\flang-new.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
       # - name: Make a LINKER environment variable
       #   run: |
@@ -94,7 +94,7 @@ jobs:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_BUILD_TYPE=Release
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.CONDA_PREFIX }} -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
 
       - name: Build and install package

From b20157d1cc0d9e4df70f382c4d0db48115abfbe8 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Thu, 19 Dec 2024 13:57:36 -0700
Subject: [PATCH 17/29] Push MSVC link.exe to front of path

---
 .github/workflows/test.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e5017e8..8e9d350 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -88,6 +88,14 @@ jobs:
       #   run: |
       #     echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
+      - name: Make a LINK_DIR environment variable for MSVC link.exe
+        run: |
+          echo "LINK_DIR=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Push location of MSVC link.exe to the front of the path
+        run: |
+          echo "Path=$env:LINK_DIR;$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
       - name: View environment variables
         run: |
           ls env:

From 43f829fe38bd884e6e411880179e9c18f478145e Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Thu, 19 Dec 2024 14:33:05 -0700
Subject: [PATCH 18/29] Remove the link.exe in the Git install

---
 .github/workflows/test.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8e9d350..c45f003 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -88,13 +88,21 @@ jobs:
       #   run: |
       #     echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      - name: Make a LINK_DIR environment variable for MSVC link.exe
-        run: |
-          echo "LINK_DIR=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # - name: Make a LINK_DIR environment variable for MSVC link.exe
+      #   run: |
+      #     echo "LINK_DIR=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      # - name: Push location of MSVC link.exe to the front of the path
+      #   run: |
+      #     echo "Path=$env:LINK_DIR;$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      # - name: Force location of MSVC link.exe to the front of the path
+      #   run: |
+      #     echo "$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Push location of MSVC link.exe to the front of the path
+      - name: Remove link.exe in the Git install
         run: |
-          echo "Path=$env:LINK_DIR;$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Remove-Item -Path C:\Program Files\Git\usr\bin\link.exe -Force
 
       - name: View environment variables
         run: |

From 8286103c49cc98b8c99a40e19260c372bbb38d3f Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Thu, 19 Dec 2024 14:39:08 -0700
Subject: [PATCH 19/29] Quote path to link.exe

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c45f003..2b9dff4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -102,7 +102,7 @@ jobs:
 
       - name: Remove link.exe in the Git install
         run: |
-          Remove-Item -Path C:\Program Files\Git\usr\bin\link.exe -Force
+          Remove-Item -Path "C:\Program Files\Git\usr\bin\link.exe" -Force
 
       - name: View environment variables
         run: |

From d986152a0f43cd498c4373fcc4111e1f24c50e0e Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 11:30:06 -0700
Subject: [PATCH 20/29] Use dependency function and pkg-config to find deps

---
 meson.build | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 185c30f..9368d3b 100644
--- a/meson.build
+++ b/meson.build
@@ -25,10 +25,13 @@ incs = include_directories(
     ]
 )
 
+bmif_dep = dependency('bmif', method: 'pkg-config')
+heatf_dep = dependency('heatf', method: 'pkg-config')
+bmiheatf_dep = dependency('bmiheatf', method: 'pkg-config')
 deps = [
-    fc.find_library('bmif'),
-    fc.find_library('heatf'),
-    fc.find_library('bmiheatf'),
+    bmif_dep,
+    heatf_dep,
+    bmiheatf_dep,
     py.dependency(),
 ]
 

From d658e7264b9ef25c8b2382cef81ee98c08dfe852 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 11:47:04 -0700
Subject: [PATCH 21/29] Use LIBRARY_PREFIX env var to install HeatModelF

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2b9dff4..9850db4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,6 +58,9 @@ jobs:
 
     runs-on: windows-latest
 
+    env:
+      LIBRARY_PREFIX: $env:CONDA_PREFIX\Library
+
     defaults:
       run:
         shell: pwsh
@@ -110,7 +113,7 @@ jobs:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.CONDA_PREFIX }} -DCMAKE_BUILD_TYPE=Release
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.LIBRARY_PREFIX }} -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
 
       - name: Build and install package

From 4a972b1bf8c1b32528753141622366239600c124 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 12:07:46 -0700
Subject: [PATCH 22/29] Try to best match working example

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9850db4..33ca95a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -113,8 +113,10 @@ jobs:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.LIBRARY_PREFIX }} -DCMAKE_BUILD_TYPE=Release
+          pushd ./external/bmi-example-fortran 
+          cmake -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX="${{ env.LIBRARY_PREFIX }}"" -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
+          popd
 
       - name: Build and install package
         run: |

From a37ddf37be1ab7bfecb7e80d23491b1d764811f2 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 12:13:42 -0700
Subject: [PATCH 23/29] Thanks, VS Code

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33ca95a..283072f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -114,7 +114,7 @@ jobs:
       - name: Configure, build, and install HeatModelF
         run: |
           pushd ./external/bmi-example-fortran 
-          cmake -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX="${{ env.LIBRARY_PREFIX }}"" -DCMAKE_BUILD_TYPE=Release
+          cmake -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX="${{ env.LIBRARY_PREFIX }}" -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
           popd
 

From fdcfd1184201934390e6ae22530b3defb30b1791 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 13:04:07 -0700
Subject: [PATCH 24/29] Append conda libpath to Windows LIB

---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 283072f..2eef9c5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -107,9 +107,14 @@ jobs:
         run: |
           Remove-Item -Path "C:\Program Files\Git\usr\bin\link.exe" -Force
 
+      - name: Add conda environment libpath to Windows LIB (not LIBPATH)
+        run: |
+          echo "LIB=$env:LIB;$env:CONDA_PREFIX\Library\lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
       - name: View environment variables
         run: |
           ls env:
+          ls env:LIB
 
       - name: Configure, build, and install HeatModelF
         run: |

From 03f74b2ef6aeadab424f8700eda7cbad57c49c72 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 13:32:14 -0700
Subject: [PATCH 25/29] Add tests

---
 .github/workflows/test.yml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2eef9c5..1423401 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,9 +41,14 @@ jobs:
         run: |
           make install
 
-      - name: Test BMI
+      - name: Test imports
+        working-directory: ${{ github.workspace }}/examples
         run: |
           python -c 'import pymt_heatf'
+          python -c 'from pymt.models import HeatModelF'
+
+      - name: Test BMI
+        run: |
           make test
 
       - name: Run examples
@@ -126,3 +131,19 @@ jobs:
       - name: Build and install package
         run: |
           make install
+
+      - name: Test imports
+        working-directory: ${{ github.workspace }}/examples
+        run: |
+          python -c 'import pymt_heatf'
+          python -c 'from pymt.models import HeatModelF'
+
+      - name: Test BMI
+        run: |
+          make test
+
+      - name: Run examples
+        working-directory: ${{ github.workspace }}/examples
+        run: |
+          python heatf_ex.py
+          python pymt_heatf_ex.py

From 104e9543d2044f2264d8822614551ef5083b0b20 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 13:55:01 -0700
Subject: [PATCH 26/29] Specify path to config file for bmi-tester

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1423401..772eeb9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -139,8 +139,9 @@ jobs:
           python -c 'from pymt.models import HeatModelF'
 
       - name: Test BMI
+        working-directory: ${{ github.workspace }}
         run: |
-          make test
+          bmi-test pymt_heatf._bmi:HeatModelF --config-file=${{ github.workspace }}/examples/test.cfg --root-dir=examples -vvv
 
       - name: Run examples
         working-directory: ${{ github.workspace }}/examples

From 9c417afc22939ac797d8d452dae6876cc37229ab Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 15:39:40 -0700
Subject: [PATCH 27/29] Also set absolute path to bmi-tester root dir

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 772eeb9..cdf1c06 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -141,7 +141,7 @@ jobs:
       - name: Test BMI
         working-directory: ${{ github.workspace }}
         run: |
-          bmi-test pymt_heatf._bmi:HeatModelF --config-file=${{ github.workspace }}/examples/test.cfg --root-dir=examples -vvv
+          bmi-test pymt_heatf._bmi:HeatModelF --config-file=${{ github.workspace }}\examples\test.cfg --root-dir=${{ github.workspace }}\examples -vvv
 
       - name: Run examples
         working-directory: ${{ github.workspace }}/examples

From 5fe69655a0c4ae958e13dacb1bb119394a755c7a Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 15:46:22 -0700
Subject: [PATCH 28/29] Don't run bmi-tester on Windows

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cdf1c06..e46518f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -138,10 +138,10 @@ jobs:
           python -c 'import pymt_heatf'
           python -c 'from pymt.models import HeatModelF'
 
-      - name: Test BMI
-        working-directory: ${{ github.workspace }}
-        run: |
-          bmi-test pymt_heatf._bmi:HeatModelF --config-file=${{ github.workspace }}\examples\test.cfg --root-dir=${{ github.workspace }}\examples -vvv
+      # - name: Test BMI
+      #   working-directory: ${{ github.workspace }}
+      #   run: |
+      #     bmi-test pymt_heatf._bmi:HeatModelF --config-file=${{ github.workspace }}\examples\test.cfg --root-dir=examples -vvv
 
       - name: Run examples
         working-directory: ${{ github.workspace }}/examples

From 10a7705cda0641da0e9d47ed4200017f961c0474 Mon Sep 17 00:00:00 2001
From: Mark Piper <mark.piper@colorado.edu>
Date: Fri, 20 Dec 2024 17:17:34 -0700
Subject: [PATCH 29/29] Add notes on workflow steps

---
 .github/workflows/test.yml | 26 +++++---------------------
 meson.build                |  3 ++-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e46518f..1b45de8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -84,34 +84,17 @@ jobs:
           init-shell: >-
             powershell
 
-      # - name: Set the PREFIX environment variable
-      #   run: |
-      #     echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld\Library" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
+      # The Fortran conda compiler, flang, needs to be set over the gfortran installed by chocolatety.
       - name: Set the FC environment variable
         run: |
           echo "FC=$env:CONDA_PREFIX\Library\bin\flang-new.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
-      # - name: Make a LINKER environment variable
-      #   run: |
-      #     echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-      # - name: Make a LINK_DIR environment variable for MSVC link.exe
-      #   run: |
-      #     echo "LINK_DIR=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-      # - name: Push location of MSVC link.exe to the front of the path
-      #   run: |
-      #     echo "Path=$env:LINK_DIR;$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-      # - name: Force location of MSVC link.exe to the front of the path
-      #   run: |
-      #     echo "$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
+      # A link.exe installed by chocolatey was ahead of the MSVC link.exe in the path.
       - name: Remove link.exe in the Git install
         run: |
           Remove-Item -Path "C:\Program Files\Git\usr\bin\link.exe" -Force
 
+      # The flang FortranRuntime.lib wasn't being found. This recommendation comes from the Meson docs.
       - name: Add conda environment libpath to Windows LIB (not LIBPATH)
         run: |
           echo "LIB=$env:LIB;$env:CONDA_PREFIX\Library\lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@@ -119,8 +102,8 @@ jobs:
       - name: View environment variables
         run: |
           ls env:
-          ls env:LIB
 
+      # The install prefix must be quoted.
       - name: Configure, build, and install HeatModelF
         run: |
           pushd ./external/bmi-example-fortran 
@@ -138,6 +121,7 @@ jobs:
           python -c 'import pymt_heatf'
           python -c 'from pymt.models import HeatModelF'
 
+      # Weird Windows stuff here. If the examples in the next step run to completion, the BMI works.
       # - name: Test BMI
       #   working-directory: ${{ github.workspace }}
       #   run: |
diff --git a/meson.build b/meson.build
index 9368d3b..adcb4cb 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'pymt_heatf',
     'c', 'cython', 'fortran',
-    version: '3.1.dev0',
+    version: '3.2.dev0',
     license: 'MIT',
 )
 
@@ -25,6 +25,7 @@ incs = include_directories(
     ]
 )
 
+# gfortran on Linux/macOS can find these libraries with fc.find_library(); flang 19 on Windows cannot.
 bmif_dep = dependency('bmif', method: 'pkg-config')
 heatf_dep = dependency('heatf', method: 'pkg-config')
 bmiheatf_dep = dependency('bmiheatf', method: 'pkg-config')