Merge pull request #459 from sebproell/remove-epetra-mpi-comm-header

Remove Epetra_MpiComm.h include
4C-multiphysics · Feb 27, 2025 · 444b047 · 444b047
2 parents 459c38e + 1190722
commit 444b047
Show file tree

Hide file tree

Showing 54 changed files with 1 addition and 76 deletions.
diff --git a/apps/global_full/4C_global_full_main.cpp b/apps/global_full/4C_global_full_main.cpp
@@ -23,7 +23,6 @@
 #include "4C_utils_exceptions.hpp"
 #include "4C_utils_singleton_owner.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Kokkos_Core.hpp>
 #include <unistd.h>
 

diff --git a/apps/post_processor/4C_post_processor.cpp b/apps/post_processor/4C_post_processor.cpp
@@ -14,7 +14,6 @@
 #include "4C_utils_exceptions.hpp"
 #include "4C_utils_singleton_owner.hpp"
 
-#include <Epetra_MpiComm.h>
 
 using namespace FourC;
 namespace

diff --git a/apps/pre_exodus/4C_pre_exodus.cpp b/apps/pre_exodus/4C_pre_exodus.cpp
@@ -25,7 +25,6 @@
 #include "4C_utils_result_test.hpp"
 #include "4C_utils_singleton_owner.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_CommandLineProcessor.hpp>
 #include <Teuchos_Time.hpp>
 #include <Teuchos_TimeMonitor.hpp>

diff --git a/src/art_net/4C_art_net_art_junction.hpp b/src/art_net/4C_art_net_art_junction.hpp
@@ -15,7 +15,6 @@
 #include "4C_io.hpp"
 #include "4C_linalg_utils_sparse_algebra_math.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_SerialDenseSolver.hpp>
 
 #include <memory>

diff --git a/src/art_net/4C_art_net_art_terminal_bc.hpp b/src/art_net/4C_art_net_art_terminal_bc.hpp
@@ -14,8 +14,6 @@
 #include "4C_io.hpp"
 #include "4C_linalg_utils_sparse_algebra_math.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/art_net/4C_art_net_art_write_gnuplot.hpp b/src/art_net/4C_art_net_art_write_gnuplot.hpp
@@ -14,8 +14,6 @@
 #include "4C_io.hpp"
 #include "4C_linalg_utils_sparse_algebra_math.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <iostream>
 #include <memory>
 

diff --git a/src/art_net/4C_art_net_explicitintegration.hpp b/src/art_net/4C_art_net_explicitintegration.hpp
@@ -20,8 +20,6 @@
 #include "4C_linalg_vector.hpp"
 #include "4C_utils_function.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <cstdlib>
 #include <ctime>
 #include <iostream>

diff --git a/src/beaminteraction/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer.cpp b/src/beaminteraction/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer.cpp
@@ -24,7 +24,6 @@
 #include "4C_structure_new_timint_basedataglobalstate.hpp"
 
 #include <Epetra_FEVector.h>
-#include <Epetra_MpiComm.h>
 
 #include <unordered_set>
 #include <utility>

diff --git a/...eraction/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer_contact.cpp b/...eraction/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer_contact.cpp
@@ -24,7 +24,6 @@
 #include "4C_structure_new_timint_basedataglobalstate.hpp"
 
 #include <Epetra_FEVector.h>
-#include <Epetra_MpiComm.h>
 
 #include <unordered_set>
 #include <utility>

diff --git a/src/beaminteraction/4C_beaminteraction_submodel_evaluator_crosslinking.hpp b/src/beaminteraction/4C_beaminteraction_submodel_evaluator_crosslinking.hpp
@@ -16,7 +16,6 @@
 #include "4C_inpar_beaminteraction.hpp"
 #include "4C_linalg_fixedsizematrix.hpp"
 
-#include <Epetra_MpiComm.h>
 
 FOUR_C_NAMESPACE_OPEN
 

diff --git a/src/beaminteraction/4C_beaminteraction_submodel_evaluator_spherebeamlinking.hpp b/src/beaminteraction/4C_beaminteraction_submodel_evaluator_spherebeamlinking.hpp
@@ -16,8 +16,6 @@
 #include "4C_io_visualization_manager.hpp"
 #include "4C_linalg_fixedsizematrix.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <unordered_set>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/core/comm/src/4C_comm_exporter.hpp b/src/core/comm/src/4C_comm_exporter.hpp
@@ -14,7 +14,6 @@
 #include "4C_comm_utils_factory.hpp"
 
 #include <Epetra_Map.h>
-#include <Epetra_MpiComm.h>
 
 #include <map>
 #include <memory>

diff --git a/src/core/comm/src/4C_comm_utils.cpp b/src/core/comm/src/4C_comm_utils.cpp
@@ -13,7 +13,6 @@
 
 #include <Epetra_CrsMatrix.h>
 #include <Epetra_Import.h>
-#include <Epetra_MpiComm.h>
 
 #include <iomanip>
 #include <sstream>

diff --git a/src/core/comm/src/4C_comm_utils.hpp b/src/core/comm/src/4C_comm_utils.hpp
@@ -15,7 +15,6 @@
 #include "4C_linalg_multi_vector.hpp"
 #include "4C_utils_exceptions.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_DefaultMpiComm.hpp>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/core/comm/tests/4C_comm_mpi_utils_test.np3.cpp b/src/core/comm/tests/4C_comm_mpi_utils_test.np3.cpp
@@ -9,7 +9,6 @@
 
 #include "4C_comm_mpi_utils.hpp"
 
-#include <Epetra_MpiComm.h>
 
 
 namespace

diff --git a/src/core/fem/src/discretization/4C_fem_discretization.hpp b/src/core/fem/src/discretization/4C_fem_discretization.hpp
@@ -18,7 +18,6 @@
 #include "4C_utils_parameter_list.fwd.hpp"
 
 #include <Epetra_Map.h>
-#include <Epetra_MpiComm.h>
 
 #include <functional>
 #include <ranges>

diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_bvh.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_bvh.cpp
@@ -12,7 +12,6 @@
 #include "4C_fem_geometric_search_utils.hpp"
 #include "4C_io_pstream.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_TimeMonitor.hpp>
 
 #ifdef FOUR_C_WITH_ARBORX

diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_distributed_tree.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_distributed_tree.cpp
@@ -12,7 +12,6 @@
 #include "4C_fem_geometric_search_bounding_volume.hpp"
 #include "4C_fem_geometric_search_utils.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_TimeMonitor.hpp>
 
 #ifdef FOUR_C_WITH_ARBORX

diff --git a/src/core/fem/tests/geometric_search/4C_geometric_search_distributed_test.np3.cpp b/src/core/fem/tests/geometric_search/4C_geometric_search_distributed_test.np3.cpp
@@ -19,7 +19,6 @@
 #include "4C_fem_geometric_search_distributed_tree.hpp"
 #include "4C_geometric_search_create_bounding_volumes_test.hpp"
 
-#include <Epetra_MpiComm.h>
 
 namespace
 {

diff --git a/src/core/fem/tests/geometric_search/4C_geometric_search_test.cpp b/src/core/fem/tests/geometric_search/4C_geometric_search_test.cpp
@@ -12,7 +12,6 @@
 #include "4C_fem_geometric_search_bounding_volume.hpp"
 #include "4C_fem_geometric_search_utils.hpp"
 
-#include <Epetra_MpiComm.h>
 
 #ifdef FOUR_C_WITH_ARBORX
 

diff --git a/src/core/io/src/4C_io_control.cpp b/src/core/io/src/4C_io_control.cpp
@@ -14,7 +14,6 @@
 #include "4C_io_legacy_table.hpp"
 #include "4C_io_pstream.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <pwd.h>
 #include <unistd.h>
 

diff --git a/src/core/io/src/4C_io_hdf.hpp b/src/core/io/src/4C_io_hdf.hpp
@@ -13,7 +13,6 @@
 #include "4C_linalg_vector.hpp"
 
 #include <Epetra_Map.h>
-#include <Epetra_MpiComm.h>
 #include <hdf5.h>
 #include <hdf5_hl.h>
 

diff --git a/src/core/io/tests/4C_io_pstream_test.cpp b/src/core/io/tests/4C_io_pstream_test.cpp
@@ -9,8 +9,6 @@
 
 #include "4C_io_pstream.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <stdexcept>
 
 namespace

diff --git a/src/core/linalg/tests/4C_linalg_utils_sparse_algebra_manipulation_test.np2.cpp b/src/core/linalg/tests/4C_linalg_utils_sparse_algebra_manipulation_test.np2.cpp
@@ -12,7 +12,6 @@
 #include "4C_linalg_utils_sparse_algebra_math.hpp"
 #include "4C_unittest_utils_support_files_test.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <EpetraExt_CrsMatrixIn.h>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/core/linalg/tests/4C_linalg_utils_sparse_algebra_math_test.np2.cpp b/src/core/linalg/tests/4C_linalg_utils_sparse_algebra_math_test.np2.cpp
@@ -12,7 +12,6 @@
 #include "4C_linalg_utils_sparse_algebra_manipulation.hpp"
 #include "4C_unittest_utils_support_files_test.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <EpetraExt_CrsMatrixIn.h>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/core/linalg/tests/4C_linalg_vector_test.np2.cpp b/src/core/linalg/tests/4C_linalg_vector_test.np2.cpp
@@ -14,7 +14,6 @@
 
 // Epetra related headers
 #include <Epetra_Map.h>
-#include <Epetra_MpiComm.h>
 
 #include <memory>
 

diff --git a/src/core/linear_solver/src/method/4C_linear_solver_method_linalg.cpp b/src/core/linear_solver/src/method/4C_linear_solver_method_linalg.cpp
@@ -16,7 +16,6 @@
 
 #include <BelosTypes.hpp>  // for Belos verbosity codes
 #include <Epetra_LinearProblem.h>
-#include <Epetra_MpiComm.h>
 #include <ml_MultiLevelPreconditioner.h>  // includes for ML parameter list validation
 #include <Teuchos_ParameterList.hpp>
 #include <Teuchos_StandardParameterEntryValidators.hpp>

diff --git a/src/fluid/4C_fluid_coupling_red_models.hpp b/src/fluid/4C_fluid_coupling_red_models.hpp
@@ -17,8 +17,6 @@
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_red_airways_dyn_drt.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/fluid/4C_fluid_implicit_integration.hpp b/src/fluid/4C_fluid_implicit_integration.hpp
@@ -21,7 +21,6 @@
 #include "4C_linalg_vector.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_TimeMonitor.hpp>
 
 #include <ctime>

diff --git a/src/fluid/4C_fluid_utils.hpp b/src/fluid/4C_fluid_utils.hpp
@@ -14,7 +14,6 @@
 #include "4C_inpar_fluid.hpp"
 #include "4C_linalg_blocksparsematrix.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_TimeMonitor.hpp>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/fluid/4C_fluid_volumetric_surfaceFlow_condition.hpp b/src/fluid/4C_fluid_volumetric_surfaceFlow_condition.hpp
@@ -19,7 +19,6 @@
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 
 #include <Epetra_Map.h>
-#include <Epetra_MpiComm.h>
 
 #include <memory>
 

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_bfda.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_bfda.hpp
@@ -16,8 +16,6 @@
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_bfs.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_bfs.hpp
@@ -16,8 +16,6 @@
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_ccy.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_ccy.hpp
@@ -14,7 +14,6 @@
 #include "4C_linalg_serialdensematrix.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_ParameterList.hpp>
 
 #include <memory>

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_cha.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_cha.hpp
@@ -18,7 +18,6 @@
 #include "4C_inpar_scatra.hpp"
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_ParameterList.hpp>
 
 #include <memory>

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_ldc.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_ldc.hpp
@@ -15,8 +15,6 @@
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_ph.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_ph.hpp
@@ -16,8 +16,6 @@
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_sqc.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_sqc.hpp
@@ -14,8 +14,6 @@
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/fluid_turbulence/4C_fluid_turbulence_statistics_tgv.hpp b/src/fluid_turbulence/4C_fluid_turbulence_statistics_tgv.hpp
@@ -15,7 +15,6 @@
 #include "4C_inpar_scatra.hpp"
 #include "4C_linalg_utils_sparse_algebra_math.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_ParameterList.hpp>
 
 #include <memory>

diff --git a/src/levelset/4C_levelset_algorithm.hpp b/src/levelset/4C_levelset_algorithm.hpp
@@ -17,8 +17,6 @@
 #include "4C_scatra_timint_implicit.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 #define USE_PHIN_FOR_VEL  // TODO

diff --git a/src/levelset/4C_levelset_dyn.cpp b/src/levelset/4C_levelset_dyn.cpp
@@ -14,7 +14,6 @@
 #include "4C_inpar_scatra.hpp"
 #include "4C_levelset_algorithm.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_ParameterList.hpp>
 #include <Teuchos_StandardParameterEntryValidators.hpp>
 #include <Teuchos_TimeMonitor.hpp>

diff --git a/src/mortar/4C_mortar_manager_base.cpp b/src/mortar/4C_mortar_manager_base.cpp
@@ -7,7 +7,6 @@
 
 #include "4C_mortar_manager_base.hpp"
 
-#include <Epetra_MpiComm.h>
 
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/particle_engine/4C_particle_engine_communication_utils.hpp b/src/particle_engine/4C_particle_engine_communication_utils.hpp
@@ -8,15 +8,11 @@
 #ifndef FOUR_C_PARTICLE_ENGINE_COMMUNICATION_UTILS_HPP
 #define FOUR_C_PARTICLE_ENGINE_COMMUNICATION_UTILS_HPP
 
-/*---------------------------------------------------------------------------*
- | headers                                                                   |
- *---------------------------------------------------------------------------*/
 #include "4C_config.hpp"
 
-#include <Epetra_MpiComm.h>
+#include <mpi.h>
 
 #include <map>
-#include <set>
 #include <vector>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/post/4C_post_common.cpp b/src/post/4C_post_common.cpp
@@ -19,8 +19,6 @@
 #include "4C_io_legacy_table.hpp"
 #include "4C_rigidsphere.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <stack>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/red_airways/4C_red_airways_implicitintegration.hpp b/src/red_airways/4C_red_airways_implicitintegration.hpp
@@ -21,7 +21,6 @@
 #include "4C_utils_function.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
 #include <Teuchos_TimeMonitor.hpp>
 
 #include <cstdlib>

diff --git a/src/scatra/4C_scatra_timint_loma.hpp b/src/scatra/4C_scatra_timint_loma.hpp
@@ -13,8 +13,6 @@
 #include "4C_scatra_timint_implicit.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN

diff --git a/src/scatra/4C_scatra_timint_poromulti.hpp b/src/scatra/4C_scatra_timint_poromulti.hpp
@@ -17,8 +17,6 @@
 #include "4C_scatra_timint_stat.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
-#include <Epetra_MpiComm.h>
-
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,6 @@

		#include "4C_comm_mpi_utils.hpp"

		#include <Epetra_MpiComm.h>


		namespace
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,7 +7,6 @@

		#include "4C_mortar_manager_base.hpp"

		#include <Epetra_MpiComm.h>


		FOUR_C_NAMESPACE_OPEN
Expand Down