Mini clean-up.

pkestene · Aug 2, 2024 · 76a4640 · 76a4640
1 parent f6a6a9a
commit 76a4640
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 45 deletions.
diff --git a/src/muscl/SolverHydroMuscl.cpp b/src/muscl/SolverHydroMuscl.cpp
@@ -1,15 +1,10 @@
 #include <string>
 #include <cstdio>
 #include <cstdbool>
-#include <sstream>
-#include <fstream>
-#include <algorithm>
 
 #include "muscl/SolverHydroMuscl.h"
 #include "shared/HydroParams.h"
 
-#include "shared/mpiBorderUtils.h"
-
 namespace euler_kokkos
 {
 namespace muscl

diff --git a/src/muscl/SolverHydroMuscl.h b/src/muscl/SolverHydroMuscl.h
@@ -6,20 +6,14 @@
 #ifndef SOLVER_HYDRO_MUSCL_H_
 #define SOLVER_HYDRO_MUSCL_H_
 
-#include <string>
 #include <cstdio>
 #include <cstdbool>
 #include <iostream>
-#include <sstream>
-#include <fstream>
-#include <algorithm>
 
 // shared
 #include "shared/SolverBase.h"
 #include "shared/HydroParams.h"
 #include "shared/kokkos_shared.h"
-#include "shared/BoundariesFunctors.h"
-#include "shared/problems/initRiemannConfig2d.h"
 
 // the actual computational functors called in HydroRun
 #include "muscl/HydroRunFunctors2D.h"
@@ -29,9 +23,6 @@
 #include "muscl/HydroInitFunctors2D.h"
 #include "muscl/HydroInitFunctors3D.h"
 
-// border conditions functors
-#include "shared/BoundariesFunctors.h"
-
 // for IO
 #include <utils/io/IO_ReadWrite.h>
 
@@ -40,7 +31,6 @@
 #include "shared/problems/ImplodeParams.h"
 #include "shared/problems/KHParams.h"
 #include "shared/problems/GreshoParams.h"
-#include "shared/problems/IsentropicVortexParams.h"
 
 namespace euler_kokkos
 {
@@ -302,20 +292,16 @@ SolverHydroMuscl<dim>::SolverHydroMuscl(HydroParams & params, ConfigMap & config
 
   if (myRank == 0)
   {
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
     std::cout << "Solver is " << m_solver_name << "\n";
     std::cout << "Problem (init condition) is " << m_problem_name << "\n";
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
 
     // print parameters on screen
     params.print();
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
     std::cout << "Memory requested : " << (total_mem_size / 1e6) << " MBytes\n";
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
   }
 
 } // SolverHydroMuscl::SolverHydroMuscl
@@ -681,7 +667,7 @@ SolverHydroMuscl<dim>::next_iteration_impl()
       save_solution();
 
     } // end output
-  }   // end enable output
+  } // end enable output
 
   // compute new dt
   timers[TIMER_DT]->start();

diff --git a/src/muscl/SolverMHDMuscl.cpp b/src/muscl/SolverMHDMuscl.cpp
@@ -1,9 +1,5 @@
-#include <string>
 #include <cstdio>
 #include <cstdbool>
-#include <sstream>
-#include <fstream>
-#include <algorithm>
 
 #include "muscl/SolverMHDMuscl.h"
 #include "shared/HydroParams.h"

diff --git a/src/muscl/SolverMHDMuscl.h b/src/muscl/SolverMHDMuscl.h
@@ -10,16 +10,11 @@
 #include <cstdio>
 #include <cstdbool>
 #include <iostream>
-#include <sstream>
-#include <fstream>
-#include <algorithm>
 
 // shared
 #include "shared/SolverBase.h"
 #include "shared/HydroParams.h"
 #include "shared/kokkos_shared.h"
-#include "shared/BoundariesFunctors.h"
-#include "shared/problems/initRiemannConfig2d.h"
 
 // the actual computational functors called in HydroRun
 #include "muscl/MHDRunFunctors2D.h"
@@ -29,9 +24,6 @@
 #include "muscl/MHDInitFunctors2D.h"
 #include "muscl/MHDInitFunctors3D.h"
 
-// border conditions functors
-#include "shared/BoundariesFunctors.h"
-
 // for IO
 #include <utils/io/IO_ReadWrite.h>
 
@@ -408,20 +400,16 @@ SolverMHDMuscl<dim>::SolverMHDMuscl(HydroParams & params, ConfigMap & configMap)
 
   if (myRank == 0)
   {
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
     std::cout << "Solver is " << m_solver_name << "\n";
     std::cout << "Problem (init condition) is " << m_problem_name << "\n";
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
 
     // print parameters on screen
     params.print();
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
     std::cout << "Memory requested : " << (total_mem_size / 1e6) << " MBytes\n";
-    std::cout << "##########################"
-              << "\n";
+    std::cout << "##########################" << "\n";
   }
 
 } // SolverMHDMuscl::SolverMHDMuscl
@@ -788,7 +776,7 @@ SolverMHDMuscl<dim>::next_iteration_impl()
       save_solution();
 
     } // end output
-  }   // end enable output
+  } // end enable output
 
   // compute new dt
   timers[TIMER_DT]->start();