Merge pull request #222 from amoodie/nooutput_noerror

fix error thrown to log during finalize when no output exists.

docs/source/guides/advanced_configuration_guide.inc

@@ -38,7 +38,7 @@ Each folder will contain a copy of the configuration file used for that job; for
     h0: 1.0
     f_bedload: 0.5
 
-Additionally, a log file for each job is located in the output folder, and any output grid files or images specified by the input configuration will be located in the respective job output folder.
+Additionally, a log file for each job is located in the output folder, and any output grid files or images specified by the input configuration will be located in the respective job output folder (note: there is no output NetCDF4 file for these runs).
 
 .. note:: You must specify the `out_dir` key in the input YAML configuration to use matrix expansion.
 

pyDeltaRCM/model.py

@@ -234,6 +234,8 @@ def finalize(self):
             self.output_netcdf.close()
             _msg = 'Closed output NetCDF4 file'
             self.log_info(_msg, verbosity=1)
+        except AttributeError:
+            self.log_info('No output NetCDF4 file to close.')
         except Exception as e:
             self.logger.error('Failed to close output NetCDF4 file')
             self.logger.exception(e)

tests/integration/test_timing_triggers.py

@@ -303,7 +303,7 @@ def test_finalize_updated(self, tmp_path):
 
         # assert calls
         #   should only hit top-levels
-        assert _delta.log_info.call_count == 1
+        assert _delta.log_info.call_count == 2
         assert _delta.output_data.call_count == 0
         assert _delta.output_checkpoint.call_count == 0
 

tests/test_model.py

@@ -423,7 +423,7 @@ def test_finalize_not_updated(self, tmp_path):
 
         # assert calls
         #  should hit all options since no saves
-        assert _delta.log_info.call_count == 1
+        assert _delta.log_info.call_count == 2
 
         # these were originally included in `finalize`, but no longer.
         #   the checks for no call are here to ensure we don't revert