From b0013b82d51935023dfcec2f0725efda39014a3c Mon Sep 17 00:00:00 2001 From: rubenzorrilla Date: Fri, 13 Dec 2024 10:30:02 +0100 Subject: [PATCH] Reverting to 51b3e46f653dcaf2a0fd363fa283e794abae5a36 --- .../alternative_d_vms_dem_coupled.cpp | 4 ++-- .../alternative_qs_vms_dem_coupled.cpp | 2 +- .../custom_elements/d_vms.cpp | 6 +++--- .../custom_elements/d_vms_dem_coupled.cpp | 4 ++-- .../axisymmetric_navier_stokes_data.h | 4 ++-- .../data_containers/embedded_data.h | 4 ++-- .../embedded_discontinuous_data.h | 4 ++-- .../data_containers/fic/fic_data.h | 4 ++-- .../data_containers/qs_vms/qs_vms_data.h | 4 ++-- .../qs_vms_dem_coupled_data.h | 6 +++--- .../data_containers/stokes/stokes_data.h | 2 +- .../time_integrated_fic_data.h | 4 ++-- .../time_integrated_qs_vms_data.h | 4 ++-- .../two_fluid_navier_stokes_data.h | 4 ++-- ...two_fluid_navier_stokes_alpha_method_data.h | 4 ++-- .../weakly_compressible_navier_stokes_data.h | 2 +- .../custom_elements/embedded_fluid_element.cpp | 9 +++++---- .../custom_elements/embedded_fluid_element.h | 2 +- .../embedded_fluid_element_discontinuous.cpp | 7 ++++--- .../embedded_fluid_element_discontinuous.h | 2 +- .../custom_elements/fic.cpp | 4 ++-- .../custom_elements/fluid_element.cpp | 18 +++++++++--------- .../custom_elements/fluid_element.h | 4 ++-- .../custom_elements/qs_vms.cpp | 6 +++--- .../custom_elements/qs_vms_dem_coupled.cpp | 4 ++-- .../custom_elements/symbolic_stokes.cpp | 2 +- .../two_fluid_navier_stokes.cpp | 4 ++-- .../two_fluid_navier_stokes_alpha_method.cpp | 2 +- .../weakly_compressible_navier_stokes.cpp | 4 ++-- .../custom_utilities/fluid_element_utilities.h | 2 +- .../symbolic_stokes_cpp_template.cpp | 2 +- ...compressible_navier_stokes_cpp_template.cpp | 4 ++-- ...uid_navier_stokes_alpha_method_template.cpp | 2 +- .../two_fluid_navier_stokes_template.cpp | 4 ++-- 34 files changed, 73 insertions(+), 71 deletions(-) diff --git a/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp index 5f94018fd6f..c8ee36252c8 100644 --- a/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp @@ -18,7 +18,7 @@ // Aplication includes #include "alternative_d_vms_dem_coupled.h" -#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" +#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" #include "custom_utilities/fluid_element_utilities.h" #include "fluid_dynamics_application_variables.h" @@ -1557,4 +1557,4 @@ template class AlternativeDVMSDEMCoupled< QSVMSDEMCoupledData<2,9> >; template class AlternativeDVMSDEMCoupled< QSVMSDEMCoupledData<3,8> >; template class AlternativeDVMSDEMCoupled< QSVMSDEMCoupledData<3,27> >; -} // namespace Kratos \ No newline at end of file +} // namespace Kratos diff --git a/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp index 8db456af6ea..8f613ea84f2 100644 --- a/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp @@ -17,7 +17,7 @@ // Aplication includes #include "alternative_qs_vms_dem_coupled.h" -#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" +#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" #include "custom_utilities/fluid_element_utilities.h" #include "fluid_dynamics_application_variables.h" #include "utilities/sparse_matrix_multiplication_utility.h" diff --git a/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp b/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp index 3cc6f130d8c..d5300773ff0 100644 --- a/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp @@ -14,9 +14,9 @@ #include "includes/cfd_variables.h" #include "includes/checks.h" -#include "custom_elements/data_containers/qs_vms/qs_vms_data.h" -#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" -//#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" +#include "data_containers/qs_vms/qs_vms_data.h" +#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" +//#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" #include "custom_utilities/fluid_element_utilities.h" namespace Kratos diff --git a/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp index de1d418844b..4737ccfb84a 100644 --- a/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp @@ -18,7 +18,7 @@ // Aplication includes #include "d_vms_dem_coupled.h" -#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" +#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" #include "custom_utilities/fluid_element_utilities.h" #include "fluid_dynamics_application_variables.h" @@ -1315,4 +1315,4 @@ template class DVMSDEMCoupled< QSVMSDEMCoupledData<2,9> >; template class DVMSDEMCoupled< QSVMSDEMCoupledData<3,8> >; template class DVMSDEMCoupled< QSVMSDEMCoupledData<3,27> >; -} // namespace Kratos \ No newline at end of file +} // namespace Kratos diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h index c6dfea60dd3..966336f5474 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h @@ -22,7 +22,7 @@ // Application includes #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" #include "utilities/element_size_calculator.h" namespace Kratos { @@ -144,4 +144,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo) ///@} -} \ No newline at end of file +} diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h index af38acbb796..4353209aece 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h @@ -14,7 +14,7 @@ #define KRATOS_EMBEDDED_DATA_H #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" namespace Kratos { @@ -123,4 +123,4 @@ bool IsCut() { } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h index 25a3fd5f5fe..353f0646286 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h @@ -14,7 +14,7 @@ #define KRATOS_EMBEDDED_DISCONTINUOUS_DATA_H #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" namespace Kratos { @@ -169,4 +169,4 @@ inline bool IsIncised() } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h index 0892057805e..9888faea416 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h @@ -15,7 +15,7 @@ #define KRATOS_FIC_DATA_H #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" namespace Kratos { @@ -102,4 +102,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo) } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms/qs_vms_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms/qs_vms_data.h index 4d832cb5f98..5d8ff91644e 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms/qs_vms_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms/qs_vms_data.h @@ -14,7 +14,7 @@ #define KRATOS_QSVMS_DATA_H #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" #include "utilities/element_size_calculator.h" namespace Kratos { @@ -116,4 +116,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo) } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h index d5e4df4e139..bf8fbc17e41 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h @@ -24,8 +24,8 @@ // Application includes #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" -#include "custom_elements/data_containers/qs_vms/qs_vms_data.h" +#include "data_containers/fluid_element_data.h" +#include "data_containers/qs_vms/qs_vms_data.h" namespace Kratos { @@ -111,4 +111,4 @@ void UpdateSecondDerivativesValues(const ShapeFunctionsSecondDerivativesType& rD } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h index 1b8a3bf4c0d..b19cc4b3964 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h @@ -22,7 +22,7 @@ // Application includes #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" #include "utilities/element_size_calculator.h" namespace Kratos { diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h index 14075e40d07..a121944e05b 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h @@ -14,7 +14,7 @@ #define KRATOS_TIME_INTEGRATED_FIC_DATA_H #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fic/fic_data.h" +#include "data_containers/fic/fic_data.h" namespace Kratos { @@ -83,4 +83,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo) } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h index f34108f6a62..6ca4e0e5e37 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h @@ -14,7 +14,7 @@ #define KRATOS_TIME_INTEGRATED_QSVMS_DATA_H #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/qs_vms/qs_vms_data.h" +#include "data_containers/qs_vms/qs_vms_data.h" namespace Kratos { @@ -83,4 +83,4 @@ static int Check(const Element& rElement, const ProcessInfo& rProcessInfo) } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h index ceaa2bc1e7a..923d85380ba 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h @@ -17,7 +17,7 @@ #include "includes/constitutive_law.h" #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" #include "utilities/element_size_calculator.h" #include "custom_utilities/fluid_element_utilities.h" @@ -367,4 +367,4 @@ void ComputeDarcyTerm() } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h index dfaf01c1eeb..4f8d27a7bb9 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h @@ -17,7 +17,7 @@ #include "includes/constitutive_law.h" #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" #include "utilities/element_size_calculator.h" #include "custom_utilities/fluid_element_utilities.h" @@ -376,4 +376,4 @@ void ComputeDarcyTerm() } -#endif \ No newline at end of file +#endif diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h index e7a8267d7ba..7c5f6b7457f 100644 --- a/applications/FluidDynamicsApplication/custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h +++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h @@ -25,7 +25,7 @@ // Application includes #include "fluid_dynamics_application_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" #include "utilities/element_size_calculator.h" namespace Kratos { diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp index 976568d111f..76822d38277 100644 --- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp @@ -4,10 +4,11 @@ #include "custom_elements/qs_vms.h" #include "custom_elements/weakly_compressible_navier_stokes.h" -#include "custom_elements/data_containers/embedded_data.h" #include "utilities/element_size_calculator.h" -#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" -#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" + +#include "data_containers/embedded_data.h" +#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" +#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" #include "modified_shape_functions/triangle_2d_3_modified_shape_functions.h" #include "modified_shape_functions/tetrahedra_3d_4_modified_shape_functions.h" @@ -1130,4 +1131,4 @@ template class EmbeddedFluidElement< WeaklyCompressibleNavierStokes< WeaklyCompr /////////////////////////////////////////////////////////////////////////////////////////////////// -} \ No newline at end of file +} diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h index 681a6106bd3..6a020367cd6 100644 --- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h +++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h @@ -23,7 +23,7 @@ #include "includes/cfd_variables.h" #include "custom_elements/fluid_element.h" -#include "custom_elements/data_containers/embedded_data.h" +#include "data_containers/embedded_data.h" namespace Kratos { diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp index 3b15623136c..fd7d6486377 100644 --- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp @@ -5,9 +5,10 @@ #include "custom_elements/weakly_compressible_navier_stokes.h" #include "utilities/element_size_calculator.h" -#include "custom_elements/data_containers/embedded_discontinuous_data.h" -#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" -#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" + +#include "data_containers/embedded_discontinuous_data.h" +#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" +#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" #include "modified_shape_functions/triangle_2d_3_modified_shape_functions.h" #include "modified_shape_functions/tetrahedra_3d_4_modified_shape_functions.h" diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h index b8fa3b4d96d..7833d167dd4 100644 --- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h +++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h @@ -23,7 +23,7 @@ #include "includes/cfd_variables.h" #include "custom_elements/fluid_element.h" -#include "custom_elements/data_containers/embedded_discontinuous_data.h" +#include "data_containers/embedded_discontinuous_data.h" namespace Kratos { diff --git a/applications/FluidDynamicsApplication/custom_elements/fic.cpp b/applications/FluidDynamicsApplication/custom_elements/fic.cpp index 729f740e357..d515d23aa31 100644 --- a/applications/FluidDynamicsApplication/custom_elements/fic.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/fic.cpp @@ -15,8 +15,8 @@ #include "includes/cfd_variables.h" #include "includes/checks.h" -#include "custom_elements/data_containers/fic/fic_data.h" -#include "custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h" +#include "data_containers/fic/fic_data.h" +#include "data_containers/time_integrated_fic/time_integrated_fic_data.h" #include "custom_utilities/fluid_element_utilities.h" #include "utilities/element_size_calculator.h" #include "custom_utilities/fluid_element_time_integration_detail.h" diff --git a/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp b/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp index 66ec1334e04..081a4edce93 100644 --- a/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp @@ -15,15 +15,15 @@ #include "includes/checks.h" #include "data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h" -#include "custom_elements/data_containers/qs_vms/qs_vms_data.h" -#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" -#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" -#include "custom_elements/data_containers/fic/fic_data.h" -#include "custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h" -#include "custom_elements/data_containers/stokes/stokes_data.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" -#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" +#include "data_containers/qs_vms/qs_vms_data.h" +#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" +#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" +#include "data_containers/fic/fic_data.h" +#include "data_containers/time_integrated_fic/time_integrated_fic_data.h" +#include "data_containers/stokes/stokes_data.h" +#include "data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h" +#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" +#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" #include "utilities/element_size_calculator.h" #include "custom_utilities/vorticity_utilities.h" diff --git a/applications/FluidDynamicsApplication/custom_elements/fluid_element.h b/applications/FluidDynamicsApplication/custom_elements/fluid_element.h index 47c941fb815..c2024aaebb6 100644 --- a/applications/FluidDynamicsApplication/custom_elements/fluid_element.h +++ b/applications/FluidDynamicsApplication/custom_elements/fluid_element.h @@ -21,7 +21,7 @@ #include "geometries/geometry.h" #include "includes/cfd_variables.h" -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" #include "fluid_dynamics_application_variables.h" @@ -664,4 +664,4 @@ inline std::ostream& operator <<(std::ostream& rOStream, } // namespace Kratos. -#endif // KRATOS_FLUID_ELEMENT_H \ No newline at end of file +#endif // KRATOS_FLUID_ELEMENT_H diff --git a/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp b/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp index c18ba4c6e1b..0a471e714e2 100644 --- a/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp @@ -14,9 +14,9 @@ #include "includes/cfd_variables.h" #include "includes/checks.h" -#include "custom_elements/data_containers/qs_vms/qs_vms_data.h" -#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" -#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" +#include "data_containers/qs_vms/qs_vms_data.h" +#include "data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h" +#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" #include "custom_utilities/fluid_element_utilities.h" #include "custom_utilities/fluid_element_time_integration_detail.h" diff --git a/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp index 020ef6d5f28..e965244980c 100644 --- a/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp @@ -17,7 +17,7 @@ // Aplication includes #include "qs_vms_dem_coupled.h" -#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" +#include "data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h" #include "custom_utilities/fluid_element_utilities.h" #include "fluid_dynamics_application_variables.h" @@ -1124,4 +1124,4 @@ template class QSVMSDEMCoupled< QSVMSDEMCoupledData<2,9> >; template class QSVMSDEMCoupled< QSVMSDEMCoupledData<3,8> >; template class QSVMSDEMCoupled< QSVMSDEMCoupledData<3,27> >; -} \ No newline at end of file +} diff --git a/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp b/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp index 543c9f2bf98..55bd4b4e3e1 100644 --- a/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp @@ -18,7 +18,7 @@ // Application includes #include "symbolic_stokes.h" -#include "custom_elements/data_containers/stokes/stokes_data.h" +#include "data_containers/stokes/stokes_data.h" #include "custom_utilities/fluid_element_utilities.h" namespace Kratos diff --git a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp index 8f017366205..e45d98d9793 100644 --- a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp @@ -12,8 +12,8 @@ // #include "two_fluid_navier_stokes.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" +#include "data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h" +#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" namespace Kratos { diff --git a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp index 5e21ddaaeb6..96b74072c57 100644 --- a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp @@ -12,7 +12,7 @@ // #include "two_fluid_navier_stokes_alpha_method.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" +#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" namespace Kratos { diff --git a/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp b/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp index e6664c4cdfb..6e3301ddeea 100644 --- a/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp +++ b/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp @@ -21,7 +21,7 @@ // Application includes #include "weakly_compressible_navier_stokes.h" -#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" +#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" namespace Kratos { @@ -1371,4 +1371,4 @@ void WeaklyCompressibleNavierStokes::load(Serializer& rSerializer) template class WeaklyCompressibleNavierStokes< WeaklyCompressibleNavierStokesData<2,3> >; template class WeaklyCompressibleNavierStokes< WeaklyCompressibleNavierStokesData<3,4> >; -} \ No newline at end of file +} diff --git a/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h b/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h index 6390e73ace9..61649ab13ff 100644 --- a/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h +++ b/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h @@ -20,7 +20,7 @@ #include "includes/define.h" // Application includes -#include "custom_elements/data_containers/fluid_element_data.h" +#include "data_containers/fluid_element_data.h" namespace Kratos diff --git a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp index 38bf0d67aa2..7300990b2c1 100644 --- a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp +++ b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp @@ -18,7 +18,7 @@ // Application includes #include "symbolic_stokes.h" -#include "custom_elements/data_containers/stokes/stokes_data.h" +#include "data_containers/stokes/stokes_data.h" #include "custom_utilities/fluid_element_utilities.h" namespace Kratos diff --git a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp index a5c19b56a5a..5861101e5cb 100644 --- a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp +++ b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp @@ -21,7 +21,7 @@ // Application includes #include "weakly_compressible_navier_stokes.h" -#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" +#include "data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h" namespace Kratos { @@ -421,4 +421,4 @@ void WeaklyCompressibleNavierStokes::load(Serializer& rSerializer) template class WeaklyCompressibleNavierStokes< WeaklyCompressibleNavierStokesData<2,3> >; template class WeaklyCompressibleNavierStokes< WeaklyCompressibleNavierStokesData<3,4> >; -} \ No newline at end of file +} diff --git a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp index 5b41e03ed76..5fda45ef6ea 100644 --- a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp +++ b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp @@ -12,7 +12,7 @@ // #include "two_fluid_navier_stokes_alpha_method.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" +#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" namespace Kratos { diff --git a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp index 76de5936d08..98231cc10ab 100644 --- a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp +++ b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp @@ -12,8 +12,8 @@ // #include "two_fluid_navier_stokes.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h" -#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" +#include "data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h" +#include "data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h" namespace Kratos {