From 0cdc26eba2c80f7d96bf009c5e440aa2c6cf535c Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <Thorsten.Liebig@gmx.de>
Date: Wed, 21 Nov 2012 16:41:53 +0100
Subject: [PATCH] cylindrical operator: improve mesh snapping for angular
 directions

---
 FDTD/operator_cylinder.cpp | 56 ++++++++++++++++++++++++++++++++++++++
 FDTD/operator_cylinder.h   |  7 +++++
 2 files changed, 63 insertions(+)

diff --git a/FDTD/operator_cylinder.cpp b/FDTD/operator_cylinder.cpp
index 293f782..d455196 100644
--- a/FDTD/operator_cylinder.cpp
+++ b/FDTD/operator_cylinder.cpp
@@ -201,6 +201,62 @@ double Operator_Cylinder::GetEdgeArea(int ny, const unsigned int pos[3], bool du
 	return GetEdgeLength(1,pos,!dualMesh) * GetEdgeLength(2,pos,!dualMesh);
 }
 
+double Operator_Cylinder::FitToAlphaRange(double a_coord) const
+{
+	double min = GetDiscLine(1,0);
+	double max = GetDiscLine(1,GetOriginalNumLines(1)-1);
+	if ((a_coord>=min) && (a_coord<=max))
+		return a_coord;
+	while (a_coord<min)
+	{
+		a_coord+=2*PI;
+		if (a_coord>max)
+			return a_coord-2*PI;
+		if (a_coord>min)
+			return a_coord;
+	}
+	while (a_coord>max)
+	{
+		a_coord-=2*PI;
+		if (a_coord<min)
+			return a_coord+2*PI;
+		if (a_coord<max)
+			return a_coord;
+	}
+	// this cannot happen
+	return a_coord;
+}
+
+unsigned int Operator_Cylinder::SnapToMeshLine(int ny, double coord, bool &inside, bool dualMesh) const
+{
+	if (ny==1)
+		coord=FitToAlphaRange(coord);
+	return Operator_Multithread::SnapToMeshLine(ny, coord, inside, dualMesh);
+}
+
+int Operator_Cylinder::SnapBox2Mesh(const double* start, const double* stop, unsigned int* uiStart, unsigned int* uiStop, bool dualMesh, int SnapMethod, bool* bStartIn, bool* bStopIn) const
+{
+	double a_min = GetDiscLine(1,0);
+	double a_max = GetDiscLine(1,GetNumberOfLines(1)-1);
+
+	double a_size = stop[1] - start[1];
+	double a_center = FitToAlphaRange(0.5*(stop[1]+start[1]));
+	double a_start = a_center-a_size/2;
+	double a_stop = a_start + a_size;
+	if (a_stop>a_max)
+		a_stop=a_max;
+	if (a_stop<a_min)
+		a_stop=a_min;
+	if (a_start>a_max)
+		a_start=a_max;
+	if (a_start<a_min)
+		a_start=a_min;
+
+	double l_start[3] = {start[0], a_start, start[2]};
+	double l_stop[3]  = {stop[0] , a_stop , stop[2] };
+	return Operator_Multithread::SnapBox2Mesh(l_start, l_stop, uiStart, uiStop, dualMesh, SnapMethod, bStartIn, bStopIn);
+}
+
 bool Operator_Cylinder::SetupCSXGrid(CSRectGrid* grid)
 {
 	unsigned int alphaNum;
diff --git a/FDTD/operator_cylinder.h b/FDTD/operator_cylinder.h
index fd946e7..b6bea3f 100644
--- a/FDTD/operator_cylinder.h
+++ b/FDTD/operator_cylinder.h
@@ -71,6 +71,13 @@ public:
 	*/
 	virtual double GetEdgeArea(int ny, const unsigned int pos[3], bool dualMesh = false) const;
 
+	virtual double FitToAlphaRange(double a_coord) const;
+
+	virtual unsigned int SnapToMeshLine(int ny, double coord, bool &inside, bool dualMesh=false) const;
+
+	//! Snap a given box to the FDTD mesh
+	virtual int SnapBox2Mesh(const double* start, const double* stop, unsigned int* uiStart, unsigned int* uiStop, bool dualMesh=false, int SnapMethod=0, bool* bStartIn=NULL, bool* bStopIn=NULL) const;
+
 	bool GetClosedAlpha() const {return CC_closedAlpha;}
 	bool GetR0Included() const {return CC_R0_included;}