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

MPI: fix for cylindrical coordinate engine + MPI

pull/1/head
Thorsten Liebig 2011-02-16 15:28:14 +01:00
parent 8d2d645a26
commit 9d51971c26
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FDTD/operator.cpp
View File

@ -35,6 +35,7 @@ Operator::Operator() : Operator_Base()
{ {
Exc = 0; Exc = 0;
m_InvaildTimestep = false; m_InvaildTimestep = false;
m_TimeStepVar = 3;
} }
Operator::~Operator() Operator::~Operator()
@ -1192,11 +1193,11 @@ bool Operator::Calc_EC()
double Operator::CalcTimestep() double Operator::CalcTimestep()
{ {
#if 1 //use the new timestep-calc (1) or the old one (0) if (m_TimeStepVar==3)
return CalcTimestep_Var3(); //the biggest one for cartesian meshes return CalcTimestep_Var3(); //the biggest one for cartesian meshes
#else
//variant 1 is default
return CalcTimestep_Var1(); return CalcTimestep_Var1();
#endif
} }
////Berechnung nach Andreas Rennings Dissertation 2008, Seite 66, Formel 4.52 ////Berechnung nach Andreas Rennings Dissertation 2008, Seite 66, Formel 4.52

1
FDTD/operator.h
View File

@ -156,6 +156,7 @@ protected:
virtual void CalcPEC_Curves(); //internal to CalcPEC virtual void CalcPEC_Curves(); //internal to CalcPEC
//Calc timestep only internal use //Calc timestep only internal use
int m_TimeStepVar;
virtual double CalcTimestep(); virtual double CalcTimestep();
double opt_dT; double opt_dT;
bool m_InvaildTimestep; bool m_InvaildTimestep;

3
FDTD/operator_cylinder.cpp
View File

@ -229,5 +229,6 @@ void Operator_Cylinder::AddExtension(Operator_Extension* op_ext)
double Operator_Cylinder::CalcTimestep() double Operator_Cylinder::CalcTimestep()
{ {
return CalcTimestep_Var1(); m_TimeStepVar = 1;
return Operator_Multithread::CalcTimestep();
} }