some typos & consol message fixes
parent
11df0f5c37
commit
88b319cbba
|
@ -94,7 +94,7 @@ void Engine_Multithread::Init()
|
|||
m_stopThreads = false;
|
||||
if (m_numThreads == 0)
|
||||
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_VoltExcite = new boost::barrier(m_numThreads+1); // numThread workers + 1 excitation thread
|
||||
m_barrier_CurrUpdate = new boost::barrier(m_numThreads); // numThread workers
|
||||
|
|
|
@ -318,7 +318,8 @@ void Operator::DumpOperator2File(string filename)
|
|||
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);
|
||||
if (Exc) {
|
||||
for (unsigned int n=0;n<Exc->E_Count;++n)
|
||||
|
@ -348,7 +349,7 @@ void Operator::DumpPEC2File( string filename )
|
|||
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 );
|
||||
unsigned int pos[3];
|
||||
|
@ -382,7 +383,7 @@ void Operator::DumpMaterial2File(string filename)
|
|||
return;
|
||||
}
|
||||
|
||||
cout << "Dumping material information to vtk file: " << filename << " ..." ;
|
||||
cout << "Dumping material information to vtk file: " << filename << " ..." << flush;
|
||||
|
||||
FDTD_FLOAT*** epsilon;
|
||||
FDTD_FLOAT*** mue;
|
||||
|
|
|
@ -79,7 +79,7 @@ int Operator_Multithread::CalcECOperator()
|
|||
if (m_numThreads == 0)
|
||||
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();
|
||||
delete m_CalcEC_Start;m_CalcEC_Start = new boost::barrier(m_numThreads+1); // numThread workers + 1 controller
|
||||
|
|
|
@ -93,6 +93,9 @@ void Operator_sse::DumpOperator2File(string filename)
|
|||
return;
|
||||
}
|
||||
|
||||
cout << "Dumping FDTD operator information to vtk file: " << filename << " ..." << flush ;
|
||||
|
||||
|
||||
FDTD_FLOAT**** exc = Create_N_3DArray<FDTD_FLOAT>(numLines);
|
||||
if (Exc) {
|
||||
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;
|
||||
|
||||
file.close();
|
||||
|
||||
cout << " done!" << endl;
|
||||
}
|
||||
|
||||
|
|
|
@ -168,7 +168,7 @@ bool Operator_SSE_Compressed::CompareOperators(unsigned int pos1[3], unsigned in
|
|||
|
||||
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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue