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

critical bug fix in handling lumped elements

Browse Source 
bug: if one lumped element inside a property failed, all following elements were skipped
This commit is contained in:
Thorsten Liebig 2011-11-16 11:30:21 +01:00
parent d6f43512d8
commit 3660da8a8d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FDTD/operator.cpp
View File

@ -265,7 +265,7 @@ int Operator::SnapBox2Mesh(const double* start, const double* stop, unsigned int
double max = GetDiscLine(n,GetNumberOfLines(n)-1); double max = GetDiscLine(n,GetNumberOfLines(n)-1);
if ( ((l_start[n]<min) && (l_stop[n]<min)) || ((l_start[n]>max) && (l_stop[n]>max)) ) if ( ((l_start[n]<min) && (l_stop[n]<min)) || ((l_start[n]>max) && (l_stop[n]>max)) )
{ {
return -1; return -2;
} }
} }
@ -1256,7 +1256,7 @@ bool Operator::Calc_LumpedElements()
{ {
cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element R or C not specified! skipping. " cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element R or C not specified! skipping. "
<< " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl; << " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl;
break; continue;
} }
int ny = PLE->GetDirection(); int ny = PLE->GetDirection();
@ -1264,7 +1264,7 @@ bool Operator::Calc_LumpedElements()
{ {
cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element direction is invalid! skipping. " cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element direction is invalid! skipping. "
<< " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl; << " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl;
break; continue;
} }
int nyP = (ny+1)%3; int nyP = (ny+1)%3;
int nyPP = (ny+2)%3; int nyPP = (ny+2)%3;
@ -1275,17 +1275,18 @@ bool Operator::Calc_LumpedElements()
int Snap_Dimension = Operator::SnapBox2Mesh(box->GetStartCoord()->GetCoords(m_MeshType), box->GetStopCoord()->GetCoords(m_MeshType), uiStart, uiStop); int Snap_Dimension = Operator::SnapBox2Mesh(box->GetStartCoord()->GetCoords(m_MeshType), box->GetStopCoord()->GetCoords(m_MeshType), uiStart, uiStop);
if (Snap_Dimension<=0) if (Snap_Dimension<=0)
{ {
if (g_settings.GetVerboseLevel()>0) if (Snap_Dimension>=-1)
cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element snapping failed! Dimension is: " << Snap_Dimension << " skipping. " cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element snapping failed! Dimension is: " << Snap_Dimension << " skipping. "
<< " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl; << " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl;
break; // Snap_Dimension == -2 means outside the simulation domain --> no special warning, but box probably marked as unused!
continue;
} }
if (uiStart[ny]==uiStop[ny]) if (uiStart[ny]==uiStop[ny])
{ {
cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element with zero (snapped) length is invalid! skipping. " cerr << "Operator::Calc_LumpedElements(): Warning: Lumped Element with zero (snapped) length is invalid! skipping. "
<< " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl; << " ID: " << prims.at(bn)->GetID() << " @ Property: " << PLE->GetName() << endl;
break; continue;
} }
//calculate geometric property for this lumped element //calculate geometric property for this lumped element