Merge pull request #309 from thetisproject/keep-log

Option for appending to log

thetis/solver.py

@@ -79,7 +79,7 @@ class FlowSolver(FrozenClass):
     @unfrozen
     @PETSc.Log.EventDecorator("thetis.FlowSolver.__init__")
     def __init__(self, mesh2d, bathymetry_2d, n_layers,
-                 options=None, extrude_options=None):
+                 options=None, extrude_options=None, keep_log=False):
         """
         :arg mesh2d: :class:`Mesh` object of the 2D mesh
         :arg bathymetry_2d: Bathymetry of the domain. Bathymetry stands for
@@ -90,6 +90,7 @@ def __init__(self, mesh2d, bathymetry_2d, n_layers,
         :kwarg options: Model options (optional). Model options can also be
             changed directly via the :attr:`.options` class property.
         :type options: :class:`.ModelOptions3d` instance
+        :kwarg bool keep_log: append to an existing log file, or overwrite it?
         """
         self._initialized = False
 
@@ -156,6 +157,7 @@ def __init__(self, mesh2d, bathymetry_2d, n_layers,
         """Do export initial state. False if continuing a simulation"""
 
         self._simulation_continued = False
+        self.keep_log = keep_log
         self._field_preproc_funcs = {}
 
     def compute_dx_factor(self):
@@ -474,7 +476,8 @@ def create_fields(self):
             self.create_function_spaces()
 
         if self.options.log_output and not self.options.no_exports:
-            set_log_directory(self.options.output_directory)
+            mode = "a" if self.keep_log else "w"
+            set_log_directory(self.options.output_directory, mode=mode)
 
         # mesh velocity etc fields must be in the same space as 3D coordinates
         coord_is_dg = element_continuity(self.mesh2d.coordinates.function_space().ufl_element()).horizontal == 'dg'
@@ -652,7 +655,8 @@ def create_equations(self):
 
         if self.options.log_output and not self.options.no_exports:
             logfile = os.path.join(create_directory(self.options.output_directory), 'log')
-            filehandler = logging.logging.FileHandler(logfile, mode='w')
+            mode = "a" if self.keep_log else "w"
+            filehandler = logging.logging.FileHandler(logfile, mode=mode)
             filehandler.setFormatter(logging.logging.Formatter('%(message)s'))
             output_logger.addHandler(filehandler)
 

thetis/solver2d.py

@@ -77,7 +77,7 @@ class FlowSolver2d(FrozenClass):
     """
     @unfrozen
     @PETSc.Log.EventDecorator("thetis.FlowSolver2d.__init__")
-    def __init__(self, mesh2d, bathymetry_2d, options=None):
+    def __init__(self, mesh2d, bathymetry_2d, options=None, keep_log=False):
         """
         :arg mesh2d: :class:`Mesh` object of the 2D mesh
         :arg bathymetry_2d: Bathymetry of the domain. Bathymetry stands for
@@ -86,6 +86,7 @@ def __init__(self, mesh2d, bathymetry_2d, options=None):
         :kwarg options: Model options (optional). Model options can also be
             changed directly via the :attr:`.options` class property.
         :type options: :class:`.ModelOptions2d` instance
+        :kwarg bool keep_log: append to an existing log file, or overwrite it?
         """
         self._initialized = False
         self.mesh2d = mesh2d
@@ -141,6 +142,7 @@ def __init__(self, mesh2d, bathymetry_2d, options=None):
         if 'tracer_2d' in field_metadata:
             field_metadata.pop('tracer_2d')
         self.solve_tracer = False
+        self.keep_log = keep_log
         self._field_preproc_funcs = {}
 
     @PETSc.Log.EventDecorator("thetis.FlowSolver2d.compute_time_step")
@@ -391,7 +393,8 @@ def create_fields(self):
             self.create_function_spaces()
 
         if self.options.log_output and not self.options.no_exports:
-            set_log_directory(self.options.output_directory)
+            mode = "a" if self.keep_log else "w"
+            set_log_directory(self.options.output_directory, mode=mode)
 
         self.fields.solution_2d = Function(self.function_spaces.V_2d, name='solution_2d')
         # correct treatment of the split 2d functions