diff --git a/include/core/auxiliary_math_functions.h b/include/core/auxiliary_math_functions.h index b2ed0139d1..28da4f1bc7 100644 --- a/include/core/auxiliary_math_functions.h +++ b/include/core/auxiliary_math_functions.h @@ -13,12 +13,12 @@ * * --------------------------------------------------------------------- */ -#include "core/parameters.h" -#include -#ifndef LETHE_AUXILIARY_MATH_FUNCTIONS_H -# define LETHE_AUXILIARY_MATH_FUNCTIONS_H +#ifndef lethe_auxiliary_math_functions_h +#define lethe_auxiliary_math_functions_h + +#include /** * Carries out the calculation of the harmonic mean of two values. @@ -31,7 +31,8 @@ inline double harmonic_mean(const double &value_one, const double &value_two) { - return (2 * value_one * value_two / (value_one + value_two + DBL_MIN)); + return (2 * value_one * value_two / + (value_one + value_two + std::numeric_limits::min())); } -#endif // LETHE_AUXILIARY_MATH_FUNCTIONS_H +#endif diff --git a/include/core/boundary_conditions.h b/include/core/boundary_conditions.h index f806147874..00adabb888 100644 --- a/include/core/boundary_conditions.h +++ b/include/core/boundary_conditions.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2019 - */ #ifndef lethe_boundary_conditions_h diff --git a/include/core/dem_properties.h b/include/core/dem_properties.h index 34266b7f44..9f52692f89 100644 --- a/include/core/dem_properties.h +++ b/include/core/dem_properties.h @@ -12,22 +12,19 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2020- */ -#include + + +#ifndef lethe_dem_properties_h +#define lethe_dem_properties_h + #include -#include #include -#ifndef Lethe_DEM_properties_h -# define Lethe_DEM_properties_h - namespace DEM { - /* This enum class is reponsible for the handling the specific indexes of the + /* This enum class is responsible for the handling the specific indexes of the * particles properties within the property pool and also to generate * the associative names for the properties * This is the only part where we should use a classical enum because it is diff --git a/include/core/evaporation_model.h b/include/core/evaporation_model.h index 322025a09e..6f153d87e8 100644 --- a/include/core/evaporation_model.h +++ b/include/core/evaporation_model.h @@ -13,6 +13,7 @@ * * --------------------------------------------------------------------- */ + #ifndef lethe_evaporation_model_h #define lethe_evaporation_model_h diff --git a/include/core/grids.h b/include/core/grids.h index 40c6115a5f..b1efa7254d 100644 --- a/include/core/grids.h +++ b/include/core/grids.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2020 - */ #ifndef lethe_grids_h diff --git a/include/core/ib_particle.h b/include/core/ib_particle.h index add77c7dcb..c000ffdb54 100644 --- a/include/core/ib_particle.h +++ b/include/core/ib_particle.h @@ -15,10 +15,14 @@ * */ + + +#ifndef lethe_ib_particle_h +#define lethe_ib_particle_h + #include #include -#include #include #include #include @@ -27,9 +31,6 @@ #include -#ifndef lethe_ib_particle_h -# define lethe_ib_particle_h - using namespace dealii; /** diff --git a/include/core/ib_stencil.h b/include/core/ib_stencil.h index d97582ffb9..22050e9234 100644 --- a/include/core/ib_stencil.h +++ b/include/core/ib_stencil.h @@ -12,8 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - * - * Author: Lucka Barbeau, Bruno Blais, Polytechnique Montreal, 2019 - */ #ifndef lethe_ib_stencil_h diff --git a/include/core/inexact_newton_non_linear_solver.h b/include/core/inexact_newton_non_linear_solver.h index 7140726009..1016dc02de 100644 --- a/include/core/inexact_newton_non_linear_solver.h +++ b/include/core/inexact_newton_non_linear_solver.h @@ -14,8 +14,8 @@ * --------------------------------------------------------------------- */ -#ifndef lethe_inexact_newton_iteration_non_linear_solver_h -#define lethe_inexact_newton_iteration_non_linear_solver_h +#ifndef lethe_inexact_newton_non_linear_solver_h +#define lethe_inexact_newton_non_linear_solver_h #include diff --git a/include/core/kinsol_newton_non_linear_solver.h b/include/core/kinsol_newton_non_linear_solver.h index 318a732884..16bade2ac7 100644 --- a/include/core/kinsol_newton_non_linear_solver.h +++ b/include/core/kinsol_newton_non_linear_solver.h @@ -14,8 +14,8 @@ * --------------------------------------------------------------------- */ -#ifndef kinsol_non_linear_solver_h -#define kinsol_non_linear_solver_h +#ifndef lethe_kinsol_non_linear_solver_h +#define lethe_kinsol_non_linear_solver_h #include #include diff --git a/include/core/lethe_grid_tools.h b/include/core/lethe_grid_tools.h index a7ae9ff89c..804424d0da 100644 --- a/include/core/lethe_grid_tools.h +++ b/include/core/lethe_grid_tools.h @@ -13,12 +13,11 @@ * * -------------------------------------------------------------------*/ -#ifndef lethe_lethegridtools_h -#define lethe_lethegridtools_h +#ifndef lethe_lethe_grid_tools_h +#define lethe_lethe_grid_tools_h #include -#include #include #include diff --git a/include/core/manifolds.h b/include/core/manifolds.h index f29819ea9b..065891c43f 100644 --- a/include/core/manifolds.h +++ b/include/core/manifolds.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2019 - */ #ifndef lethe_manifolds_h diff --git a/include/core/mesh_controller.h b/include/core/mesh_controller.h index 98fcbb0234..2c96545039 100644 --- a/include/core/mesh_controller.h +++ b/include/core/mesh_controller.h @@ -14,11 +14,8 @@ * ---------------------------------------------------------------------*/ -#ifndef lethe_mesh_controler_h -#define lethe_mesh_controler_h - -#include - +#ifndef lethe_mesh_controller_h +#define lethe_mesh_controller_h /** * @Class Controller that target a given number of elements in the mesh. This diff --git a/include/core/parameters_multiphysics.h b/include/core/parameters_multiphysics.h index d2491566b3..2d990fedeb 100644 --- a/include/core/parameters_multiphysics.h +++ b/include/core/parameters_multiphysics.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2019- */ /* diff --git a/include/core/periodic_hills_grid.h b/include/core/periodic_hills_grid.h index a6ff4c9808..ee1b20b32e 100644 --- a/include/core/periodic_hills_grid.h +++ b/include/core/periodic_hills_grid.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Audrey Collard-Daigneault, Polytechnique Montreal, 2020 - */ #ifndef lethe_per_hills_grid_h @@ -23,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/include/core/phase_change.h b/include/core/phase_change.h index 12574f18d7..6177b0b2e9 100644 --- a/include/core/phase_change.h +++ b/include/core/phase_change.h @@ -14,8 +14,8 @@ * --------------------------------------------------------------------- */ -#ifndef phase_change_h -#define phase_change_h +#ifndef lethe_phase_change_h +#define lethe_phase_change_h #include diff --git a/include/core/physics_solver.h b/include/core/physics_solver.h index 2b4f465973..8ffafe4fb4 100644 --- a/include/core/physics_solver.h +++ b/include/core/physics_solver.h @@ -13,8 +13,8 @@ * * ---------------------------------------------------------------------*/ -#ifndef LETHE_PHYSICSSOLVER -#define LETHE_PHYSICSSOLVER +#ifndef lethe_physics_solver_h +#define lethe_physics_solver_h #include #include diff --git a/include/core/simulation_control.h b/include/core/simulation_control.h index 983eba4f00..4bc8fa904f 100644 --- a/include/core/simulation_control.h +++ b/include/core/simulation_control.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2020 - */ #ifndef lethe_simulation_control_h diff --git a/include/core/solid_base.h b/include/core/solid_base.h index 71797104b1..5cd4af9378 100644 --- a/include/core/solid_base.h +++ b/include/core/solid_base.h @@ -12,10 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Authors: Carole-Anne Daunais, Valérie Bibeau, Polytechnique Montreal, 2020 - * Jeanne Joachim, Polytechnique Montreal, 2020- */ #ifndef lethe_solid_base_h diff --git a/include/core/solid_objects_parameters.h b/include/core/solid_objects_parameters.h index f343c457ef..1f4a38613a 100644 --- a/include/core/solid_objects_parameters.h +++ b/include/core/solid_objects_parameters.h @@ -12,14 +12,11 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Carole-Anne Daunais, Polytechnique Montreal, 2020 - */ -#ifndef nitsche_h -#define nitsche_h +#ifndef lethe_solid_objects_parameters_h +#define lethe_solid_objects_parameters_h #include diff --git a/include/core/solutions_output.h b/include/core/solutions_output.h index f10d11a58c..27f5eb6667 100644 --- a/include/core/solutions_output.h +++ b/include/core/solutions_output.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2020 - */ #ifndef lethe_solutions_output_h diff --git a/include/core/tensors_and_points_dimension_manipulation.h b/include/core/tensors_and_points_dimension_manipulation.h index 2ff4345137..52d54db1f5 100644 --- a/include/core/tensors_and_points_dimension_manipulation.h +++ b/include/core/tensors_and_points_dimension_manipulation.h @@ -12,19 +12,16 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Shahab Golshan, Polytechnique Montreal, 2019 */ +#ifndef lethe_tensors_and_points_dimension_manipulation_h +#define lethe_tensors_and_points_dimension_manipulation_h + #include #include using namespace dealii; -#ifndef tensors_and_points_dimension_manipulation_h -# define tensors_and_points_dimension_manipulation_h - /** * Copies a two-dimensional tensor in a three-dimensional tensor. The third * element of the three-dimensional tensor (in z direction) is set to zero. diff --git a/include/core/utilities.h b/include/core/utilities.h index 6cff555f59..8261f4e20c 100644 --- a/include/core/utilities.h +++ b/include/core/utilities.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2020 - */ #ifndef lethe_utilities_h diff --git a/include/solvers/cahn_hilliard.h b/include/solvers/cahn_hilliard.h index 800ed81f87..18e98d5e2c 100644 --- a/include/solvers/cahn_hilliard.h +++ b/include/solvers/cahn_hilliard.h @@ -26,8 +26,8 @@ * phase field parameter and the chemical potential. */ -#ifndef cahn_hilliard_h -#define cahn_hilliard_h +#ifndef lethe_cahn_hilliard_h +#define lethe_cahn_hilliard_h #include #include diff --git a/include/solvers/cahn_hilliard_assemblers.h b/include/solvers/cahn_hilliard_assemblers.h index bddc01121b..73e4ff49df 100644 --- a/include/solvers/cahn_hilliard_assemblers.h +++ b/include/solvers/cahn_hilliard_assemblers.h @@ -13,6 +13,8 @@ * * ---------------------------------------------------------------------*/ +#ifndef lethe_cahn_hilliard_assemblers_h +#define lethe_cahn_hilliard_assemblers_h #include @@ -20,10 +22,6 @@ #include #include - -#ifndef lethe_cahn_hilliard_assemblers_h -# define lethe_cahn_hilliard_assemblers_h - /** * @brief A pure virtual class that serves as an interface for all * of the assemblers for the Cahn-Hilliard equation diff --git a/include/solvers/cahn_hilliard_filter.h b/include/solvers/cahn_hilliard_filter.h index 0420169ef8..7c550e53fd 100644 --- a/include/solvers/cahn_hilliard_filter.h +++ b/include/solvers/cahn_hilliard_filter.h @@ -17,7 +17,6 @@ #ifndef lethe_cahn_hilliard_filter_h #define lethe_cahn_hilliard_filter_h - #include /** diff --git a/include/solvers/cahn_hilliard_scratch_data.h b/include/solvers/cahn_hilliard_scratch_data.h index 99ffe1e724..f32c181968 100644 --- a/include/solvers/cahn_hilliard_scratch_data.h +++ b/include/solvers/cahn_hilliard_scratch_data.h @@ -16,6 +16,10 @@ * Scratch data for the CahnHilliard auxiliary physics */ + +#ifndef lethe_cahn_hilliard_scratch_data_h +#define lethe_cahn_hilliard_scratch_data_h + #include #include @@ -33,9 +37,6 @@ #include -#ifndef lethe_cahn_hilliard_scratch_data_h -# define lethe_cahn_hilliard_scratch_data_h - using namespace dealii; diff --git a/include/solvers/copy_data.h b/include/solvers/copy_data.h index b7a9f9bde9..bbffcab603 100644 --- a/include/solvers/copy_data.h +++ b/include/solvers/copy_data.h @@ -15,6 +15,9 @@ */ +#ifndef lethe_copy_data_h +#define lethe_copy_data_h + #include #include @@ -22,9 +25,6 @@ #include -#ifndef copy_data_navier_stokes_h -# define copy_data_navier_stokes_h - using namespace dealii; /** diff --git a/include/solvers/flow_control.h b/include/solvers/flow_control.h index bf26d97804..6ade9dbd86 100644 --- a/include/solvers/flow_control.h +++ b/include/solvers/flow_control.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Audrey Collard-Daigneault, Polytechnique Montreal, 2020 - */ #ifndef lethe_flow_control_h diff --git a/include/solvers/gls_nitsche_navier_stokes.h b/include/solvers/gls_nitsche_navier_stokes.h index 04c4ba5406..15ca961fd5 100644 --- a/include/solvers/gls_nitsche_navier_stokes.h +++ b/include/solvers/gls_nitsche_navier_stokes.h @@ -12,10 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Carole-Anne Daunais, Valérie Bibeau, Polytechnique - Montreal, 2020- */ #ifndef lethe_gls_nitsche_navier_stokes_h diff --git a/include/solvers/initial_conditions.h b/include/solvers/initial_conditions.h index 64ee2dd101..02293b1c0b 100644 --- a/include/solvers/initial_conditions.h +++ b/include/solvers/initial_conditions.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2019 - */ #ifndef lethe_initial_conditions_h diff --git a/include/solvers/isothermal_compressible_navier_stokes_assembler.h b/include/solvers/isothermal_compressible_navier_stokes_assembler.h index 7383c07146..cd2e87edf4 100644 --- a/include/solvers/isothermal_compressible_navier_stokes_assembler.h +++ b/include/solvers/isothermal_compressible_navier_stokes_assembler.h @@ -13,6 +13,11 @@ * * ---------------------------------------------------------------------*/ + + +#ifndef lethe_isothermal_compressible_navier_stokes_assembler_h +#define lethe_isothermal_compressible_navier_stokes_assembler_h + #include #include #include @@ -21,9 +26,6 @@ #include #include -#ifndef lethe_isothermal_compressible_navier_stokes_assembler_h -# define lethe_isothermal_compressible_navier_stokes_assembler_h - /** * @brief Class that assembles the core of the isothermal compressible Navier-Stokes equations. diff --git a/include/solvers/isothermal_compressible_navier_stokes_vof_assembler.h b/include/solvers/isothermal_compressible_navier_stokes_vof_assembler.h index 7844d66424..e01655c15d 100644 --- a/include/solvers/isothermal_compressible_navier_stokes_vof_assembler.h +++ b/include/solvers/isothermal_compressible_navier_stokes_vof_assembler.h @@ -14,6 +14,9 @@ * ---------------------------------------------------------------------*/ +#ifndef lethe_isothermal_compressible_navier_stokes_vof_assembler_h +#define lethe_isothermal_compressible_navier_stokes_vof_assembler_h + #include #include @@ -21,9 +24,6 @@ #include #include -#ifndef lethe_isothermal_compressible_navier_stokes_vof_assembler_h -# define lethe_isothermal_compressible_navier_stokes_vof_assembler_h - /** * @brief Class that assembles the core of the Navier-Stokes equation with diff --git a/include/solvers/navier_stokes_assemblers.h b/include/solvers/navier_stokes_assemblers.h index 760a47ed43..09b5252687 100644 --- a/include/solvers/navier_stokes_assemblers.h +++ b/include/solvers/navier_stokes_assemblers.h @@ -13,6 +13,8 @@ * * ---------------------------------------------------------------------*/ +#ifndef lethe_navier_stokes_assemblers_h +#define lethe_navier_stokes_assemblers_h #include #include @@ -22,9 +24,6 @@ #include #include -#ifndef lethe_navier_stokes_assemblers_h -# define lethe_navier_stokes_assemblers_h - /* * Exceptions used to capture incoherent setup of assemblers diff --git a/include/solvers/navier_stokes_cahn_hilliard_assemblers.h b/include/solvers/navier_stokes_cahn_hilliard_assemblers.h index cd7a97497a..4dd565f756 100644 --- a/include/solvers/navier_stokes_cahn_hilliard_assemblers.h +++ b/include/solvers/navier_stokes_cahn_hilliard_assemblers.h @@ -14,6 +14,9 @@ * ---------------------------------------------------------------------*/ +#ifndef lethe_navier_stokes_cahn_hilliard_assemblers_h +#define lethe_navier_stokes_cahn_hilliard_assemblers_h + #include #include @@ -21,9 +24,6 @@ #include #include -#ifndef lethe_navier_stokes_cahn_hilliard_assemblers_h -# define lethe_navier_stokes_cahn_hilliard_assemblers_h - /** * @brief Class that assembles the core of the Navier-Stokes equation with diff --git a/include/solvers/navier_stokes_scratch_data.h b/include/solvers/navier_stokes_scratch_data.h index 2dfd2cc256..23362ae15b 100644 --- a/include/solvers/navier_stokes_scratch_data.h +++ b/include/solvers/navier_stokes_scratch_data.h @@ -14,6 +14,10 @@ * --------------------------------------------------------------------- */ + +#ifndef lethe_navier_stokes_scratch_data_h +#define lethe_navier_stokes_scratch_data_h + #include #include #include @@ -39,11 +43,6 @@ #include - - -#ifndef lethe_navier_stokes_scratch_data_h -# define lethe_navier_stokes_scratch_data_h - using namespace dealii; diff --git a/include/solvers/navier_stokes_vof_assemblers.h b/include/solvers/navier_stokes_vof_assemblers.h index 4deba02049..ae9f611410 100644 --- a/include/solvers/navier_stokes_vof_assemblers.h +++ b/include/solvers/navier_stokes_vof_assemblers.h @@ -13,6 +13,9 @@ * * ---------------------------------------------------------------------*/ +#ifndef lethe_navier_stokes_vof_assemblers_h +#define lethe_navier_stokes_vof_assemblers_h + #include #include @@ -21,9 +24,6 @@ #include #include -#ifndef lethe_navier_stokes_vof_assemblers_h -# define lethe_navier_stokes_vof_assemblers_h - /** * @brief Assembles the core of the Navier-Stokes equation with diff --git a/include/solvers/postprocessing_cfd.h b/include/solvers/postprocessing_cfd.h index 4e4a1678d1..184e164457 100644 --- a/include/solvers/postprocessing_cfd.h +++ b/include/solvers/postprocessing_cfd.h @@ -12,35 +12,32 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Audrey Collard-Daigneault, Bruno Blais, Polytechnique Montreal, 2020 - - */ #ifndef lethe_postprocessing_cfd_h +#define lethe_postprocessing_cfd_h // Base -# include +#include // Lac -# include -# include +#include +#include // Dofs -# include +#include // Fe -# include -# include +#include +#include // Lethe includes -# include -# include +#include +#include -# include +#include /** * @brief Calculate the pressure drop and total pressure drop between two boundaries. @@ -379,6 +376,6 @@ calculate_average_velocity(const DoFHandler &dof_handler, -# define lethe_postprocessing_cfd_h +#define lethe_postprocessing_cfd_h #endif diff --git a/include/solvers/postprocessing_velocities.h b/include/solvers/postprocessing_velocities.h index 7482099697..73c1f6e216 100644 --- a/include/solvers/postprocessing_velocities.h +++ b/include/solvers/postprocessing_velocities.h @@ -12,9 +12,6 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Audrey Collard-Daigneault, Polytechnique Montreal, 2020 - */ #ifndef lethe_postprocessing_velocities_h diff --git a/include/solvers/postprocessors.h b/include/solvers/postprocessors.h index c7c0e4b715..e74d700bdc 100644 --- a/include/solvers/postprocessors.h +++ b/include/solvers/postprocessors.h @@ -1,6 +1,21 @@ +/* --------------------------------------------------------------------- + * + * Copyright (C) 2019 - by the Lethe authors + * + * This file is part of the Lethe library + * + * The Lethe library is free software; you can use it, redistribute + * it, and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * The full text of the license can be found in the file LICENSE at + * the top level of the Lethe distribution. + * + * --------------------------------------------------------------------- + */ -#ifndef lethe_post_processors_h -#define lethe_post_processors_h +#ifndef lethe_postprocessors_h +#define lethe_postprocessors_h #include diff --git a/include/solvers/postprocessors_smoothing.h b/include/solvers/postprocessors_smoothing.h index 97538a59ca..c488182654 100644 --- a/include/solvers/postprocessors_smoothing.h +++ b/include/solvers/postprocessors_smoothing.h @@ -1,6 +1,21 @@ +/* --------------------------------------------------------------------- + * + * Copyright (C) 2019 - by the Lethe authors + * + * This file is part of the Lethe library + * + * The Lethe library is free software; you can use it, redistribute + * it, and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * The full text of the license can be found in the file LICENSE at + * the top level of the Lethe distribution. + * + * --------------------------------------------------------------------- + */ -#ifndef lethe_post_processors_smoothing_h -#define lethe_post_processors_smoothing_h +#ifndef lethe_postprocessors_smoothing_h +#define lethe_postprocessors_smoothing_h #include diff --git a/include/solvers/simulation_parameters.h b/include/solvers/simulation_parameters.h index c672845eef..a13988afe1 100644 --- a/include/solvers/simulation_parameters.h +++ b/include/solvers/simulation_parameters.h @@ -12,13 +12,10 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - - * - * Author: Bruno Blais, Polytechnique Montreal, 2019 - */ -#ifndef lethe_navier_stokes_solver_parameters_h -#define lethe_navier_stokes_solver_parameters_h +#ifndef lethe_simulation_parameters_h +#define lethe_simulation_parameters_h #include #include diff --git a/include/solvers/stabilization.h b/include/solvers/stabilization.h index 78d47507e6..6e00354e90 100644 --- a/include/solvers/stabilization.h +++ b/include/solvers/stabilization.h @@ -15,6 +15,9 @@ * */ +#ifndef lethe_stabilization_h +#define lethe_stabilization_h + #include #include @@ -69,3 +72,6 @@ calculate_navier_stokes_gls_tau_transient(const double u_mag, 9 * Utilities::fixed_power<2>(4 * kinematic_viscosity / (h * h))); } + + +#endif diff --git a/include/solvers/tracer.h b/include/solvers/tracer.h index d7818d2cc6..a834455c50 100644 --- a/include/solvers/tracer.h +++ b/include/solvers/tracer.h @@ -19,7 +19,6 @@ * dT/dt + u * gradT = D * div(grad T) + f * with T the tracer function, D the diffusivity and f the forcing * - * Author: Bruno Blais, Polytechnique Montreal, 2020- */ #ifndef lethe_tracer_h diff --git a/include/solvers/tracer_assemblers.h b/include/solvers/tracer_assemblers.h index 8c08a3107d..272de5372b 100644 --- a/include/solvers/tracer_assemblers.h +++ b/include/solvers/tracer_assemblers.h @@ -13,16 +13,14 @@ * * ---------------------------------------------------------------------*/ +#ifndef lethe_tracer_assemblers_h +#define lethe_tracer_assemblers_h #include #include #include - -#ifndef lethe_tracer_assemblers_h -# define lethe_tracer_assemblers_h - /** * @brief A pure virtual class that serves as an interface for all * of the assemblers for the Tracer equation diff --git a/include/solvers/tracer_scratch_data.h b/include/solvers/tracer_scratch_data.h index d3c3638dfb..0f9a033cf3 100644 --- a/include/solvers/tracer_scratch_data.h +++ b/include/solvers/tracer_scratch_data.h @@ -12,10 +12,12 @@ * the top level of the Lethe distribution. * * --------------------------------------------------------------------- - * - * Scratch data for the tracer auxiliary physics */ + +#ifndef lethe_tracer_scratch_data_h +#define lethe_tracer_scratch_data_h + #include #include @@ -33,9 +35,6 @@ #include -#ifndef lethe_tracer_scratch_data_h -# define lethe_tracer_scratch_data_h - using namespace dealii; diff --git a/include/solvers/vof.h b/include/solvers/vof.h index 4bb0b3e646..761d1d5ed8 100644 --- a/include/solvers/vof.h +++ b/include/solvers/vof.h @@ -14,8 +14,8 @@ * --------------------------------------------------------------------- */ -#ifndef lethe_VOF_h -#define lethe_VOF_h +#ifndef lethe_vof_h +#define lethe_vof_h #include #include diff --git a/include/solvers/vof_assemblers.h b/include/solvers/vof_assemblers.h index f160e3ac8b..d73f54e9f8 100644 --- a/include/solvers/vof_assemblers.h +++ b/include/solvers/vof_assemblers.h @@ -14,16 +14,15 @@ * --------------------------------------------------------------------- */ +#ifndef lethe_vof_assemblers_h +#define lethe_vof_assemblers_h + #include #include #include -#ifndef lethe_vof_assemblers_h -# define lethe_vof_assemblers_h - - /** * @brief A pure virtual class that serves as an interface for all * of the assemblers for the VOF solver diff --git a/include/solvers/vof_scratch_data.h b/include/solvers/vof_scratch_data.h index 9eb6d53311..e2054af4ca 100644 --- a/include/solvers/vof_scratch_data.h +++ b/include/solvers/vof_scratch_data.h @@ -16,6 +16,10 @@ * Scratch data for the VOF auxiliary physics */ + +#ifndef lethe_vof_scratch_data_h +#define lethe_vof_scratch_data_h + #include #include @@ -32,8 +36,6 @@ #include -#ifndef lethe_VOF_scratch_data_h -# define lethe_VOF_scratch_data_h using namespace dealii;