Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add codimension in get_name() for a few elements #16814

Merged
merged 1 commit into from
Mar 30, 2024
Merged

Add codimension in get_name() for a few elements #16814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion source/fe/fe_bernstein.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@ FE_Bernstein<dim, spacedim>::get_name() const
// kept in synch

std::ostringstream namebuf;
namebuf << "FE_Bernstein<" << dim << ">(" << this->degree << ")";
namebuf << "FE_Bernstein<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";
return namebuf.str();
}

Expand Down
4 changes: 2 additions & 2 deletions source/fe/fe_hermite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,8 @@ std::string
FE_Hermite<dim, spacedim>::get_name() const
{
std::ostringstream name_buffer;
name_buffer << "FE_Hermite<" << dim << "," << spacedim << ">(" << this->degree
<< ")";
name_buffer << "FE_Hermite<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";
return name_buffer.str();
}

Expand Down
3 changes: 2 additions & 1 deletion source/fe/fe_nedelec_sz.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3342,7 +3342,8 @@ FE_NedelecSZ<dim, spacedim>::get_name() const
// note that the FETools::get_fe_by_name function depends on the particular
// format of the string this function returns, so they have to be kept in sync
std::ostringstream namebuf;
namebuf << "FE_NedelecSZ<" << dim << ">(" << this->degree - 1 << ")";
namebuf << "FE_NedelecSZ<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree - 1 << ")";

return namebuf.str();
}
Expand Down
6 changes: 4 additions & 2 deletions source/fe/fe_pyramid_p.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ std::string
FE_PyramidP<dim, spacedim>::get_name() const
{
std::ostringstream namebuf;
namebuf << "FE_PyramidP<" << dim << ">(" << this->degree << ")";
namebuf << "FE_PyramidP<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";

return namebuf.str();
}
Expand Down Expand Up @@ -332,7 +333,8 @@ std::string
FE_PyramidDGP<dim, spacedim>::get_name() const
{
std::ostringstream namebuf;
namebuf << "FE_PyramidDGP<" << dim << ">(" << this->degree << ")";
namebuf << "FE_PyramidDGP<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";

return namebuf.str();
}
Expand Down
7 changes: 4 additions & 3 deletions source/fe/fe_q_bubbles.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,11 @@ FE_Q_Bubbles<dim, spacedim>::get_name() const
break;
}
if (type == true)
namebuf << "FE_Q_Bubbles<" << dim << ">(" << this->degree - 1 << ")";
namebuf << "FE_Q_Bubbles<" << Utilities::dim_string(dim, spacedim)
<< ">(" << this->degree - 1 << ")";
else
namebuf << "FE_Q_Bubbles<" << dim << ">(QUnknownNodes(" << this->degree
<< "))";
namebuf << "FE_Q_Bubbles<" << Utilities::dim_string(dim, spacedim)
<< ">(QUnknownNodes(" << this->degree << "))";
}
return namebuf.str();
}
Expand Down
6 changes: 4 additions & 2 deletions source/fe/fe_simplex_p.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,8 @@ std::string
FE_SimplexP<dim, spacedim>::get_name() const
{
std::ostringstream namebuf;
namebuf << "FE_SimplexP<" << dim << ">(" << this->degree << ")";
namebuf << "FE_SimplexP<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";

return namebuf.str();
}
Expand Down Expand Up @@ -893,7 +894,8 @@ std::string
FE_SimplexDGP<dim, spacedim>::get_name() const
{
std::ostringstream namebuf;
namebuf << "FE_SimplexDGP<" << dim << ">(" << this->degree << ")";
namebuf << "FE_SimplexDGP<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";

return namebuf.str();
}
Expand Down
6 changes: 4 additions & 2 deletions source/fe/fe_wedge_p.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ std::string
FE_WedgeP<dim, spacedim>::get_name() const
{
std::ostringstream namebuf;
namebuf << "FE_WedgeP<" << dim << ">(" << this->degree << ")";
namebuf << "FE_WedgeP<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";

return namebuf.str();
}
Expand Down Expand Up @@ -352,7 +353,8 @@ std::string
FE_WedgeDGP<dim, spacedim>::get_name() const
{
std::ostringstream namebuf;
namebuf << "FE_WedgeDGP<" << dim << ">(" << this->degree << ")";
namebuf << "FE_WedgeDGP<" << Utilities::dim_string(dim, spacedim) << ">("
<< this->degree << ")";

return namebuf.str();
}
Expand Down
50 changes: 25 additions & 25 deletions tests/fe/get_fe_by_name_01.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,16 @@ DEAL::Generated :
DEAL::FE_Bernstein<1>(1)
DEAL::Read FE_Bernstein(1)
DEAL::Generated :
DEAL::FE_Bernstein<1>(1)
DEAL::FE_Bernstein<1,2>(1)
DEAL::Read FE_Bernstein(1)
DEAL::Generated :
DEAL::FE_Bernstein<2>(1)
DEAL::Read FE_Bernstein(1)
DEAL::Generated :
DEAL::FE_Bernstein<1>(1)
DEAL::FE_Bernstein<1,3>(1)
DEAL::Read FE_Bernstein(1)
DEAL::Generated :
DEAL::FE_Bernstein<2>(1)
DEAL::FE_Bernstein<2,3>(1)
DEAL::Read FE_Bernstein(1)
DEAL::Generated :
DEAL::FE_Bernstein<3>(1)
Expand Down Expand Up @@ -307,13 +307,13 @@ DEAL::Generated :
DEAL::FE_Q_Bubbles<1>(QUnknownNodes(2))
DEAL::Read FE_Q_Bubbles(1)
DEAL::Generated :
DEAL::FE_Q_Bubbles<1>(QUnknownNodes(2))
DEAL::FE_Q_Bubbles<1,2>(QUnknownNodes(2))
DEAL::Read FE_Q_Bubbles(1)
DEAL::Generated :
DEAL::FE_Q_Bubbles<2>(1)
DEAL::Read FE_Q_Bubbles(1)
DEAL::Generated :
DEAL::FE_Q_Bubbles<1>(QUnknownNodes(2))
DEAL::FE_Q_Bubbles<1,3>(QUnknownNodes(2))
DEAL::Read FE_Q_Bubbles(1)
DEAL::Generated :
DEAL::FE_Q_Bubbles<2,3>(1)
Expand Down Expand Up @@ -379,16 +379,16 @@ DEAL::Generated :
DEAL::FE_Bernstein<1>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<1>(2)
DEAL::FE_Bernstein<1,2>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<2>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<1>(2)
DEAL::FE_Bernstein<1,3>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<2>(2)
DEAL::FE_Bernstein<2,3>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<3>(2)
Expand Down Expand Up @@ -451,13 +451,13 @@ DEAL::Generated :
DEAL::FE_Q_Bubbles<1>(QUnknownNodes(3))
DEAL::Read FE_Q_Bubbles(2)
DEAL::Generated :
DEAL::FE_Q_Bubbles<1>(QUnknownNodes(3))
DEAL::FE_Q_Bubbles<1,2>(QUnknownNodes(3))
DEAL::Read FE_Q_Bubbles(2)
DEAL::Generated :
DEAL::FE_Q_Bubbles<2>(2)
DEAL::Read FE_Q_Bubbles(2)
DEAL::Generated :
DEAL::FE_Q_Bubbles<1>(QUnknownNodes(3))
DEAL::FE_Q_Bubbles<1,3>(QUnknownNodes(3))
DEAL::Read FE_Q_Bubbles(2)
DEAL::Generated :
DEAL::FE_Q_Bubbles<2,3>(2)
Expand Down Expand Up @@ -523,16 +523,16 @@ DEAL::Generated :
DEAL::FE_Bernstein<1>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<1>(2)
DEAL::FE_Bernstein<1,2>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<2>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<1>(2)
DEAL::FE_Bernstein<1,3>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<2>(2)
DEAL::FE_Bernstein<2,3>(2)
DEAL::Read FE_Bernstein(2)
DEAL::Generated :
DEAL::FE_Bernstein<3>(2)
Expand All @@ -559,16 +559,16 @@ DEAL::Generated :
DEAL::FE_SimplexP<1>(1)
DEAL::Read FE_SimplexP(1)
DEAL::Generated :
DEAL::FE_SimplexP<1>(1)
DEAL::FE_SimplexP<1,2>(1)
DEAL::Read FE_SimplexP(1)
DEAL::Generated :
DEAL::FE_SimplexP<2>(1)
DEAL::Read FE_SimplexP(1)
DEAL::Generated :
DEAL::FE_SimplexP<1>(1)
DEAL::FE_SimplexP<1,3>(1)
DEAL::Read FE_SimplexP(1)
DEAL::Generated :
DEAL::FE_SimplexP<2>(1)
DEAL::FE_SimplexP<2,3>(1)
DEAL::Read FE_SimplexP(1)
DEAL::Generated :
DEAL::FE_SimplexP<3>(1)
Expand All @@ -577,16 +577,16 @@ DEAL::Generated :
DEAL::FE_SimplexP<1>(2)
DEAL::Read FE_SimplexP(2)
DEAL::Generated :
DEAL::FE_SimplexP<1>(2)
DEAL::FE_SimplexP<1,2>(2)
DEAL::Read FE_SimplexP(2)
DEAL::Generated :
DEAL::FE_SimplexP<2>(2)
DEAL::Read FE_SimplexP(2)
DEAL::Generated :
DEAL::FE_SimplexP<1>(2)
DEAL::FE_SimplexP<1,3>(2)
DEAL::Read FE_SimplexP(2)
DEAL::Generated :
DEAL::FE_SimplexP<2>(2)
DEAL::FE_SimplexP<2,3>(2)
DEAL::Read FE_SimplexP(2)
DEAL::Generated :
DEAL::FE_SimplexP<3>(2)
Expand All @@ -595,16 +595,16 @@ DEAL::Generated :
DEAL::FE_SimplexDGP<1>(1)
DEAL::Read FE_SimplexDGP(1)
DEAL::Generated :
DEAL::FE_SimplexDGP<1>(1)
DEAL::FE_SimplexDGP<1,2>(1)
DEAL::Read FE_SimplexDGP(1)
DEAL::Generated :
DEAL::FE_SimplexDGP<2>(1)
DEAL::Read FE_SimplexDGP(1)
DEAL::Generated :
DEAL::FE_SimplexDGP<1>(1)
DEAL::FE_SimplexDGP<1,3>(1)
DEAL::Read FE_SimplexDGP(1)
DEAL::Generated :
DEAL::FE_SimplexDGP<2>(1)
DEAL::FE_SimplexDGP<2,3>(1)
DEAL::Read FE_SimplexDGP(1)
DEAL::Generated :
DEAL::FE_SimplexDGP<3>(1)
Expand All @@ -613,16 +613,16 @@ DEAL::Generated :
DEAL::FE_SimplexDGP<1>(2)
DEAL::Read FE_SimplexDGP(2)
DEAL::Generated :
DEAL::FE_SimplexDGP<1>(2)
DEAL::FE_SimplexDGP<1,2>(2)
DEAL::Read FE_SimplexDGP(2)
DEAL::Generated :
DEAL::FE_SimplexDGP<2>(2)
DEAL::Read FE_SimplexDGP(2)
DEAL::Generated :
DEAL::FE_SimplexDGP<1>(2)
DEAL::FE_SimplexDGP<1,3>(2)
DEAL::Read FE_SimplexDGP(2)
DEAL::Generated :
DEAL::FE_SimplexDGP<2>(2)
DEAL::FE_SimplexDGP<2,3>(2)
DEAL::Read FE_SimplexDGP(2)
DEAL::Generated :
DEAL::FE_SimplexDGP<3>(2)
Expand Down