Removes cartesian angles and rotation as a capability from sources and references to it.

Author: AlejandroMunozManterola

src/components/Sources.cpp

@@ -9,50 +9,15 @@ namespace maxwell {
 
 constexpr double TOLERANCE = 10.0*DBL_EPSILON;
 
-mfem::DenseMatrix getRotationMatrix(const Source::CartesianAngles& angles_)
-{
-	std::array<mfem::DenseMatrix, 3> rotMat;
-	double rotationAxisX[3] = { 1.0,0.0,0.0 }, rotationAxisY[3] = { 0.0,1.0,0.0 }, rotationAxisZ[3] = { 0.0,0.0,1.0 };
-	mfem::NURBSPatch::Get3DRotationMatrix(rotationAxisX, angles_[X], 1.0, rotMat[X]);
-	mfem::NURBSPatch::Get3DRotationMatrix(rotationAxisY, angles_[Y], 1.0, rotMat[Y]);
-	mfem::NURBSPatch::Get3DRotationMatrix(rotationAxisZ, angles_[Z], 1.0, rotMat[Z]);
-	mfem::DenseMatrix tMat(3), res(3);
-	mfem::Mult(rotMat[X], rotMat[Y], tMat);
-	mfem::Mult(tMat     , rotMat[Z], res);
-	return res;
-}
-
-mfem::Vector rotateAroundAxis(
-	const mfem::Vector& v, const Source::CartesianAngles& angles_)
-{
-	auto rotMat{ getRotationMatrix(angles_) };
-
-	mfem::Vector pos3D(3), newPos3D(3);
-	pos3D = 0.0;
-	for (auto d{ 0 }; d < v.Size(); d++) {
-		pos3D[d] = v[d];
-	}
-
-	rotMat.Mult(pos3D, newPos3D);
-
-	mfem::Vector res(v.Size());
-	for (auto d{ 0 }; d < v.Size(); d++) {
-		res[d] = newPos3D[d];
-	}
-	return res;
-}
-
 InitialField::InitialField(
 	const Function& f, 
 	const FieldType& fT, 
 	const Polarization& p,
-	const Position& centerIn,
-	const CartesianAngles anglesIn ) :
+	const Position& centerIn) :
 	magnitude_{ f.clone() },
 	fieldType_{ fT },
 	polarization_{ p },
-	center_{ centerIn },
-	angles_{ anglesIn }
+	center_{ centerIn }
 {
 	assert(std::abs(1.0 - polarization_.Norml2()) <= TOLERANCE);
 }
@@ -61,8 +26,7 @@ InitialField::InitialField(const InitialField& rhs) :
 	magnitude_{ rhs.magnitude_->clone() },
 	fieldType_{ rhs.fieldType_ },
 	polarization_{ rhs.polarization_ },
-	center_{ rhs.center_ },
-	angles_{ rhs.angles_ }
+	center_{ rhs.center_ }
 {}
 
 std::unique_ptr<Source> InitialField::clone() const
@@ -84,9 +48,6 @@ double InitialField::eval(
 	for (int i{ 0 }; i < p.Size(); ++i) {
 		pos[i] = p[i] - center_[i];
 	}
-	if (angles_[0] != 0.0 || angles_[1] != 0.0 || angles_[2] != 0.0) {
-		pos = rotateAroundAxis(pos, angles_);
-	}
 
 	return magnitude_->eval(pos) * polarization_[d];
 }

src/components/Sources.h

@@ -11,7 +11,6 @@ class Source {
 	using Time = double;
 	using Polarization = mfem::Vector;
 	using Propagation = mfem::Vector;
-	using CartesianAngles = std::vector<double>;
 
 	virtual ~Source() = default;
 	virtual std::unique_ptr<Source> clone() const = 0;
@@ -27,8 +26,7 @@ class InitialField : public Source {
 		const Function&,
 		const FieldType&,
 		const Polarization&,
-		const Position& center_,
-		const CartesianAngles rotAngle = CartesianAngles({ 0.0,0.0,0.0 })
+		const Position& center
 	);
 	InitialField(const InitialField&);
 
@@ -47,7 +45,6 @@ class InitialField : public Source {
 	FieldType fieldType_{ E };
 	Polarization polarization_;
 	Position center_;
-	CartesianAngles angles_;
 };
 
 class Planewave : public Source {

test/maxwell/SourceFixtures.h

@@ -12,15 +12,14 @@ static Sources buildGaussianInitialField(
 	const double spread = 0.1,
 	const mfem::Vector& center_ = mfem::Vector({ 0.5 }),
 	const Source::Polarization& p = Source::Polarization({ 0.0,0.0,1.0 }),
-	const int dimension = 1,
-	const Source::CartesianAngles angles_ = Source::CartesianAngles({ 0.0,0.0,0.0 }))
+	const int dimension = 1)
 {
 	mfem::Vector gaussianCenter(dimension);
 	gaussianCenter = 0.0;
 
 	Sources res;
 	res.add(std::make_unique<InitialField>(
-		Gaussian{ spread, gaussianCenter, dimension }, ft, p, center_, angles_)
+		Gaussian{ spread, gaussianCenter, dimension }, ft, p, center_)
 	);
 	return res;
 }
@@ -58,15 +57,14 @@ static Sources buildPlanewaveInitialField(
 	const Function& mf,
 	const Source::Position& center_,
 	const Source::Polarization& polIn,
-	const Source::Propagation& propagationDir,
-	const Source::CartesianAngles& angles_ = Source::CartesianAngles({0.0,0.0,0.0}))
+	const Source::Propagation& propagationDir)
 {
 	Sources res;
 	res.add(
-			std::make_unique<InitialField>(mf, E, polIn, center_, angles_)
+			std::make_unique<InitialField>(mf, E, polIn, center_)
 	);
 	res.add(
-			std::make_unique<InitialField>(mf, H, crossProduct(propagationDir, polIn), center_, angles_)
+			std::make_unique<InitialField>(mf, H, crossProduct(propagationDir, polIn), center_)
 	);
 	return res;
 }

test/maxwell/solver/Solver2DTest.cpp

@@ -554,35 +554,6 @@ TEST_F(Solver2DTest, sma_quads_1dot5D)
 
 }
 
-TEST_F(Solver2DTest, rotated_centered_quads_1dot5D)
-{
-	auto mesh{ Mesh::LoadFromFile((mfemMeshes2DFolder() + "severalrotatedquads.mesh").c_str(),1,0)};
-	mesh.UniformRefinement();
-	AttributeToBoundary attToBdr{ {1,BdrCond::PEC}, {2,BdrCond::PMC}};
-	Model model{ mesh, AttributeToMaterial{}, attToBdr, AttributeToInteriorConditions{} };
-	auto probes{ buildProbesWithAnExportProbe(30) };
-
-	fieldCenter = Vector({ 2.0, 2.0 });
-
-	maxwell::Solver solver {
-		model,
-		probes,
-		buildGaussianInitialField(E, 0.5, fieldCenter, unitVec(Z), 1, Source::CartesianAngles({0.0,0.0,-M_PI_4})),
-		SolverOptions{}
-			.setTimeStep(1e-3)
-			.setFinalTime(4.95)
-			.setCentered()
-			.setOrder(3)
-	};
-
-	auto normOld{ solver.getFields().getNorml2() };
-	solver.run();
-
-	double tolerance{ 1e-2 };
-	EXPECT_NEAR(normOld, solver.getFields().getNorml2(), tolerance);
-
-}
-
 TEST_F(Solver2DSpectralTest, periodic_centered_tris_spectral_and_base_comparison) {
 
 	Probes probes;