diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp index cf1ebac..5c7eed1 100644 --- a/FDTD/operator.cpp +++ b/FDTD/operator.cpp @@ -102,15 +102,17 @@ unsigned int Operator::CalcNyquistNum(double fmax) return floor(T0/2/dT); } -bool Operator::SnapToMesh(double* dcoord, unsigned int* uicoord, bool lower) +bool Operator::SnapToMesh(double* dcoord, unsigned int* uicoord, bool lower, bool* inside) { bool ok=true; for (int n=0;n<3;++n) { + if (inside) //set defaults + inside[n] = true; uicoord[n]=0; - if (dcoord[n]discLines[n][numLines[n]-1]) {ok=false;uicoord[n]=numLines[n]-1; if (lower) uicoord[n]=numLines[n]-2;} + else if (dcoord[n]>discLines[n][numLines[n]-1]) {ok=false;uicoord[n]=numLines[n]-1; if (lower) uicoord[n]=numLines[n]-2; if (inside) inside[n] = false; } else if (dcoord[n]==discLines[n][numLines[n]-1]) {uicoord[n]=numLines[n]-1; if (lower) uicoord[n]=numLines[n]-2;} else for (unsigned int i=1;iSnapToMesh(dstart,start,true)==false) cerr << "ProcessCurrent::DefineStartStopCoord: Warning: Snapping problem, check start value!!" << endl; - if (Op->SnapToMesh(dstop,stop,true)==false) cerr << "ProcessCurrent::DefineStartStopCoord: Warning: Snapping problem, check stop value!!" << endl; + if (Op->SnapToMesh(dstart,start,true,m_start_inside)==false) cerr << "ProcessCurrent::DefineStartStopCoord: Warning: Snapped line outside field domain!!" << endl; + if (Op->SnapToMesh(dstop,stop,true,m_stop_inside)==false) cerr << "ProcessCurrent::DefineStartStopCoord: Warning: Snapped line outside field domain!!" << endl; } int ProcessCurrent::Process() @@ -62,27 +62,36 @@ int ProcessCurrent::Process() unsigned int help=start[n]; start[n]=stop[n]; stop[n]=help; + bool b_help=m_start_inside[n]; + m_start_inside[n] = m_stop_inside[n]; + m_stop_inside[n] = b_help; } } //x-current - for (unsigned int i=start[0];inumTS << " i: " << current << endl; v_current.push_back(current); diff --git a/FDTD/processing.cpp b/FDTD/processing.cpp index 4f25a3f..699626d 100644 --- a/FDTD/processing.cpp +++ b/FDTD/processing.cpp @@ -85,8 +85,8 @@ void Processing::AddSteps(vector steps) void Processing::DefineStartStopCoord(double* dstart, double* dstop) { - if (Op->SnapToMesh(dstart,start)==false) cerr << "Processing::DefineStartStopCoord: Warning: Snapping problem, check start value!!" << endl; - if (Op->SnapToMesh(dstop,stop)==false) cerr << "Processing::DefineStartStopCoord: Warning: Snapping problem, check stop value!!" << endl; + if (Op->SnapToMesh(dstart,start)==false) cerr << "Processing::DefineStartStopCoord: Warning: Snapped line outside field domain!!" << endl; + if (Op->SnapToMesh(dstop,stop)==false) cerr << "Processing::DefineStartStopCoord: Warning: Snapped line outside field domain!!" << endl; } double Processing::CalcLineIntegral(unsigned int* start, unsigned int* stop, int field) diff --git a/FDTD/processing.h b/FDTD/processing.h index 9286307..cdf6259 100644 --- a/FDTD/processing.h +++ b/FDTD/processing.h @@ -58,9 +58,14 @@ protected: size_t m_PS_pos; //! current position in list of processing steps vector m_ProcessSteps; //! list of processing steps + //! define/store snapped start/stop coords as mesh index unsigned int start[3]; unsigned int stop[3]; + //! define/store if snapped start/stop coords are inside the field domain + bool m_start_inside[3]; + bool m_stop_inside[3]; + double CalcLineIntegral(unsigned int* start, unsigned int* stop, int field); };