phynexis-deps/mfem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting VectorFiniteElement constructor and overriding defaults in new classes only

Browse Source
This commit is contained in:
Stowell, Mark L
2022-03-03 19:06:06 -08:00
parent 90a8e7bbf5
commit 8c775bcb25
5 changed files with 82 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fem/fe/fe_base.cpp
+19 -8
View File
@@ -20,11 +20,11 @@ namespace mfem
using namespace std;
FiniteElement::FiniteElement(int D, Geometry::Type G,
int Do, int O, int F, int VD, int CD)
int Do, int O, int F)
: Nodes(Do)
{
dim = D ; geom_type = G ; dof = Do ; order = O ; func_space = F;
vdim = VD ; cdim = CD;
vdim = 0 ; cdim = 0;
range_type = SCALAR;
map_type = VALUE;
deriv_type = NONE;
@@ -833,6 +833,21 @@ void NodalFiniteElement::ProjectDiv(
}
VectorFiniteElement::VectorFiniteElement(int D, Geometry::Type G,
int Do, int O, int M, int F)
: FiniteElement(D, G, Do, O, F)
{
range_type = VECTOR;
map_type = M;
SetDerivMembers();
is_nodal = true;
vdim = dim;
if (map_type == H_CURL)
{
cdim = (dim == 3) ? 3 : 1;
}
}
void VectorFiniteElement::CalcShape (
const IntegrationPoint &ip, Vector &shape ) const
{
@@ -2412,15 +2427,13 @@ void NodalTensorFiniteElement::SetMapType(const int map_type)
}
VectorTensorFiniteElement::VectorTensorFiniteElement(const int dims,
const int dimv,
const int dimc,
const int d,
const int p,
const int cbtype,
const int obtype,
const int M,
const DofMapType dmtype)
: VectorFiniteElement(dims, dimv, dimc, GetTensorProductGeometry(dims), d,
: VectorFiniteElement(dims, GetTensorProductGeometry(dims), d,
p, M, FunctionSpace::Qk),
TensorBasisElement(dims, p, VerifyNodal(cbtype), dmtype),
cbasis1d(poly1d.GetBasis(p, VerifyClosed(cbtype))),
@@ -2431,14 +2444,12 @@ VectorTensorFiniteElement::VectorTensorFiniteElement(const int dims,
}
VectorTensorFiniteElement::VectorTensorFiniteElement(const int dims,
const int dimv,
const int dimc,
const int d,
const int p,
const int obtype,
const int M,
const DofMapType dmtype)
: VectorFiniteElement(dims, dimv, dimc, GetTensorProductGeometry(dims), d,
: VectorFiniteElement(dims, GetTensorProductGeometry(dims), d,
p, M, FunctionSpace::Pk),
TensorBasisElement(dims, p, obtype, dmtype),
cbasis1d(poly1d.GetBasis(p, VerifyOpen(obtype))),