diff --git a/armi/nuclearDataIO/xsNuclides.py b/armi/nuclearDataIO/xsNuclides.py index e11296a7e9..fc0b183ba5 100644 --- a/armi/nuclearDataIO/xsNuclides.py +++ b/armi/nuclearDataIO/xsNuclides.py @@ -240,11 +240,10 @@ def plotScatterMatrix(scatterMatrix, scatterTypeLabel="", fName=None): pyplot.colorbar() if fName: pyplot.savefig(fName) + pyplot.close() else: pyplot.show() - pyplot.close() - def plotCompareScatterMatrix(scatterMatrix1, scatterMatrix2, fName=None): """Compares scatter matrices graphically between libraries.""" @@ -260,7 +259,7 @@ def plotCompareScatterMatrix(scatterMatrix1, scatterMatrix2, fName=None): pyplot.colorbar() if fName: pyplot.savefig(fName) + pyplot.close() else: pyplot.show() - pyplot.close() diff --git a/armi/reactor/converters/blockConverters.py b/armi/reactor/converters/blockConverters.py index dac9a95883..fc97871513 100644 --- a/armi/reactor/converters/blockConverters.py +++ b/armi/reactor/converters/blockConverters.py @@ -488,9 +488,9 @@ def plotConvertedBlock(self, fName=None): fig.tight_layout() if fName: plt.savefig(fName) + plt.close() else: plt.show() - plt.close() return fName diff --git a/armi/utils/plotting.py b/armi/utils/plotting.py index 8e713eeb15..34e66d0e36 100644 --- a/armi/utils/plotting.py +++ b/armi/utils/plotting.py @@ -178,10 +178,10 @@ def update(i): if fName: plt.savefig(fName, dpi=150) + plt.close() else: plt.show() - plt.close() return fName @@ -402,13 +402,16 @@ def plotFaceMap( "Cannot update facemap at {0}: IOError. Is the file open?" "".format(fName) ) + plt.close(fig) elif referencesToKeep: # Don't show yet, since it will be updated. return fName else: + # Never close figures after a .show() + # because they're being used interactively e.g. + # in a live tutorial or by the doc gallery plt.show() - plt.close(fig) return fName @@ -823,8 +826,8 @@ def plotAssemblyTypes( if fileName: fig.savefig(fileName) runLog.debug("Writing assem layout {} in {}".format(fileName, os.getcwd())) + plt.close(fig) - plt.close(fig) return fig @@ -1092,10 +1095,11 @@ def getTable(self): os.path.abspath(fName), report.FLUX_PLOT, ) + plt.close() else: + # Never close interactive plots plt.show() - plt.close() def makeHistogram(x, y): @@ -1503,7 +1507,7 @@ def plotNucXs( if fName: plt.savefig(fName) + plt.close() elif not noShow: plt.show() - plt.close() diff --git a/doc/gallery-src/analysis/run_hexReactorToRZ.py b/doc/gallery-src/analysis/run_hexReactorToRZ.py index 89b3e6279b..1baa4c7e2e 100644 --- a/doc/gallery-src/analysis/run_hexReactorToRZ.py +++ b/doc/gallery-src/analysis/run_hexReactorToRZ.py @@ -55,4 +55,3 @@ figs = converter.plotConvertedReactor() plt.show() -plt.close() diff --git a/doc/gallery-src/framework/run_fuelManagement.py b/doc/gallery-src/framework/run_fuelManagement.py index 44a18df1ce..daa39e935b 100644 --- a/doc/gallery-src/framework/run_fuelManagement.py +++ b/doc/gallery-src/framework/run_fuelManagement.py @@ -73,4 +73,3 @@ # show final burnup distribution plotting.plotFaceMap(reactor.core, param="percentBu") -plt.close() diff --git a/doc/gallery-src/framework/run_reactorFacemap.py b/doc/gallery-src/framework/run_reactorFacemap.py index 7b961d4612..457aa3f5f7 100644 --- a/doc/gallery-src/framework/run_reactorFacemap.py +++ b/doc/gallery-src/framework/run_reactorFacemap.py @@ -33,4 +33,3 @@ b.p.pdens = x**2 + y**2 + z**2 plotting.plotFaceMap(reactor.core, param="pdens", labelFmt="{0:.1e}") -plotting.close()