zcy
/
openEMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tvelliott/openEMS 

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
pull/45/head
Thorsten Liebig 2018-11-17 18:27:39 +01:00
parent d6dabdc0ed 3a2af34bce
commit 9a8ff11a4d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FDTD/extensions/operator_ext_lorentzmaterial.cpp
View File

@ -225,6 +225,9 @@ bool Operator_Ext_LorentzMaterial::BuildExtension()
// CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord,(CSProperties::PropertyType)(CSProperties::METAL | CSProperties::MATERIAL), true); // CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord,(CSProperties::PropertyType)(CSProperties::METAL | CSProperties::MATERIAL), true);
CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord, vPrims, true); CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord, vPrims, true);
if(prop==NULL) continue;
if ((mat = prop->ToLorentzMaterial())) if ((mat = prop->ToLorentzMaterial()))
{ {
w_plasma = mat->GetEpsPlasmaFreqWeighted(order,n,coord) * 2 * PI; w_plasma = mat->GetEpsPlasmaFreqWeighted(order,n,coord) * 2 * PI;
@ -277,6 +280,9 @@ bool Operator_Ext_LorentzMaterial::BuildExtension()
// CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord,(CSProperties::PropertyType)(CSProperties::METAL | CSProperties::MATERIAL), true); // CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord,(CSProperties::PropertyType)(CSProperties::METAL | CSProperties::MATERIAL), true);
CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord, vPrims, true); CSProperties* prop = m_Op->GetGeometryCSX()->GetPropertyByCoordPriority(coord, vPrims, true);
if(prop==NULL) continue;
if ((mat = prop->ToLorentzMaterial())) if ((mat = prop->ToLorentzMaterial()))
{ {
w_plasma = mat->GetMuePlasmaFreqWeighted(order,n,coord) * 2 * PI; w_plasma = mat->GetMuePlasmaFreqWeighted(order,n,coord) * 2 * PI;