diff --git a/FDTD/engine_multithread.cpp b/FDTD/engine_multithread.cpp index d176c87..99ce1de 100644 --- a/FDTD/engine_multithread.cpp +++ b/FDTD/engine_multithread.cpp @@ -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 diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp index c4aa9b4..72c5cb5 100644 --- a/FDTD/operator.cpp +++ b/FDTD/operator.cpp @@ -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(numLines); if (Exc) { for (unsigned int n=0;nE_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( 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; diff --git a/FDTD/operator_multithread.cpp b/FDTD/operator_multithread.cpp index 1b8daff..e502e3e 100644 --- a/FDTD/operator_multithread.cpp +++ b/FDTD/operator_multithread.cpp @@ -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 diff --git a/FDTD/operator_sse.cpp b/FDTD/operator_sse.cpp index e9866ef..6420724 100644 --- a/FDTD/operator_sse.cpp +++ b/FDTD/operator_sse.cpp @@ -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(numLines); if (Exc) { for (unsigned int n=0;nE_Count;++n) @@ -134,5 +137,7 @@ void Operator_sse::DumpOperator2File(string filename) Delete_N_3DArray(ii,numLines);ii=NULL; file.close(); + + cout << " done!" << endl; } diff --git a/FDTD/operator_sse_compressed.cpp b/FDTD/operator_sse_compressed.cpp index aa3ab80..c3c1943 100644 --- a/FDTD/operator_sse_compressed.cpp +++ b/FDTD/operator_sse_compressed.cpp @@ -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) {