Skip to content

Commit ecd6648

Browse files
AlejandroMunozManterolaAlejandroMunozManterola
committed
Code cleanup
1 parent 364013f commit ecd6648

File tree

6 files changed

+6
-220
lines changed

6 files changed

+6
-220
lines changed

‎src/components/Model.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ Model::Model(Mesh& mesh, const AttributeToMaterial& matMap, const AttributeToBou
1717
if (intBdrMap.size() != 0)
1818
{
1919
for (auto i = intBdrMap.begin(); i != intBdrMap.end(); i++){
20-
if (i->second == BdrCond::PEC || i->second == BdrCond::PMC || i->second == BdrCond::SMA || i->second == BdrCond::NONE) {
20+
if (i->second == BdrCond::PEC || i->second == BdrCond::PMC || i->second == BdrCond::SMA) {
2121
attToIntBdrMap_.insert({ i->first, i->second });
2222
}
2323
else {
24-
std::runtime_error("Wrongly declared BdrCond as value in AttributeToInteriorConditions");
24+
std::runtime_error("Wrongly declared BdrCond as value in AttributeToInteriorConditions.");
2525
}
2626
}
2727
}

‎src/components/SubMesher.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ void TotalFieldScatteredFieldSubMesher::setGlobalTFSFAttributesForSubMeshing(Mes
165165
{
166166

167167
for (int be = 0; be < m.GetNBE(); be++) {
168-
if (m.GetBdrAttribute(be) == static_cast<int>(BdrCond::TotalFieldIn) ||
169-
m.GetBdrAttribute(be) == static_cast<int>(BdrCond::TotalFieldOut)) {
168+
if (m.GetBdrAttribute(be) == static_cast<int>(BdrCond::TotalFieldIn)) {
170169
auto be_trans{ getFaceElementTransformation(m, be)};
171170
if (be_trans->Elem2No != NotFound) {
172171
m.GetElement(be_trans->Elem1No)->SetAttribute(SubMeshingMarkers::Global_SubMesh);
@@ -589,17 +588,11 @@ void TotalFieldScatteredFieldSubMesher::setIndividualTFSFAttributesForSubMeshing
589588
{
590589
auto facemap{ m.GetFaceToBdrElMap() };
591590
for (int be = 0; be < m.GetNBE(); be++) {
592-
if (m.GetBdrAttribute(be) == static_cast<int>(BdrCond::TotalFieldIn) ||
593-
m.GetBdrAttribute(be) == static_cast<int>(BdrCond::TotalFieldOut)) {
591+
if (m.GetBdrAttribute(be) == static_cast<int>(BdrCond::TotalFieldIn)) {
594592

595593
auto be_trans{ getFaceElementTransformation(m, be) };
596594
auto face_oris{ calculateBaryNormalProduct(m, *be_trans, be) };
597595

598-
if (m.GetBdrAttribute(be) == static_cast<int>(BdrCond::TotalFieldOut)) {
599-
face_oris.first *= -1.0;
600-
face_oris.second *= -1.0;
601-
}
602-
603596
Array<int> be_vert, el1_face, el1_ori, el2_face, el2_ori, face_vert;
604597
m.GetBdrElementVertices(be, be_vert);
605598
be_vert.Sort();

‎src/components/Types.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ enum class BdrCond {
4646
PEC,
4747
PMC,
4848
SMA,
49-
TotalFieldIn = 301,
50-
TotalFieldOut = 302,
51-
TotalFieldInBacked = 303
49+
TotalFieldIn = 301
5250
};
5351

5452
using InteriorFaceCoefficients = std::vector<double>;

‎src/evolution/EvolutionMethods.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,20 @@ FluxBdrCoefficientsCentered bdrCentCoeff{
1515
{BdrCond::PEC , {2.0, 0.0}},
1616
{BdrCond::PMC , {0.0, 2.0}},
1717
{BdrCond::SMA , {0.0, 0.0}},
18-
{BdrCond::NONE , {0.0, 0.0}},
1918
};
2019

2120
FluxBdrCoefficientsUpwind bdrUpwindCoeff{
2221
{BdrCond::PEC , {2.0, 0.0}},
2322
{BdrCond::PMC , {0.0, 2.0}},
2423
{BdrCond::SMA , {1.0, 1.0}},
25-
{BdrCond::NONE , {0.0, 0.0}},
2624
};
2725

2826
FluxSrcCoefficientsCentered srcCentCoeff{
29-
{BdrCond::TotalFieldInBacked, { 1.0, 1.0}},
3027
{BdrCond::TotalFieldIn , { 1.0, 1.0}},
31-
{BdrCond::TotalFieldOut , {-1.0,-1.0}},
3228
};
3329

3430
FluxSrcCoefficientsUpwind srcUpwindCoeff{
35-
{BdrCond::TotalFieldInBacked, { 1.0, 1.0}},
3631
{BdrCond::TotalFieldIn , { 1.0, 1.0}},
37-
{BdrCond::TotalFieldOut , {-1.0,-1.0}},
3832
};
3933

4034
std::map<BdrCond, std::vector<double>> bdrCoeffCheck(const FluxType& ft)

‎test/maxwell/solver/Solver1DTest.cpp‎

Lines changed: 0 additions & 198 deletions
Original file line numberDiff line numberDiff line change
@@ -324,37 +324,6 @@ TEST_F(Solver1DTest, twoSourceWaveTwoMaterialsReflection_SMA_PEC)
324324

325325
}
326326

327-
TEST_F(Solver1DTest, DISABLED_totalfieldin_bdr_sma)
328-
{
329-
auto msh{ Mesh::LoadFromFile(
330-
(mfemMeshes1DFolder() + "verylonglineTFSF.mesh").c_str(), 1, 0)};
331-
Model model{
332-
msh,
333-
AttributeToMaterial{},
334-
AttributeToBoundary{
335-
{ 2, BdrCond::SMA },
336-
{ 303, BdrCond::TotalFieldInBacked }
337-
},
338-
AttributeToInteriorConditions{}
339-
};
340-
341-
auto probes{ buildProbesWithAnExportProbe(30) };
342-
343-
maxwell::Solver solver{
344-
model,
345-
probes,
346-
buildGaussianPlanewave(0.2, 1.5, unitVec(Y), unitVec(X)),
347-
SolverOptions{}
348-
.setCFL(0.65)
349-
.setFinalTime(5.0)
350-
.setOrder(3)
351-
};
352-
353-
solver.run();
354-
355-
EXPECT_TRUE(false);
356-
}
357-
358327
TEST_F(Solver1DTest, totalfieldin_intbdr_centered)
359328
{
360329
auto mesh{
@@ -547,61 +516,6 @@ TEST_F(Solver1DTest, totalfield_doublebdr_submesher_centered)
547516
}
548517
}
549518

550-
TEST_F(Solver1DTest, totalfieldinout_intbdr_centered)
551-
{
552-
Mesh mesh{
553-
Mesh::LoadFromFile(
554-
(mfemMeshes1DFolder() + "LineTFSFInOut.mesh").c_str(), 1, 0
555-
)
556-
};
557-
AttributeToBoundary attToBdr{ {2,BdrCond::PEC} };
558-
AttributeToInteriorConditions attToIntBdr{ {301,BdrCond::TotalFieldIn}, {302, BdrCond::TotalFieldOut} };
559-
Model model{ mesh, AttributeToMaterial{}, attToBdr, attToIntBdr };
560-
561-
auto probes{ buildProbesWithAnExportProbe(20) };
562-
probes.pointProbes = {
563-
PointProbe{ E, Y, {0.1001} },
564-
PointProbe{ E, Y, {1.0} },
565-
PointProbe{ H, Z, {0.9} },
566-
PointProbe{ H, Z, {1.0} }
567-
};
568-
569-
maxwell::Solver solver{
570-
model,
571-
probes,
572-
buildGaussianPlanewave(0.2, 1.5, unitVec(Y), unitVec(X)),
573-
SolverOptions{}
574-
.setCFL(0.5)
575-
.setCentered()
576-
.setFinalTime(5.0)
577-
.setOrder(2)
578-
};
579-
580-
solver.run();
581-
582-
{
583-
auto frame{ solver.getPointProbe(0).findFrameWithMax() };
584-
EXPECT_NEAR(1.5, frame.first, 1e-1);
585-
EXPECT_NEAR(1.0, frame.second, 1e-3);
586-
}
587-
588-
{
589-
auto frame{ solver.getPointProbe(1).findFrameWithMax() };
590-
EXPECT_NEAR(0.0, frame.second, 1e-3);
591-
}
592-
593-
{
594-
auto frame{ solver.getPointProbe(2).findFrameWithMax() };
595-
EXPECT_NEAR(2.4, frame.first, 2e-1);
596-
EXPECT_NEAR(1.0, frame.second, 1e-3);
597-
}
598-
599-
{
600-
auto frame{ solver.getPointProbe(3).findFrameWithMax() };
601-
EXPECT_NEAR(0.0, frame.second, 1e-3);
602-
}
603-
}
604-
605519
TEST_F(Solver1DTest, totalfieldinout_intbdr_submesher_centered)
606520
{
607521
Mesh mesh{ Mesh::LoadFromFileNoBdrFix((mfemMeshes1DFolder() + "LineTFSFInOut.mesh").c_str(), 1, 0)};
@@ -833,118 +747,6 @@ TEST_F(Solver1DTest, totalfieldin_shortline_intbdr_submesher_centered)
833747
}
834748

835749
}
836-
TEST_F(Solver1DTest, totalfieldinout_pec_upwind)
837-
{
838-
Mesh mesh{
839-
Mesh::LoadFromFile(
840-
(mfemMeshes1DFolder() + "LineTFSFInOut.mesh").c_str(), 1, 0
841-
)
842-
};
843-
AttributeToBoundary attToBdr{ {2,BdrCond::PEC} };
844-
AttributeToInteriorConditions attToIntConds{ {301,BdrCond::TotalFieldIn}, {302, BdrCond::TotalFieldOut} };
845-
Model model{ mesh, AttributeToMaterial{}, attToBdr, attToIntConds };
846-
847-
auto probes{ buildProbesWithAnExportProbe(20) };
848-
probes.pointProbes = {
849-
PointProbe{ E, Y, {0.1001} },
850-
PointProbe{ E, Y, {1.0} },
851-
PointProbe{ H, Z, {0.9} },
852-
PointProbe{ H, Z, {1.0} }
853-
};
854-
855-
maxwell::Solver solver{
856-
model,
857-
probes,
858-
buildGaussianPlanewave(0.2, 1.5, unitVec(Y), unitVec(X)),
859-
SolverOptions{}
860-
.setCFL(0.5)
861-
.setFinalTime(5.0)
862-
.setOrder(2)
863-
};
864-
865-
solver.run();
866-
867-
{
868-
auto frame{ solver.getPointProbe(0).findFrameWithMax() };
869-
EXPECT_NEAR(1.5, frame.first, 1e-1);
870-
EXPECT_NEAR(1.0, frame.second, 1e-3);
871-
}
872-
873-
{
874-
auto frame{ solver.getPointProbe(1).findFrameWithMax() };
875-
EXPECT_NEAR(0.0, frame.second, 1e-3);
876-
}
877-
878-
{
879-
auto frame{ solver.getPointProbe(2).findFrameWithMax() };
880-
EXPECT_NEAR(2.4, frame.first, 2e-1);
881-
EXPECT_NEAR(1.0, frame.second, 1e-3);
882-
}
883-
884-
{
885-
auto frame{ solver.getPointProbe(3).findFrameWithMax() };
886-
EXPECT_NEAR(0.0, frame.second, 1e-3);
887-
}
888-
}
889-
890-
TEST_F(Solver1DTest, totalfieldinout_sma)
891-
{
892-
auto mesh {
893-
Mesh::LoadFromFile(
894-
(mfemMeshes1DFolder() + "LineTFSFInOut.mesh").c_str(),1,0
895-
)
896-
};
897-
AttributeToBoundary attToBdr{ {2, BdrCond::SMA} };
898-
AttributeToInteriorConditions attToIntBdr{
899-
{301, BdrCond::TotalFieldIn},
900-
{302, BdrCond::TotalFieldOut}
901-
};
902-
Model model{ mesh, AttributeToMaterial{}, attToBdr, attToIntBdr };
903-
904-
auto probes{ buildProbesWithAnExportProbe(20) };
905-
probes.pointProbes = {
906-
PointProbe{ E, Y, {0.05} },
907-
PointProbe{ E, Y, {0.1001} },
908-
PointProbe{ E, Y, {0.9} },
909-
PointProbe{ E, Y, {0.9001} }
910-
};
911-
912-
maxwell::Solver solver{
913-
model,
914-
probes,
915-
buildGaussianPlanewave(0.2, 0.8, unitVec(Y), unitVec(X)),
916-
SolverOptions{}
917-
.setCFL(0.95)
918-
.setFinalTime(3.0)
919-
.setOrder(2)
920-
};
921-
922-
solver.run();
923-
924-
EXPECT_NEAR(0.0, solver.getFields().getNorml2(), 2e-3);
925-
926-
{
927-
auto frame{ solver.getPointProbe(0).findFrameWithMax() };
928-
EXPECT_NEAR(0.0, frame.second, 1e-3);
929-
}
930-
931-
{
932-
auto frame{ solver.getPointProbe(1).findFrameWithMax() };
933-
EXPECT_NEAR(0.9, frame.first, 1e-1);
934-
EXPECT_NEAR(1.0, frame.second, 1e-3);
935-
}
936-
937-
{
938-
auto frame{ solver.getPointProbe(2).findFrameWithMax() };
939-
EXPECT_NEAR(1.7, frame.first, 2e-1);
940-
EXPECT_NEAR(1.0, frame.second, 1e-3);
941-
}
942-
943-
{
944-
auto frame{ solver.getPointProbe(3).findFrameWithMax() };
945-
EXPECT_NEAR(0.0, frame.second, 1e-3);
946-
}
947-
}
948750

949751
TEST_F(Solver1DTest, DISABLED_resonant_mode_upwind)
950752
{

‎test/mfem/MeshTest.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ class MeshTest : public ::testing::Test {
188188
{
189189

190190
for (int be = 0; be < m.GetNBE(); be++) {
191-
if (m.GetBdrAttribute(be) == static_cast<int>(maxwell::BdrCond::TotalFieldIn) ||
192-
m.GetBdrAttribute(be) == static_cast<int>(maxwell::BdrCond::TotalFieldOut)) {
191+
if (m.GetBdrAttribute(be) == static_cast<int>(maxwell::BdrCond::TotalFieldIn)) {
193192
auto be_trans{ getFaceElementTransformation(m, be) };
194193
if (be_trans->Elem2No != NotFound) {
195194
m.GetElement(be_trans->Elem1No)->SetAttribute(maxwell::SubMeshingMarkers::Global_SubMesh);

0 commit comments

Comments
 (0)