CHORE: fix typo in OutputQuantity enum

MSallermann · MSallermann · commit fe5aba02c2eb · 2025-03-17T18:37:40.000Z
It's not spelled OutputQuantitiy .. duh
diff --git a/flowy/include/asc_file.hpp b/flowy/include/asc_file.hpp
@@ -12,7 +12,7 @@ class AscFile : public TopographyFile
 {
 public:
     AscFile() = default;
-    AscFile( const Topography & topography, OutputQuantitiy output )
+    AscFile( const Topography & topography, OutputQuantity output )
             : TopographyFile::TopographyFile( topography, output )
     {
     }
diff --git a/flowy/include/netcdf_file.hpp b/flowy/include/netcdf_file.hpp
@@ -24,7 +24,7 @@ class NetCDFFile : public TopographyFile
 
     StorageDataType data_type = StorageDataType::Short;
     NetCDFFile()              = default;
-    NetCDFFile( const Topography & topography, OutputQuantitiy output )
+    NetCDFFile( const Topography & topography, OutputQuantity output )
             : TopographyFile::TopographyFile( topography, output )
     {
     }
diff --git a/flowy/include/simulation.hpp b/flowy/include/simulation.hpp
@@ -40,7 +40,7 @@ class Simulation
     void write_avg_thickness_file();
 
     std::unique_ptr<TopographyFile>
-    get_file_handle( const Topography & topography, OutputQuantitiy output_quantity ) const;
+    get_file_handle( const Topography & topography, OutputQuantity output_quantity ) const;
 
     void run();
 
diff --git a/flowy/include/topography_file.hpp b/flowy/include/topography_file.hpp
@@ -19,7 +19,7 @@ struct TopographyCrop
     double y_max;
 };
 
-enum class OutputQuantitiy
+enum class OutputQuantity
 {
     Hazard,
     Height
@@ -51,14 +51,14 @@ class TopographyFile
     TopographyFile() = default;
 
     // Constructor that takes topography
-    TopographyFile( const Topography & topography, OutputQuantitiy output )
+    TopographyFile( const Topography & topography, OutputQuantity output )
             : x_data( topography.x_data ), y_data( topography.y_data ), no_data_value( topography.no_data_value )
     {
-        if( output == OutputQuantitiy::Height )
+        if( output == OutputQuantity::Height )
         {
             data = topography.height_data;
         }
-        else if( output == OutputQuantitiy::Hazard )
+        else if( output == OutputQuantity::Hazard )
         {
             data = topography.hazard;
         }
diff --git a/src/simulation.cpp b/src/simulation.cpp
@@ -296,13 +296,13 @@ void Simulation::write_avg_thickness_file()
         xt::filter( topography_masked.hazard, topography_thickness.height_data < threshold_thickness )      = 0.0;
 
         // Write the masked thickness and the masked hazard maps
-        auto file_thick = get_file_handle( topography_masked, OutputQuantitiy::Height );
+        auto file_thick = get_file_handle( topography_masked, OutputQuantity::Height );
         file_thick->save(
             input.output_folder / fmt::format( "{}_thickness_masked_{:.2f}", input.run_name, threshold ) );
 
         if( input.save_hazard_data )
         {
-            auto file_hazard = get_file_handle( topography_masked, OutputQuantitiy::Hazard );
+            auto file_hazard = get_file_handle( topography_masked, OutputQuantity::Hazard );
             file_hazard->save(
                 input.output_folder / fmt::format( "{}_hazard_masked_{:.2f}", input.run_name, threshold ) );
         }
@@ -311,7 +311,7 @@ void Simulation::write_avg_thickness_file()
 }
 
 std::unique_ptr<TopographyFile>
-Simulation::get_file_handle( const Topography & topography, OutputQuantitiy output_quantity ) const
+Simulation::get_file_handle( const Topography & topography, OutputQuantity output_quantity ) const
 {
     std::unique_ptr<TopographyFile> res{};
 
@@ -501,13 +501,13 @@ 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, OutputQuantitiy::Height );
+    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, OutputQuantitiy::Height );
+        auto file_final = get_file_handle( topography, OutputQuantity::Height );
         file_final->save( input.output_folder / fmt::format( "{}_DEM_final", input.run_name ) );
     }
 
@@ -517,13 +517,13 @@ void Simulation::run()
     topography_thickness.height_data -= topography_initial.height_data;
     topography_thickness.height_data /= ( 1.0 - input.thickening_parameter );
 
-    auto file_thick = get_file_handle( topography_thickness, OutputQuantitiy::Height );
+    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, OutputQuantitiy::Hazard );
+        auto file_hazard = get_file_handle( topography, OutputQuantity::Hazard );
         file_hazard->save( input.output_folder / fmt::format( "{}_hazard_full", input.run_name ) );
     }
 
diff --git a/test/test_file_io.cpp b/test/test_file_io.cpp
@@ -58,41 +58,41 @@ TEST_CASE( "file_io", "[netcdf]" )
 
     auto write_asc_height = [&]( const Flowy::Topography & topography, const fs::path & path )
     {
-        auto file = Flowy::AscFile( topography, Flowy::OutputQuantitiy::Height );
+        auto file = Flowy::AscFile( topography, Flowy::OutputQuantity::Height );
         file.save( path );
     };
 
     auto write_asc_hazard = [&]( const Flowy::Topography & topography, const fs::path & path )
     {
-        auto file = Flowy::AscFile( topography, Flowy::OutputQuantitiy::Hazard );
+        auto file = Flowy::AscFile( topography, Flowy::OutputQuantity::Hazard );
         file.save( path );
     };
 
     auto read_asc            = [&]( const fs::path & path ) { return Flowy::AscFile( path ); };
     auto write_netcdf_height = [&]( const Flowy::Topography & topography, const fs::path & path )
     {
-        auto file      = Flowy::NetCDFFile( topography, Flowy::OutputQuantitiy::Height );
+        auto file      = Flowy::NetCDFFile( topography, Flowy::OutputQuantity::Height );
         file.data_type = Flowy::StorageDataType::Double;
         file.save( path );
     };
 
     auto write_netcdf_height_float = [&]( const Flowy::Topography & topography, const fs::path & path )
     {
-        auto file      = Flowy::NetCDFFile( topography, Flowy::OutputQuantitiy::Height );
+        auto file      = Flowy::NetCDFFile( topography, Flowy::OutputQuantity::Height );
         file.data_type = Flowy::StorageDataType::Float;
         file.save( path );
     };
 
     auto write_netcdf_height_short = [&]( const Flowy::Topography & topography, const fs::path & path )
     {
-        auto file      = Flowy::NetCDFFile( topography, Flowy::OutputQuantitiy::Height );
+        auto file      = Flowy::NetCDFFile( topography, Flowy::OutputQuantity::Height );
         file.data_type = Flowy::StorageDataType::Short;
         file.save( path );
     };
 
     auto write_netcdf_hazard = [&]( const Flowy::Topography & topography, const fs::path & path )
     {
-        auto file = Flowy::NetCDFFile( topography, Flowy::OutputQuantitiy::Hazard );
+        auto file = Flowy::NetCDFFile( topography, Flowy::OutputQuantity::Hazard );
         file.save( path );
     };
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class AscFile : public TopographyFile`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`	`14`	`AscFile() = default;`
`15`		`- AscFile( const Topography & topography, OutputQuantitiy output )`
	`15`	`+ AscFile( const Topography & topography, OutputQuantity output )`
`16`	`16`	`: TopographyFile::TopographyFile( topography, output )`
`17`	`17`	`{`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class NetCDFFile : public TopographyFile`
`24`	`24`
`25`	`25`	`StorageDataType data_type = StorageDataType::Short;`
`26`	`26`	`NetCDFFile() = default;`
`27`		`- NetCDFFile( const Topography & topography, OutputQuantitiy output )`
	`27`	`+ NetCDFFile( const Topography & topography, OutputQuantity output )`
`28`	`28`	`: TopographyFile::TopographyFile( topography, output )`
`29`	`29`	`{`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct TopographyCrop`
`19`	`19`	`double y_max;`
`20`	`20`	`};`
`21`	`21`
`22`		`-enum class OutputQuantitiy`
	`22`	`+enum class OutputQuantity`
`23`	`23`	`{`
`24`	`24`	`Hazard,`
`25`	`25`	`Height`
`@@ -51,14 +51,14 @@ class TopographyFile`
`51`	`51`	`TopographyFile() = default;`
`52`	`52`
`53`	`53`	`// Constructor that takes topography`
`54`		`- TopographyFile( const Topography & topography, OutputQuantitiy output )`
	`54`	`+ TopographyFile( const Topography & topography, OutputQuantity output )`
`55`	`55`	`: x_data( topography.x_data ), y_data( topography.y_data ), no_data_value( topography.no_data_value )`
`56`	`56`	`{`
`57`		`- if( output == OutputQuantitiy::Height )`
	`57`	`+ if( output == OutputQuantity::Height )`
`58`	`58`	`{`
`59`	`59`	`data = topography.height_data;`
`60`	`60`	`}`
`61`		`- else if( output == OutputQuantitiy::Hazard )`
	`61`	`+ else if( output == OutputQuantity::Hazard )`
`62`	`62`	`{`
`63`	`63`	`data = topography.hazard;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,13 +296,13 @@ void Simulation::write_avg_thickness_file()`
`296`	`296`	`xt::filter( topography_masked.hazard, topography_thickness.height_data < threshold_thickness ) = 0.0;`
`297`	`297`
`298`	`298`	`// Write the masked thickness and the masked hazard maps`
`299`		`- auto file_thick = get_file_handle( topography_masked, OutputQuantitiy::Height );`
	`299`	`+ auto file_thick = get_file_handle( topography_masked, OutputQuantity::Height );`
`300`	`300`	`file_thick->save(`
`301`	`301`	`input.output_folder / fmt::format( "{}_thickness_masked_{:.2f}", input.run_name, threshold ) );`
`302`	`302`
`303`	`303`	`if( input.save_hazard_data )`
`304`	`304`	`{`
`305`		`- auto file_hazard = get_file_handle( topography_masked, OutputQuantitiy::Hazard );`
	`305`	`+ auto file_hazard = get_file_handle( topography_masked, OutputQuantity::Hazard );`
`306`	`306`	`file_hazard->save(`
`307`	`307`	`input.output_folder / fmt::format( "{}_hazard_masked_{:.2f}", input.run_name, threshold ) );`
`308`	`308`	`}`
`@@ -311,7 +311,7 @@ void Simulation::write_avg_thickness_file()`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`std::unique_ptr<TopographyFile>`
`314`		`-Simulation::get_file_handle( const Topography & topography, OutputQuantitiy output_quantity ) const`
	`314`	`+Simulation::get_file_handle( const Topography & topography, OutputQuantity output_quantity ) const`
`315`	`315`	`{`
`316`	`316`	`std::unique_ptr<TopographyFile> res{};`
`317`	`317`
`@@ -501,13 +501,13 @@ void Simulation::run()`
`501`	`501`	`fmt::print( "Used RNG seed: {}\n", rng_seed );`
`502`	`502`
`503`	`503`	`// Save initial topography to asc file`
`504`		`- auto file_initial = get_file_handle( topography_initial, OutputQuantitiy::Height );`
	`504`	`+ auto file_initial = get_file_handle( topography_initial, OutputQuantity::Height );`
`505`	`505`	`file_initial->save( input.output_folder / fmt::format( "{}_DEM", input.run_name ) );`
`506`	`506`
`507`	`507`	`// Save final topography to asc file`
`508`	`508`	`if( input.save_final_dem )`
`509`	`509`	`{`
`510`		`- auto file_final = get_file_handle( topography, OutputQuantitiy::Height );`
	`510`	`+ auto file_final = get_file_handle( topography, OutputQuantity::Height );`
`511`	`511`	`file_final->save( input.output_folder / fmt::format( "{}_DEM_final", input.run_name ) );`
`512`	`512`	`}`
`513`	`513`
`@@ -517,13 +517,13 @@ void Simulation::run()`
`517`	`517`	`topography_thickness.height_data -= topography_initial.height_data;`
`518`	`518`	`topography_thickness.height_data /= ( 1.0 - input.thickening_parameter );`
`519`	`519`
`520`		`- auto file_thick = get_file_handle( topography_thickness, OutputQuantitiy::Height );`
	`520`	`+ auto file_thick = get_file_handle( topography_thickness, OutputQuantity::Height );`
`521`	`521`	`file_thick->save( input.output_folder / fmt::format( "{}_thickness_full", input.run_name ) );`
`522`	`522`
`523`	`523`	`// Save the full hazard map`
`524`	`524`	`if( input.save_hazard_data )`
`525`	`525`	`{`
`526`		`- auto file_hazard = get_file_handle( topography, OutputQuantitiy::Hazard );`
	`526`	`+ auto file_hazard = get_file_handle( topography, OutputQuantity::Hazard );`
`527`	`527`	`file_hazard->save( input.output_folder / fmt::format( "{}_hazard_full", input.run_name ) );`
`528`	`528`	`}`
`529`	`529`