From 7172e9e53d439a2767b392fcfc851cd9db5c275a Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <Thorsten.Liebig@gmx.de>
Date: Wed, 2 Jun 2010 17:21:58 +0200
Subject: [PATCH] obey mesh type in material/operator/PEC dump

---
 FDTD/operator.cpp          | 7 ++++---
 FDTD/operator.h            | 1 +
 FDTD/operator_cylinder.cpp | 2 ++
 FDTD/operator_sse.cpp      | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp
index e6df2c9..0808471 100644
--- a/FDTD/operator.cpp
+++ b/FDTD/operator.cpp
@@ -34,6 +34,7 @@ Operator* Operator::New()
 
 Operator::Operator()
 {
+	m_MeshType = ProcessFields::CARTESIAN_MESH;
 	Exc = 0;
 }
 
@@ -327,7 +328,7 @@ void Operator::DumpOperator2File(string filename)
 	string names[] = {"vv", "vi", "iv" , "ii", "exc"};
 	FDTD_FLOAT**** array[] = {vv,vi,iv,ii,exc};
 
-	ProcessFields::DumpMultiVectorArray2VTK(file, names , array , 5, discLines, numLines);
+	ProcessFields::DumpMultiVectorArray2VTK(file, names , array , 5, discLines, numLines, 6, "Operator dump" , (ProcessFields::MeshType)m_MeshType);
 
 	Delete_N_3DArray(exc,numLines);
 
@@ -361,7 +362,7 @@ void Operator::DumpPEC2File( string filename )
 		}
 	}
 
-	ProcessFields::DumpVectorArray2VTK( file, "PEC", pec, discLines, numLines );
+	ProcessFields::DumpVectorArray2VTK( file, "PEC", pec, discLines, numLines, 6, "PEC dump" , (ProcessFields::MeshType)m_MeshType );
 
 	file.close();
 }
@@ -410,7 +411,7 @@ void Operator::DumpMaterial2File(string filename)
 
 	string names[] = {"epsilon","mue","kappa","sigma"};
 	FDTD_FLOAT*** array[] = {epsilon,mue,kappa,sigma};
-	ProcessFields::DumpMultiScalarArray2VTK(file, names, array, 4, discLines, numLines);
+	ProcessFields::DumpMultiScalarArray2VTK(file, names, array, 4, discLines, numLines,  6, "Material dump" , (ProcessFields::MeshType)m_MeshType);
 	Delete3DArray(epsilon,numLines);
 	Delete3DArray(mue,numLines);
 	Delete3DArray(kappa,numLines);
diff --git a/FDTD/operator.h b/FDTD/operator.h
index 93d45a9..bb036c1 100644
--- a/FDTD/operator.h
+++ b/FDTD/operator.h
@@ -126,6 +126,7 @@ protected:
 
 	unsigned int m_Nr_PEC[3];
 
+	int m_MeshType;
 	unsigned int numLines[3];
 	double* discLines[3];
 	double gridDelta;
diff --git a/FDTD/operator_cylinder.cpp b/FDTD/operator_cylinder.cpp
index 52e09ae..b96c9f4 100644
--- a/FDTD/operator_cylinder.cpp
+++ b/FDTD/operator_cylinder.cpp
@@ -16,6 +16,7 @@
 */
 
 #include "engine.h"
+#include "processfields.h"
 #include "operator_cylinder.h"
 #include "operator_extension.h"
 #include "operator_ext_cylinder.h"
@@ -30,6 +31,7 @@ Operator_Cylinder* Operator_Cylinder::New()
 
 Operator_Cylinder::Operator_Cylinder() : __OP_CYLINDER_BASE_CLASS__()
 {
+	m_MeshType = ProcessFields::CYLINDRICAL_MESH;
 }
 
 Operator_Cylinder::~Operator_Cylinder()
diff --git a/FDTD/operator_sse.cpp b/FDTD/operator_sse.cpp
index 0f4d92a..70a7bff 100644
--- a/FDTD/operator_sse.cpp
+++ b/FDTD/operator_sse.cpp
@@ -125,7 +125,7 @@ void Operator_sse::DumpOperator2File(string filename)
 	string names[] = {"vv", "vi", "iv" , "ii", "exc"};
 	FDTD_FLOAT**** array[] = {vv,vi,iv,ii,exc};
 
-	ProcessFields::DumpMultiVectorArray2VTK(file, names , array , 5, discLines, numLines);
+	ProcessFields::DumpMultiVectorArray2VTK(file, names , array , 5, discLines, numLines,  6, "Operator dump" , (ProcessFields::MeshType)m_MeshType);
 
 	Delete_N_3DArray(exc,numLines);
 	Delete_N_3DArray(vv,numLines);vv=NULL;