From ecf8ad6bdd08cefc12b7ce389c42676978f4d9c1 Mon Sep 17 00:00:00 2001 From: Thorsten Liebig Date: Fri, 10 Feb 2012 11:55:55 +0100 Subject: [PATCH] supply more information to extensions about the cylindrical mesh --- FDTD/extensions/operator_ext_cylinder.h | 2 +- FDTD/extensions/operator_ext_excitation.h | 2 +- FDTD/extensions/operator_ext_lorentzmaterial.h | 2 +- FDTD/extensions/operator_ext_mur_abc.cpp | 2 +- FDTD/extensions/operator_ext_mur_abc.h | 2 +- FDTD/extensions/operator_ext_pml_sf.cpp | 2 +- FDTD/extensions/operator_ext_pml_sf.h | 2 +- FDTD/extensions/operator_ext_upml.h | 2 +- FDTD/extensions/operator_extension.h | 2 +- FDTD/operator_cylinder.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FDTD/extensions/operator_ext_cylinder.h b/FDTD/extensions/operator_ext_cylinder.h index 8c8fb80..cc9919d 100644 --- a/FDTD/extensions/operator_ext_cylinder.h +++ b/FDTD/extensions/operator_ext_cylinder.h @@ -34,7 +34,7 @@ public: virtual Engine_Extension* CreateEngineExtention(); - virtual bool IsCylinderCoordsSave() const {return true;} + virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;} virtual std::string GetExtensionName() const {return std::string("Extension for the Cylinder-Coords Operator");} diff --git a/FDTD/extensions/operator_ext_excitation.h b/FDTD/extensions/operator_ext_excitation.h index 254967d..2cfb5f3 100644 --- a/FDTD/extensions/operator_ext_excitation.h +++ b/FDTD/extensions/operator_ext_excitation.h @@ -36,7 +36,7 @@ public: virtual Engine_Extension* CreateEngineExtention(); - virtual bool IsCylinderCoordsSave() const {return true;} + virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;} virtual string GetExtensionName() const {return string("Excitation Extension");} diff --git a/FDTD/extensions/operator_ext_lorentzmaterial.h b/FDTD/extensions/operator_ext_lorentzmaterial.h index ec7b2bc..9cea68f 100644 --- a/FDTD/extensions/operator_ext_lorentzmaterial.h +++ b/FDTD/extensions/operator_ext_lorentzmaterial.h @@ -32,7 +32,7 @@ public: virtual Engine_Extension* CreateEngineExtention(); - virtual bool IsCylinderCoordsSave() const {return false;} + virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return false;} virtual std::string GetExtensionName() const {return std::string("Lorentz Dispersive Material Extension");} diff --git a/FDTD/extensions/operator_ext_mur_abc.cpp b/FDTD/extensions/operator_ext_mur_abc.cpp index 71d7ad9..d4c92b8 100644 --- a/FDTD/extensions/operator_ext_mur_abc.cpp +++ b/FDTD/extensions/operator_ext_mur_abc.cpp @@ -47,7 +47,7 @@ Operator_Extension* Operator_Ext_Mur_ABC::Clone(Operator* op) return new Operator_Ext_Mur_ABC(op, this); } -bool Operator_Ext_Mur_ABC::IsCylinderCoordsSave() const +bool Operator_Ext_Mur_ABC::IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const { if (m_ny==2) return true; diff --git a/FDTD/extensions/operator_ext_mur_abc.h b/FDTD/extensions/operator_ext_mur_abc.h index 765355d..8ffb444 100644 --- a/FDTD/extensions/operator_ext_mur_abc.h +++ b/FDTD/extensions/operator_ext_mur_abc.h @@ -40,7 +40,7 @@ public: virtual Engine_Extension* CreateEngineExtention(); - virtual bool IsCylinderCoordsSave() const; + virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const; virtual bool IsCylindricalMultiGridSave(bool child) const; virtual string GetExtensionName() const {return string("Mur ABC Extension");} diff --git a/FDTD/extensions/operator_ext_pml_sf.cpp b/FDTD/extensions/operator_ext_pml_sf.cpp index 9841801..af0d7b4 100644 --- a/FDTD/extensions/operator_ext_pml_sf.cpp +++ b/FDTD/extensions/operator_ext_pml_sf.cpp @@ -396,7 +396,7 @@ Engine_Extension* Operator_Ext_PML_SF_Plane::CreateEngineExtention() return eng_ext; } -bool Operator_Ext_PML_SF_Plane::IsCylinderCoordsSave() const +bool Operator_Ext_PML_SF_Plane::IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const { if (m_ny==2) { diff --git a/FDTD/extensions/operator_ext_pml_sf.h b/FDTD/extensions/operator_ext_pml_sf.h index 53eb749..41a9a2a 100644 --- a/FDTD/extensions/operator_ext_pml_sf.h +++ b/FDTD/extensions/operator_ext_pml_sf.h @@ -114,7 +114,7 @@ public: virtual Engine_Extension* CreateEngineExtention(); - virtual bool IsCylinderCoordsSave() const; + virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const; virtual string GetExtensionName() const {return string("Split Field PML Plane Extension");} diff --git a/FDTD/extensions/operator_ext_upml.h b/FDTD/extensions/operator_ext_upml.h index 725c127..e39cb82 100644 --- a/FDTD/extensions/operator_ext_upml.h +++ b/FDTD/extensions/operator_ext_upml.h @@ -36,7 +36,7 @@ public: virtual ~Operator_Ext_UPML(); //! Returns always true, Create_UPML method will take care of creating a valid pml for the cylindrical fdtd - virtual bool IsCylinderCoordsSave() const {return true;} + virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} //! Returns always true if base grid, Create_UPML will create proper child pml extensions. virtual bool IsCylindricalMultiGridSave(bool child) const {if (child) return false; return true;} diff --git a/FDTD/extensions/operator_extension.h b/FDTD/extensions/operator_extension.h index 4dc90b6..28b70a8 100644 --- a/FDTD/extensions/operator_extension.h +++ b/FDTD/extensions/operator_extension.h @@ -50,7 +50,7 @@ public: virtual Engine_Extension* CreateEngineExtention() {return 0;} //! The cylindrical operator will check whether the extension is save to use. Default is false. Derive this method to override. - virtual bool IsCylinderCoordsSave() const {return false;} + virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return false;} //! The cylindrical multi grid operator will check whether the extension is save to use. Default is false. Derive this method to override. virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return false;} diff --git a/FDTD/operator_cylinder.cpp b/FDTD/operator_cylinder.cpp index ea4a4de..546b6f1 100644 --- a/FDTD/operator_cylinder.cpp +++ b/FDTD/operator_cylinder.cpp @@ -286,7 +286,7 @@ void Operator_Cylinder::ApplyMagneticBC(bool* dirs) void Operator_Cylinder::AddExtension(Operator_Extension* op_ext) { - if (op_ext->IsCylinderCoordsSave()) + if (op_ext->IsCylinderCoordsSave(CC_closedAlpha, CC_R0_included)) m_Op_exts.push_back(op_ext); else cerr << "Operator_Cylinder::AddExtension: Warning: Operator extension \"" << op_ext->GetExtensionName() << "\" is not compatible with cylinder-coords!! skipping...!" << endl;