Moving BlockSize to data container

KratosMultiphysics · Dec 12, 2024 · 51b3e46 · 51b3e46
1 parent 81170f6
commit 51b3e46
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 6 deletions.
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
@@ -48,6 +48,8 @@ using NodalVectorData = typename FluidElementData<TDim,TNumNodes, true>::NodalVe
 using ShapeFunctionsType = typename FluidElementData<TDim,TNumNodes, true>::ShapeFunctionsType;
 using MatrixRowType = typename FluidElementData<TDim,TNumNodes, true>::MatrixRowType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h
@@ -38,6 +38,8 @@ using NodalVectorData = typename TFluidData::NodalVectorData;
 typedef GeometryData::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 typedef std::vector<array_1d<double,3>> InterfaceNormalsType;
 
+static constexpr std::size_t BlockSize = TFluidData::BlockSize;
+
 ///@}
 ///@name Public Members
 ///@{

diff --git a/...ns/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h b/...ns/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h
@@ -38,6 +38,9 @@ using NodalVectorData = typename TFluidData::NodalVectorData;
 typedef GeometryData::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 typedef std::vector<array_1d<double,3>> InterfaceNormalsType;
 
+/// Number of nodal unknowns (taken from underlying element data)
+static constexpr std::size_t BlockSize = TFluidData::BlockSize;
+
 /// Number of edges of the element (simplex elements are assumed)
 constexpr static std::size_t NumEdges = (TFluidData::NumNodes == 3) ? 3 : 6;
 

diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h
@@ -36,6 +36,8 @@ class FICData : public FluidElementData<TDim,TNumNodes, TElementIntegratesInTime
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/fluid_element_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/fluid_element_data.h
@@ -57,9 +57,6 @@ class KRATOS_API(FLUID_DYNAMICS_APPLICATION) FluidElementData
     /// Number of nodes of the element.
     constexpr static unsigned int NumNodes = TNumNodes;
 
-    /// Number of local unknowns (assuming velocity and pressure)
-    constexpr static unsigned int BlockSize = TDim + 1;
-
     /// Size of the strain and stress vectors (in Voigt notation) for the formulation
     constexpr static unsigned int StrainSize = (TDim-1)*3; // 3 in 2D, 6 in 3D
 

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
@@ -36,6 +36,8 @@ class QSVMSData : public FluidElementData<TDim,TNumNodes, TElementIntegratesInTi
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

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
@@ -46,8 +46,7 @@ class QSVMSDEMCoupledData : public QSVMSData<TDim, TNumNodes, TElementIntegrates
 
 constexpr static unsigned int Dim = TDim;
 constexpr static unsigned int NumNodes = TNumNodes;
-constexpr static unsigned int BlockSize = Dim + 2;
-constexpr static unsigned int DofSize = NumNodes * BlockSize;
+constexpr static unsigned int BlockSize = Dim + 1;
 constexpr static bool ElementIntegratesInTime = TElementIntegratesInTime;
 
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;

diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h
@@ -46,6 +46,8 @@ using NodalVectorData = typename FluidElementData<TDim, TNumNodes, true>::NodalV
 using ShapeFunctionsType = typename FluidElementData<TDim, TNumNodes, true>::ShapeFunctionsType;
 using MatrixRowType = typename FluidElementData<TDim, TNumNodes, true>::MatrixRowType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

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
@@ -35,6 +35,8 @@ class TimeIntegratedFICData : public FICData<TDim,TNumNodes,true>
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

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
@@ -35,6 +35,8 @@ class TimeIntegratedQSVMSData : public QSVMSData<TDim,TNumNodes,true>
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

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
@@ -45,6 +45,8 @@ using MatrixRowType = typename FluidElementData<TDim, TNumNodes, true>::MatrixRo
 typedef Geometry<Node> GeometryType;
 typedef GeometryType::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

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
@@ -45,6 +45,8 @@ using MatrixRowType = typename FluidElementData<TDim, TNumNodes, true>::MatrixRo
 typedef Geometry<Node> GeometryType;
 typedef GeometryType::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

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
@@ -49,6 +49,8 @@ using NodalVectorData = typename FluidElementData<TDim,TNumNodes, true>::NodalVe
 using ShapeFunctionsType = typename FluidElementData<TDim,TNumNodes, true>::ShapeFunctionsType;
 using MatrixRowType = typename FluidElementData<TDim,TNumNodes, true>::MatrixRowType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{

diff --git a/applications/FluidDynamicsApplication/custom_elements/fluid_element.h b/applications/FluidDynamicsApplication/custom_elements/fluid_element.h
@@ -106,7 +106,7 @@ class FluidElement : public Element
 
     static constexpr unsigned int NumNodes = TElementData::NumNodes;
 
-    static constexpr unsigned int BlockSize = Dim + 1;
+    static constexpr unsigned int BlockSize = TElementData::BlockSize;
 
     static constexpr unsigned int LocalSize = NumNodes * BlockSize;