From 71e8febc3b25c9aca89d0304c2db54cd663aacb1 Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <thorsten.liebig@gmx.de>
Date: Sat, 24 Apr 2010 14:06:00 +0200
Subject: [PATCH] cylinder operator: some fixes

---
 FDTD/operator_cylinder.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/FDTD/operator_cylinder.cpp b/FDTD/operator_cylinder.cpp
index 5beaf56..02571c8 100644
--- a/FDTD/operator_cylinder.cpp
+++ b/FDTD/operator_cylinder.cpp
@@ -112,7 +112,10 @@ bool Operator_Cylinder::SetGeometryCSX(ContinuousStructure* geo)
 	}
 	else if (minmaxA>2*PI)
 		{cerr << "Operator_Cylinder::SetGeometryCSX: Alpha Max-Min must not be larger than 2*PI!!!" << endl; Reset(); return false;}
-	else CC_closedAlpha=false;
+	else
+	{
+		CC_closedAlpha=false;
+	}
 
 	if (discLines[0][0]<0)
 		{cerr << "Operator_Cylinder::SetGeometryCSX: r<0 not allowed in Cylinder Coordinates!!!" << endl; Reset(); return false;}
@@ -143,12 +146,13 @@ int Operator_Cylinder::CalcECOperator()
 	{
 		double C=0;
 		double G=0;
-		for (pos[1]=0;pos[1]<numLines[1]-CC_closedAlpha;++pos[1])
+		for (pos[1]=0;pos[1]<numLines[1]-1;++pos[1])
 		{
 			Calc_ECPos(2,pos,inEC);
 			C+=inEC[0]*0.5;
 			G+=inEC[1]*0.5;
 		}
+		vv[2][0][0][pos[2]] = 1;
 		vv_R0[pos[2]] = (1-dT*G/2/C)/(1+dT*G/2/C);
 		vi_R0[pos[2]] = (dT/C)/(1+dT*G/2/C);
 	}
@@ -179,12 +183,6 @@ inline void Operator_Cylinder::Calc_ECOperatorPos(int n, unsigned int* pos)
 		ii[n][pos[0]][pos[1]][pos[2]] = 0;
 		iv[n][pos[0]][pos[1]][pos[2]] = 0;
 	}
-
-	if (CC_R0_included && (n==2) && (pos[0]==0))
-	{
-		vv[2][0][pos[1]][pos[2]] = 1;
-		vi[2][0][pos[1]][pos[2]] = 0;
-	}
 }
 
 void Operator_Cylinder::ApplyElectricBC(bool* dirs)
@@ -354,7 +352,7 @@ bool Operator_Cylinder::Calc_ECPos(int n, unsigned int* pos, double* inEC)
 		inEC[1] += 0;
 	}
 
-	if (CC_R0_included && (n==1) && (coord[0]==0))
+	if (CC_R0_included && (n==1) && (pos[0]==0))
 	{
 		inEC[0]=0;
 		inEC[1]=0;