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

some typos & consol message fixes

pull/1/head
Thorsten Liebig 2010-06-07 23:08:38 +02:00
parent 11df0f5c37
commit 88b319cbba
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FDTD/engine_multithread.cpp
View File

@ -94,7 +94,7 @@ void Engine_Multithread::Init()
m_stopThreads = false; m_stopThreads = false;
if (m_numThreads == 0) if (m_numThreads == 0)
m_numThreads = boost::thread::hardware_concurrency(); m_numThreads = boost::thread::hardware_concurrency();
cout << "Multithreading engine using " << m_numThreads << " threads." << std::endl; cout << "Multithreaded engine using " << m_numThreads << " threads." << std::endl;
m_barrier_VoltUpdate = new boost::barrier(m_numThreads); // numThread workers m_barrier_VoltUpdate = new boost::barrier(m_numThreads); // numThread workers
m_barrier_VoltExcite = new boost::barrier(m_numThreads+1); // numThread workers + 1 excitation thread m_barrier_VoltExcite = new boost::barrier(m_numThreads+1); // numThread workers + 1 excitation thread
m_barrier_CurrUpdate = new boost::barrier(m_numThreads); // numThread workers m_barrier_CurrUpdate = new boost::barrier(m_numThreads); // numThread workers

7
FDTD/operator.cpp
View File

@ -318,7 +318,8 @@ void Operator::DumpOperator2File(string filename)
return; return;
} }
cout << "Dumping PEC information to vtk file: " << filename << " ..." ; cout << "Dumping FDTD operator information to vtk file: " << filename << " ..." << flush ;
FDTD_FLOAT**** exc = Create_N_3DArray<FDTD_FLOAT>(numLines); FDTD_FLOAT**** exc = Create_N_3DArray<FDTD_FLOAT>(numLines);
if (Exc) { if (Exc) {
for (unsigned int n=0;n<Exc->E_Count;++n) for (unsigned int n=0;n<Exc->E_Count;++n)
@ -348,7 +349,7 @@ void Operator::DumpPEC2File( string filename )
return; return;
} }
cout << "Dumping PEC information to vtk file: " << filename << " ..." ; cout << "Dumping PEC information to vtk file: " << filename << " ..." << flush;
FDTD_FLOAT**** pec = Create_N_3DArray<FDTD_FLOAT>( numLines ); FDTD_FLOAT**** pec = Create_N_3DArray<FDTD_FLOAT>( numLines );
unsigned int pos[3]; unsigned int pos[3];
@ -382,7 +383,7 @@ void Operator::DumpMaterial2File(string filename)
return; return;
} }
cout << "Dumping material information to vtk file: " << filename << " ..." ; cout << "Dumping material information to vtk file: " << filename << " ..." << flush;
FDTD_FLOAT*** epsilon; FDTD_FLOAT*** epsilon;
FDTD_FLOAT*** mue; FDTD_FLOAT*** mue;

2
FDTD/operator_multithread.cpp
View File

@ -79,7 +79,7 @@ int Operator_Multithread::CalcECOperator()
if (m_numThreads == 0) if (m_numThreads == 0)
m_numThreads = boost::thread::hardware_concurrency(); m_numThreads = boost::thread::hardware_concurrency();
cout << "Multithreading operator using " << m_numThreads << " threads." << std::endl; cout << "Multithreaded operator using " << m_numThreads << " threads." << std::endl;
m_thread_group.join_all(); m_thread_group.join_all();
delete m_CalcEC_Start;m_CalcEC_Start = new boost::barrier(m_numThreads+1); // numThread workers + 1 controller delete m_CalcEC_Start;m_CalcEC_Start = new boost::barrier(m_numThreads+1); // numThread workers + 1 controller

5
FDTD/operator_sse.cpp
View File

@ -93,6 +93,9 @@ void Operator_sse::DumpOperator2File(string filename)
return; return;
} }
cout << "Dumping FDTD operator information to vtk file: " << filename << " ..." << flush ;
FDTD_FLOAT**** exc = Create_N_3DArray<FDTD_FLOAT>(numLines); FDTD_FLOAT**** exc = Create_N_3DArray<FDTD_FLOAT>(numLines);
if (Exc) { if (Exc) {
for (unsigned int n=0;n<Exc->E_Count;++n) for (unsigned int n=0;n<Exc->E_Count;++n)
@ -134,5 +137,7 @@ void Operator_sse::DumpOperator2File(string filename)
Delete_N_3DArray(ii,numLines);ii=NULL; Delete_N_3DArray(ii,numLines);ii=NULL;
file.close(); file.close();
cout << " done!" << endl;
} }

2
FDTD/operator_sse_compressed.cpp
View File

@ -168,7 +168,7 @@ bool Operator_SSE_Compressed::CompareOperators(unsigned int pos1[3], unsigned in
bool Operator_SSE_Compressed::CompressOperator() bool Operator_SSE_Compressed::CompressOperator()
{ {
cout << "Compressing the FDTD operator... this my take a while..." << endl; cout << "Compressing the FDTD operator... this may take a while..." << endl;
if (m_max_fifo==0) if (m_max_fifo==0)
{ {