From e108e17cec573d20d8cc1c29a00ad5b1711ba1ed Mon Sep 17 00:00:00 2001 From: Sebastian Held Date: Sat, 27 Mar 2010 11:32:06 +0100 Subject: [PATCH] bugfix: calculate correct number of timesteps --- FDTD/engine_multithread.cpp | 24 +++++++++++++----------- FDTD/engine_multithread.h | 7 +++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/FDTD/engine_multithread.cpp b/FDTD/engine_multithread.cpp index 649a205..6f3fa67 100644 --- a/FDTD/engine_multithread.cpp +++ b/FDTD/engine_multithread.cpp @@ -42,16 +42,16 @@ void Engine_Multithread::Init() numTS = 0; // initialize threads - int numThreads = boost::thread::hardware_concurrency(); - std::cout << "using " << numThreads << " threads" << std::endl; - m_barrier1 = new boost::barrier(numThreads+1); // numThread workers + 1 excitation thread - m_barrier2 = new boost::barrier(numThreads+1); // numThread workers + 1 excitation thread - m_barrier3 = new boost::barrier(numThreads); // numThread workers - m_startBarrier = new boost::barrier(numThreads+1); // numThread workers + 1 controller - m_stopBarrier = new boost::barrier(numThreads+1); // numThread workers + 1 controller + m_numThreads = boost::thread::hardware_concurrency(); + std::cout << "using " << m_numThreads << " threads" << std::endl; + m_barrier1 = new boost::barrier(m_numThreads+1); // numThread workers + 1 excitation thread + m_barrier2 = new boost::barrier(m_numThreads+1); // numThread workers + 1 excitation thread + m_barrier3 = new boost::barrier(m_numThreads); // numThread workers + m_startBarrier = new boost::barrier(m_numThreads+1); // numThread workers + 1 controller + m_stopBarrier = new boost::barrier(m_numThreads+1); // numThread workers + 1 controller - for (int n=0; nnumLines[0]+numThreads-1) / numThreads; + for (int n=0; nnumLines[0]+m_numThreads-1) / m_numThreads; unsigned int start = n * linesPerThread; unsigned int stop = min( (n+1) * linesPerThread - 1, Op->numLines[0]-1 ); //std::cout << "### " << Op->numLines[0] << " " << linesPerThread << " " << start << " " << stop << std::endl; @@ -169,7 +169,7 @@ void thread::operator()() //soft current excitation here (H-field excite) - ++m_enginePtr->numTS; // FIXME BUG!!!!! increases not by 1, but by the number of threads!!!! + ++m_enginePtr->m_numTS_times_threads; } m_enginePtr->m_stopBarrier->wait(); @@ -194,10 +194,12 @@ void thread_e_excitation::operator()() m_enginePtr->m_barrier1->wait(); int exc_pos; + unsigned int numTS = m_enginePtr->m_numTS_times_threads / m_enginePtr->m_numThreads; + //soft voltage excitation here (E-field excite) for (unsigned int n=0;nE_Exc_Count;++n) { - exc_pos = (int)m_enginePtr->m_numTS - (int)Op->E_Exc_delay[n]; + exc_pos = (int)numTS - (int)Op->E_Exc_delay[n]; exc_pos*= (exc_pos>0 && exc_pos<(int)Op->ExciteLength); // if (n==0) cerr << numTS << " => " << Op->ExciteSignal[exc_pos] << endl; volt[Op->E_Exc_dir[n]][Op->E_Exc_index[0][n]][Op->E_Exc_index[1][n]][Op->E_Exc_index[2][n]] += Op->E_Exc_amp[n]*Op->ExciteSignal[exc_pos]; diff --git a/FDTD/engine_multithread.h b/FDTD/engine_multithread.h index c3dead4..7aec99e 100644 --- a/FDTD/engine_multithread.h +++ b/FDTD/engine_multithread.h @@ -42,16 +42,15 @@ public: //!Iterate a number of timesteps virtual bool IterateTS(unsigned int iterTS); - void doWork(unsigned int start, unsigned int stop, unsigned int iterTS); - void doWork_e_excitation(unsigned int start, unsigned int stop, unsigned int iterTS); - + virtual unsigned int GetNumberOfTimesteps() {return m_numTS_times_threads / m_numThreads;} protected: Engine_Multithread(Operator* op); boost::thread_group m_thread_group; boost::barrier *m_barrier1, *m_barrier2, *m_barrier3, *m_startBarrier, *m_stopBarrier; volatile unsigned int m_iterTS; - volatile unsigned int m_numTS; + volatile unsigned int m_numTS_times_threads; //!< numTS times the number of worker threads + unsigned int m_numThreads; //!< number of worker threads };