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

fix in probe type check

pull/1/head
Thorsten Liebig 2010-06-25 15:22:01 +02:00
parent dd71ae33ae
commit 017fcdce5a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openems.cpp
View File

@ -318,12 +318,17 @@ int openEMS::SetupFDTD(const char* file)
procVolt->OpenFile(pb->GetName()); procVolt->OpenFile(pb->GetName());
proc=procVolt; proc=procVolt;
} }
if (pb->GetProbeType()==1) else if (pb->GetProbeType()==1)
{ {
ProcessCurrent* procCurr = new ProcessCurrent(FDTD_Op,FDTD_Eng); ProcessCurrent* procCurr = new ProcessCurrent(FDTD_Op,FDTD_Eng);
procCurr->OpenFile(pb->GetName()); procCurr->OpenFile(pb->GetName());
proc=procCurr; proc=procCurr;
} }
else
{
cerr << "openEMS::SetupFDTD: Warning: Probe type " << pb->GetProbeType() << " of property '" << pb->GetName() << "' is unknown..." << endl;
continue;
}
proc->SetProcessInterval(Nyquist/m_OverSampling); proc->SetProcessInterval(Nyquist/m_OverSampling);
proc->DefineStartStopCoord(start,stop); proc->DefineStartStopCoord(start,stop);
proc->SetWeight(pb->GetWeighting()); proc->SetWeight(pb->GetWeighting());
@ -391,12 +396,12 @@ string FormatTime(int sec)
stringstream ss; stringstream ss;
if (sec<60) if (sec<60)
{ {
ss << setw(8) << sec << "s"; ss << setw(9) << sec << "s";
return ss.str(); return ss.str();
} }
if (sec<3600) if (sec<3600)
{ {
ss << setw(5) << sec/60 << "m" << setw(2) << setfill('0') << sec%60 << "s"; ss << setw(6) << sec/60 << "m" << setw(2) << setfill('0') << sec%60 << "s";
return ss.str(); return ss.str();
} }
ss << setw(3) << sec/3600 << "h" << setw(2) << setfill('0') << (sec%3600)/60 << "m" << setw(2) << setfill('0') << sec%60 << "s"; ss << setw(3) << sec/3600 << "h" << setw(2) << setfill('0') << (sec%3600)/60 << "m" << setw(2) << setfill('0') << sec%60 << "s";