v0.9.3: close logger after execution; improve file handling during inputprocessing; handle some new matplotlib warnings

Author: MilosAtz

dassh/__init__.py

@@ -14,7 +14,7 @@
 # permissions and limitations under the License.
 ########################################################################
 """
-date: 2021-12-01
+date: 2021-12-06
 author: Milos Atz, Micheal Smith
 """
 ########################################################################
@@ -45,4 +45,4 @@
 np.set_printoptions(threshold=sys.maxsize, linewidth=500)
 
 
-__version__ = '0.9.2'
+__version__ = '0.9.3'

dassh/__main__.py

@@ -14,7 +14,7 @@
 # permissions and limitations under the License.
 ########################################################################
 """
-date: 2021-12-01
+date: 2021-12-06
 author: matz
 Main DASSH calculation procedure
 """
@@ -24,6 +24,7 @@
 import dassh
 import argparse
 import cProfile
+import logging
 _log_info = 20  # logging levels must be int
 
 
@@ -89,6 +90,9 @@ def main(args=None):
         pr.disable()
         pr.dump_stats('dassh_profile.out')
 
+    # Shutdown logger by removing file handlers
+    dassh.logged_class.shutdown_logger('dassh')
+
 
 def check_version(dassh_inp, dassh_log, save_reactor):
     """Check for DASSH limitations depending on Python version;

dassh/logged_class.py

@@ -14,7 +14,7 @@
 # permissions and limitations under the License.
 ########################################################################
 """
-date: 2021-11-24
+date: 2021-12-06
 author: matz (inherited from Dr. A. Nelson)
 Log messages, warnings, and errors produced by each class in DASSH
 """
@@ -111,6 +111,15 @@ def change_log_level_console(logger, new_level):
     return logger
 
 
+def shutdown_logger(name):
+    logger = logging.getLogger(name)
+    handlers = logger.handlers[:]
+    for handler in handlers:
+        handler.close()
+        logger.removeHandler(handler)
+    del logger
+
+
 class LoggedClass(object):
     """This class provides a consistent logger interface across
     classes.
@@ -199,3 +208,32 @@ def __exit__(self, et, ev, tb):
         if self.level is not None:
             self.logger.handlers[1].setLevel(self.old_level)
         # implicit return of None => don't swallow exceptions
+
+
+class CloseLogStreams(object):
+    """Temporarily redirect all logging messages to stdout and stderr
+    when pickling in Python < 3.7."""
+    def __init__(self, logger):
+        self.logger = logger
+
+    def __enter__(self):
+        if sys.version_info < (3, 7):
+            self.handler_info = []
+            handlers = self.logger.handlers[:]
+            for handler in handlers:
+                self.handler_info.append(
+                    [type(handler),
+                     handler.baseFilename,
+                     handler.mode,
+                     handler.level,
+                     handler.formatter])
+                handler.close()
+                self.logger.removeHandler(handler)
+
+    def __exit__(self):
+        if sys.version_info < (3, 7):
+            for h_info in self.handler_info:
+                handler = h_info[0](h_info[1], h_info[2])
+                handler.setLevel(h_info[3])
+                handler.setFormatter(h_info[4])
+            del self.handler_info

dassh/plot.py

@@ -14,7 +14,7 @@
 # permissions and limitations under the License.
 ########################################################################
 """
-date: 2021-12-01
+date: 2021-12-06
 author: matz
 Methods to plot DASSH objects (such as hexagonal fuel assemblies and
 the pins and subchannels that comprise them).
@@ -132,8 +132,7 @@ def make_SubchannelPlot(dassh_reactor, plot_data):
                               f'z={z_str}'])
             fname += '.png'
             fname = os.path.join(dassh_reactor.path, fname)
-            plt.savefig(fname, bbox_inches='tight', dpi=_data['dpi'])
-            plt.close()
+            _save_and_close(fname, _data['dpi'])
 
 
 def make_PinPlot(dassh_reactor, plot_data):
@@ -178,8 +177,7 @@ def make_PinPlot(dassh_reactor, plot_data):
                                   value, f'z={z_str}'])
                 fname += '.png'
                 fname = os.path.join(dassh_reactor.path, fname)
-                plt.savefig(fname, bbox_inches='tight', dpi=_data['dpi'])
-                plt.close()
+                _save_and_close(fname, _data['dpi'])
 
 
 def make_CoreSubchannelPlot(dassh_reactor, plot_data):
@@ -205,8 +203,7 @@ def make_CoreSubchannelPlot(dassh_reactor, plot_data):
         fname = '_'.join(['CoreSubchannelPlot', f'z={z_str}'])
         fname += '.png'
         fname = os.path.join(dassh_reactor.path, fname)
-        plt.savefig(fname, bbox_inches='tight', dpi=_data['dpi'])
-        plt.close()
+        _save_and_close(fname, _data['dpi'])
 
 
 def make_CorePinPlot(dassh_reactor, plot_data):
@@ -232,8 +229,7 @@ def make_CorePinPlot(dassh_reactor, plot_data):
             fname = '_'.join(['CorePinPlot', v, f'z={z_str}'])
             fname += '.png'
             fname = os.path.join(dassh_reactor.path, fname)
-            plt.savefig(fname, bbox_inches='tight', dpi=_data['dpi'])
-            plt.close()
+            _save_and_close(fname, _data['dpi'])
 
 
 def make_CoreHexPlot(dassh_reactor, plot_data):
@@ -1734,10 +1730,9 @@ def make_power(self, dassh_reactor, plot_data):
                   cmap=plot_data['cmap'],
                   cbar_label=cbl,
                   data_label=plot_data['data_label'])
-        fname = os.path.join(dassh_reactor.path,
-                             'CoreHexPlot_total_power.png')
-        plt.savefig(fname, bbox_inches='tight', dpi=plot_data['dpi'])
-        plt.close()
+        fname = 'CoreHexPlot_total_power.png'
+        fname = os.path.join(dassh_reactor.path, fname)
+        _save_and_close(fname, plot_data['dpi'])
 
     def make_axial_peak(self, dassh_reactor, plot_data, value):
         """Generate CoreHexPlot figure containing maximum temperature
@@ -1772,10 +1767,9 @@ def make_axial_peak(self, dassh_reactor, plot_data, value):
                   cbar_label=cbar_lab,
                   data_label=plot_data['data_label'],
                   omit_nonvalue_rings=plot_data['omit_nonvalue_rings'])
-        fname = os.path.join(dassh_reactor.path,
-                             f'CoreHexPlot_{value}.png',)
-        plt.savefig(fname, bbox_inches='tight', dpi=plot_data['dpi'])
-        plt.close()
+        fname = f'CoreHexPlot_{value}.png'
+        fname = os.path.join(dassh_reactor.path, fname)
+        _save_and_close(fname, plot_data['dpi'])
 
     def make_radial_peak_or_avg(self, dassh_reactor, plot_data, value):
         """Generate CoreHexPlot figure containing maximum temperature
@@ -1827,9 +1821,7 @@ def make_radial_peak_or_avg(self, dassh_reactor, plot_data, value):
                                   value,
                                   f'z={z_str}.png'])
                 fname = os.path.join(dassh_reactor.path, fname)
-                plt.savefig(fname, bbox_inches='tight',
-                            dpi=plot_data['dpi'])
-                plt.close()
+                _save_and_close(fname, plot_data['dpi'])
 
     def _get_cbar_label(self, plot_data, value):
         """If no colorbar label is provided, generate one based on
@@ -2285,6 +2277,14 @@ def plot_FH(self, data, lbnd=None, ubnd=None, middle=None,
 ########################################################################
 
 
+def _save_and_close(plot_file_path, dpi):
+    l = logging.getLogger('matplotlib.text')
+    l.setLevel(40)
+    plt.savefig(plot_file_path, bbox_inches='tight', dpi=dpi)
+    l.setLevel(30)
+    plt.close()
+
+
 def _prepare_input(dassh_reactor, plot_data, file_to_load):
     """Prepare and store data necessary to make any figure
 
@@ -2386,8 +2386,7 @@ def _add_colorbar(ax, text, cmap, norm):
     """
     divider = make_axes_locatable(ax)
     color_axis = divider.append_axes("right", size="5%", pad=0.1)
-    cbar_colors = mpl.cm.ScalarMappable(norm=norm,
-                                        cmap=cmap)
+    cbar_colors = mpl.cm.ScalarMappable(norm=norm, cmap=cmap)
     cbar = plt.colorbar(cbar_colors, cax=color_axis)
     cbar.set_label(text, fontsize=11)
     return ax

dassh/read_input.py

@@ -14,7 +14,7 @@
 # permissions and limitations under the License.
 ########################################################################
 """
-date: 2021-11-24
+date: 2021-12-06
 author: Milos Atz
 This module defines the object that reads the DASSH input file
 into Python data structures.
@@ -612,7 +612,8 @@ def get_input(self, infile):
         self.data = inp
 
     def get_timepoints(self, infile):
-        txt = open(infile).read().splitlines()
+        with open(infile, 'r') as f:
+            txt = f.read().splitlines()
         if self._cccc_power:
             tpts_cccc = self._get_cccc_timepoints(txt)
         else:
@@ -679,7 +680,8 @@ def check_inputfile_sections(self, inputfile):
         """Check that mandatory sections are present in the input.
         Note: RegionList is optional."""
         # Read from the input file
-        txt = open(inputfile).read()
+        with open(inputfile, 'r') as f:
+            txt = f.read()
         txtlines = txt.splitlines()
         for sec in ['Assembly', 'Core', 'Assignment', 'Power']:
             tmp = [i for i, s in enumerate(txtlines) if f'[{sec}]' in s]