From e816d50cc165aaef22cb5b63e0d1907332d1d2f7 Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <thorsten.liebig@gmx.de>
Date: Sun, 6 Jun 2010 00:53:05 +0200
Subject: [PATCH] operator: split up CalcPEC as preparation for easier
 multithreading

Signed-off-by: Thorsten Liebig <thorsten.liebig@gmx.de>
---
 FDTD/operator.cpp | 32 ++++++++++++++++++++------------
 FDTD/operator.h   |  2 ++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp
index 01ca5ff..2156ab4 100644
--- a/FDTD/operator.cpp
+++ b/FDTD/operator.cpp
@@ -1060,22 +1060,29 @@ bool Operator::CalcFieldExcitation()
 	return true;
 }
 
-
-
 bool Operator::CalcPEC()
 {
-	unsigned int pos[3];
-	double coord[3];
-	double delta;
 	m_Nr_PEC[0]=0;	m_Nr_PEC[1]=0;	m_Nr_PEC[2]=0;
 
-	for (int n=0;n<3;++n)
+	CalcPEC_Range(0,numLines[0]-1);
+
+	CalcPEC_Curves();
+
+	return true;
+}
+
+void Operator::CalcPEC_Range(unsigned int startX, unsigned int stopX)
+{
+	double coord[3];
+	double delta;
+	unsigned int pos[3];
+	for (pos[0]=startX;pos[0]<=stopX;++pos[0])
 	{
-		for (pos[2]=0;pos[2]<numLines[2];++pos[2])
+		for (pos[1]=0;pos[1]<numLines[1];++pos[1])
 		{
-			for (pos[1]=0;pos[1]<numLines[1];++pos[1])
+			for (pos[2]=0;pos[2]<numLines[2];++pos[2])
 			{
-				for (pos[0]=0;pos[0]<numLines[0];++pos[0])
+				for (int n=0;n<3;++n)
 				{
 					coord[0] = discLines[0][pos[0]];
 					coord[1] = discLines[1][pos[1]];
@@ -1091,14 +1098,17 @@ bool Operator::CalcPEC()
 							GetVV(n,pos[0],pos[1],pos[2]) = 0;
 							GetVI(n,pos[0],pos[1],pos[2]) = 0;
 							++m_Nr_PEC[n];
-//							cerr << "CartOperator::CalcPEC: PEC found at " << pos[0] << " ; "  << pos[1] << " ; " << pos[2] << endl;
+				//							cerr << "CartOperator::CalcPEC: PEC found at " << pos[0] << " ; "  << pos[1] << " ; " << pos[2] << endl;
 						}
 					}
 				}
 			}
 		}
 	}
+}
 
+void Operator::CalcPEC_Curves()
+{
 	//special treatment for primitives of type curve (treated as wires)
 	double p1[3];
 	double p2[3];
@@ -1132,8 +1142,6 @@ bool Operator::CalcPEC()
 			}
 		}
 	}
-
-	return true;
 }
 
 void Operator::AddExtension(Operator_Extension* op_ext)
diff --git a/FDTD/operator.h b/FDTD/operator.h
index 9451e70..8b5cddd 100644
--- a/FDTD/operator.h
+++ b/FDTD/operator.h
@@ -107,6 +107,8 @@ protected:
 	virtual bool CalcFieldExcitation();
 
 	virtual bool CalcPEC();
+	virtual void CalcPEC_Range(unsigned int startX, unsigned int stopX);	//internal to CalcPEC
+	virtual void CalcPEC_Curves();	//internal to CalcPEC
 
 	//Calc timestep only internal use
 	virtual double CalcTimestep();