Reverting to 51b3e46

KratosMultiphysics · Dec 13, 2024 · b0013b8 · b0013b8
1 parent 51b3e46
commit b0013b8
Show file tree

Hide file tree

Showing 34 changed files with 73 additions and 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
@@ -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
+} // 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
@@ -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
@@ -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
@@ -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
+} // namespace Kratos
diff --git a/...tom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h b/...tom_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)
 
 ///@}
 
-}
+}
diff --git 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
+#endif
diff --git a/...ns/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h b/...ns/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
+#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
@@ -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
+#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
@@ -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
+#endif
diff --git a/...sApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h b/...sApplication/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
+#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
@@ -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/...pplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h b/...pplication/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
+#endif
diff --git a/...tion/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h b/...tion/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
+#endif
diff --git a/...on/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h b/...on/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
+#endif
diff --git a/...ntainers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h b/...ntainers/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
+#endif
diff --git a/...ata_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h b/...ata_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
@@ -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
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-}
+}
diff --git 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/...cations/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp b/...cations/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
@@ -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
@@ -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
@@ -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
@@ -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
+#endif // KRATOS_FLUID_ELEMENT_H
diff --git 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
@@ -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> >;
-}
+}
diff --git 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
@@ -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/...cations/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp b/...cations/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
 {