From caacbb9d9d87470c86c19811a1e4d240fe6f41af Mon Sep 17 00:00:00 2001 From: Thorsten Liebig Date: Thu, 17 Mar 2011 11:38:01 +0100 Subject: [PATCH] critical fixes in excitation extension --- FDTD/extensions/engine_ext_excitation.cpp | 6 +++--- FDTD/extensions/operator_ext_excitation.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FDTD/extensions/engine_ext_excitation.cpp b/FDTD/extensions/engine_ext_excitation.cpp index cd96690..ec328d2 100644 --- a/FDTD/extensions/engine_ext_excitation.cpp +++ b/FDTD/extensions/engine_ext_excitation.cpp @@ -101,7 +101,7 @@ void Engine_Ext_Excitation::Apply2Current() { case Engine::BASIC: { - for (unsigned int n=0; nm_Exc->Volt_Count; ++n) + for (unsigned int n=0; nm_Exc->Curr_Count; ++n) { exc_pos = numTS - (int)m_Op_Exc->m_Exc->Curr_delay[n]; exc_pos *= (exc_pos>0 && exc_pos<=(int)m_Op_Exc->m_Exc->Length); @@ -115,7 +115,7 @@ void Engine_Ext_Excitation::Apply2Current() } case Engine::SSE: { - for (unsigned int n=0; nm_Exc->Volt_Count; ++n) + for (unsigned int n=0; nm_Exc->Curr_Count; ++n) { Engine_sse* eng_sse = (Engine_sse*) m_Eng; exc_pos = numTS - (int)m_Op_Exc->m_Exc->Curr_delay[n]; @@ -130,7 +130,7 @@ void Engine_Ext_Excitation::Apply2Current() } default: { - for (unsigned int n=0; nm_Exc->Volt_Count; ++n) + for (unsigned int n=0; nm_Exc->Curr_Count; ++n) { exc_pos = numTS - (int)m_Op_Exc->m_Exc->Curr_delay[n]; exc_pos *= (exc_pos>0 && exc_pos<=(int)m_Op_Exc->m_Exc->Length); diff --git a/FDTD/extensions/operator_ext_excitation.h b/FDTD/extensions/operator_ext_excitation.h index 8cab872..254967d 100644 --- a/FDTD/extensions/operator_ext_excitation.h +++ b/FDTD/extensions/operator_ext_excitation.h @@ -30,14 +30,14 @@ public: Operator_Ext_Excitation(Operator* op, Excitation* exc); ~Operator_Ext_Excitation(); - virtual Operator_Extension* Clone(Operator* op) {return NULL;} + virtual Operator_Extension* Clone(Operator* op) {UNUSED(op);return NULL;} virtual bool BuildExtension(); virtual Engine_Extension* CreateEngineExtention(); virtual bool IsCylinderCoordsSave() const {return true;} - virtual bool IsCylindricalMultiGridSave(bool child) const {return true;} + virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;} virtual string GetExtensionName() const {return string("Excitation Extension");}