ENH: save_post_run_output function

a bit more concise

Co-authored-by: Amrita Goswami <amrita16thaug646@gmail.com>

Author: MSallermann

flowy/include/models/mr_lava_loba.hpp

@@ -5,7 +5,6 @@
 #include "flowy/include/config.hpp"
 #include "flowy/include/definitions.hpp"
 #include "flowy/include/lobe.hpp"
-#include "flowy/include/simulation.hpp"
 #include "flowy/include/vent_flags.hpp"
 #include "pdf_cpplib/include/probability_dist.hpp"
 #include <algorithm>

flowy/include/simulation.hpp

@@ -37,15 +37,18 @@ class Simulation
 
     void write_avg_thickness_file();
 
-    // Check if the dem has to be written (because of the input.write_dem_every_n_lobes_setting) and, if yes, writes the topography
-    void write_thickness_if_necessary(int n_lobes_processed);
+    // Check if the dem has to be written (because of the input.write_dem_every_n_lobes_setting) and, if yes, writes the
+    // topography
+    void write_thickness_if_necessary( int n_lobes_processed );
 
     // Computes the topography_thickness field by subtracting the initial topography and dividing by (1.0 - filling_parameter)
     void compute_topography_thickness();
 
     std::unique_ptr<TopographyFile>
     get_file_handle( const Topography & topography, OutputQuantity output_quantity ) const;
 
+    void save_post_run_output();
+
     void run();
 
 private:

src/simulation.cpp

@@ -344,7 +344,7 @@ Simulation::get_file_handle( const Topography & topography, OutputQuantity outpu
 
 void Simulation::compute_topography_thickness()
 {
-    // Compute the thickness by substracting the initial topography and correcting for the thickening parametr
+    // Compute the thickness by subtracting the initial topography and correcting for the thickening parametr
     topography_thickness               = topography;
     topography_thickness.no_data_value = DEFAULT_NO_DATA_VALUE_THICKNESS;
     topography_thickness.height_data -= topography_initial.height_data;
@@ -369,6 +369,34 @@ void Simulation::write_thickness_if_necessary( int n_lobes_processed )
     }
 }
 
+void Simulation::save_post_run_output()
+{
+    // Save initial topography to asc file
+    auto file_initial = get_file_handle( topography_initial, OutputQuantity::Height );
+    file_initial->save( input.output_folder / fmt::format( "{}_DEM", input.run_name ) );
+
+    // Save final topography to asc file
+    if( input.save_final_dem )
+    {
+        auto file_final = get_file_handle( topography, OutputQuantity::Height );
+        file_final->save( input.output_folder / fmt::format( "{}_DEM_final", input.run_name ) );
+    }
+
+    // Save full thickness to asc file
+    compute_topography_thickness();
+    auto file_thick = get_file_handle( topography_thickness, OutputQuantity::Height );
+    file_thick->save( input.output_folder / fmt::format( "{}_thickness_full", input.run_name ) );
+
+    // Save the full hazard map
+    if( input.save_hazard_data )
+    {
+        auto file_hazard = get_file_handle( topography, OutputQuantity::Hazard );
+        file_hazard->save( input.output_folder / fmt::format( "{}_hazard_full", input.run_name ) );
+    }
+
+    write_avg_thickness_file();
+}
+
 void Simulation::run()
 {
     int n_lobes_processed = 0;
@@ -527,30 +555,7 @@ void Simulation::run()
 
     fmt::print( "Used RNG seed: {}\n", rng_seed );
 
-    // Save initial topography to asc file
-    auto file_initial = get_file_handle( topography_initial, OutputQuantity::Height );
-    file_initial->save( input.output_folder / fmt::format( "{}_DEM", input.run_name ) );
-
-    // Save final topography to asc file
-    if( input.save_final_dem )
-    {
-        auto file_final = get_file_handle( topography, OutputQuantity::Height );
-        file_final->save( input.output_folder / fmt::format( "{}_DEM_final", input.run_name ) );
-    }
-
-    // Save full thickness to asc file
-    compute_topography_thickness();
-    auto file_thick = get_file_handle( topography_thickness, OutputQuantity::Height );
-    file_thick->save( input.output_folder / fmt::format( "{}_thickness_full", input.run_name ) );
-
-    // Save the full hazard map
-    if( input.save_hazard_data )
-    {
-        auto file_hazard = get_file_handle( topography, OutputQuantity::Hazard );
-        file_hazard->save( input.output_folder / fmt::format( "{}_hazard_full", input.run_name ) );
-    }
-
-    write_avg_thickness_file();
+    save_post_run_output();
 }
 
 } // namespace Flowy