address yet another windows github action failure mode re: NREL#365 (discovered in https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/14841017163/job/41663743419\?pr\=70)

Author: softwareengineerprogrammer

src/geophires_x/MatplotlibUtils.py

@@ -1,5 +1,8 @@
 """
 Workarounds for intermittent Windows GitHub Actions failures - see https://github.com/NREL/GEOPHIRES-X/issues/365
+
+TODO fix the actual Tcl/Tk installation issue (perhaps using suggestions from i.e.
+https://stackoverflow.com/questions/29320039/trying-to-use-tkinter-throws-tcl-error-cant-find-a-usable-init-tcl)
 """
 
 from __future__ import annotations
@@ -34,6 +37,13 @@ def plt_subplots(**kw_args) -> Any:
         _handle_tcl_error_on_windows_github_actions(e)
 
 
+def plt_figure(*args, **kw_args) -> Any:
+    try:
+        return plt.figure(*args, **kw_args)
+    except Exception as e:
+        _handle_tcl_error_on_windows_github_actions(e)
+
+
 def _handle_tcl_error_on_windows_github_actions(e) -> None:
     # Can't import TclError directly since Python is not configured for Tk on all systems
     tcl_error_name = 'TclError'

src/geophires_x/SUTRAReservoir.py

@@ -1,6 +1,6 @@
 import sys
 
-from .MatplotlibUtils import plt_show
+from .MatplotlibUtils import plt_show, plt_figure
 from .Parameter import strParameter, OutputParameter
 from .Units import *
 import geophires_x.Model as Model
@@ -211,7 +211,7 @@ def Calculate(self, model: Model):
 
         # create plots of imported SUTRA data
         plt.close('all')
-        plt.figure(1)
+        plt_figure(1)
         year = np.arange(1, 31, 1)  # make an array of days for plot x-axis
         plt.plot(year, abs(self.AnnualHeatStored.value), label='Annual Heat Stored')
         plt.plot(year, abs(self.AnnualHeatSupplied.value), label='Annual Heat Supplied')
@@ -222,7 +222,7 @@ def Calculate(self, model: Model):
         plt.title('SUTRA Heat Balance')
         plt_show(block=False)
 
-        plt.figure(2)
+        plt_figure(2)
         plt.plot(self.TimeProfile.value[0:-1:2], self.TargetHeat.value[0:-1:2], label='Target Heat')
         plt.plot(self.TimeProfile.value[0:-1:2], self.SimulatedHeat.value[0:-1:2], label='Simulated Heat')
         plt.xlabel('Hour')
@@ -232,7 +232,7 @@ def Calculate(self, model: Model):
         plt.title('SUTRA Target and Simulated Heat')
         plt_show(block=False)
 
-        plt.figure(3)
+        plt_figure(3)
         plt.plot(self.TimeProfile.value[0:-1:2], self.StorageWellFlowRate.value[0:-1:2], label='Storage Well Flow Rate')
         plt.plot(self.TimeProfile.value[0:-1:2], self.BalanceWellFlowRate.value[0:-1:2], label='Balance Well Flow Rate')
         plt.xlabel('Hour')
@@ -242,7 +242,7 @@ def Calculate(self, model: Model):
         plt.title('SUTRA Well Flow Rates')
         plt_show(block=False)
 
-        plt.figure(4)
+        plt_figure(4)
         plt.plot(self.TimeProfile.value[0:-1:2], self.StorageWellTemperature.value[0:-1:2], label='Storage Well Temperature')
         plt.plot(self.TimeProfile.value[0:-1:2], self.BalanceWellTemperature.value[0:-1:2], label='Balance Well Temperature')
         plt.xlabel('Hour')