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

operator: make Grid_Path a typedef struct

Browse Source 
Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
This commit is contained in:
Thorsten Liebig 2013-08-16 13:19:12 +02:00
parent 6c80ad021d
commit e27e4057e1
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/operator_base.h
View File

@ -23,6 +23,12 @@
#include "Common/processing.h" #include "Common/processing.h"
#include "string" #include "string"
typedef struct
{
vector<unsigned int> posPath[3];
vector<unsigned short> dir;
} Grid_Path;
//! Abstract base-class for a common operator //! Abstract base-class for a common operator
class Operator_Base class Operator_Base
{ {

2
FDTD/extensions/operator_ext_excitation.cpp
View File

@ -230,7 +230,7 @@ bool Operator_Ext_Excitation::BuildExtension()
//special treatment for primitives of type curve (treated as wires) see also Calc_PEC //special treatment for primitives of type curve (treated as wires) see also Calc_PEC
double p1[3]; double p1[3];
double p2[3]; double p2[3];
struct Operator::Grid_Path path; Grid_Path path;
for (size_t p=0; p<vec_prop.size(); ++p) for (size_t p=0; p<vec_prop.size(); ++p)
{ {
prop = vec_prop.at(p); prop = vec_prop.at(p);

6
FDTD/operator.cpp
View File

@ -379,9 +379,9 @@ int Operator::SnapLine2Mesh(const double* start, const double* stop, unsigned in
} }
struct Operator::Grid_Path Operator::FindPath(double start[], double stop[]) Grid_Path Operator::FindPath(double start[], double stop[])
{ {
struct Grid_Path path; Grid_Path path;
unsigned int uiStart[3],uiStop[3],currPos[3]; unsigned int uiStart[3],uiStop[3],currPos[3];
int ret = SnapLine2Mesh(start, stop, uiStart, uiStop, false, true); int ret = SnapLine2Mesh(start, stop, uiStart, uiStop, false, true);
@ -1775,7 +1775,7 @@ void Operator::CalcPEC_Curves()
//special treatment for primitives of type curve (treated as wires) //special treatment for primitives of type curve (treated as wires)
double p1[3]; double p1[3];
double p2[3]; double p2[3];
struct Grid_Path path; Grid_Path path;
vector<CSProperties*> vec_prop = CSX->GetPropertyByType(CSProperties::METAL); vector<CSProperties*> vec_prop = CSX->GetPropertyByType(CSProperties::METAL);
for (size_t p=0; p<vec_prop.size(); ++p) for (size_t p=0; p<vec_prop.size(); ++p)
{ {

7
FDTD/operator.h
View File

@ -179,12 +179,7 @@ protected:
virtual bool SetupCSXGrid(CSRectGrid* grid); virtual bool SetupCSXGrid(CSRectGrid* grid);
struct Grid_Path virtual Grid_Path FindPath(double start[], double stop[]);
{
vector<unsigned int> posPath[3];
vector<unsigned short> dir;
};
virtual struct Grid_Path FindPath(double start[], double stop[]);
// debug // debug
virtual void DumpOperator2File(string filename); virtual void DumpOperator2File(string filename);

8
FDTD/operator_cylinder.cpp
View File

@ -274,7 +274,7 @@ int Operator_Cylinder::SnapLine2Mesh(const double* start, const double* stop, un
} }
struct Operator::Grid_Path Operator_Cylinder::FindPath(double start[], double stop[]) Grid_Path Operator_Cylinder::FindPath(double start[], double stop[])
{ {
double l_start[3]; double l_start[3];
double l_stop[3]; double l_stop[3];
@ -316,7 +316,7 @@ struct Operator::Grid_Path Operator_Cylinder::FindPath(double start[], double st
// if a-stop fitted to disc range is now smaller than a-start, it must step over the a-bounds... // if a-stop fitted to disc range is now smaller than a-start, it must step over the a-bounds...
struct Grid_Path path; Grid_Path path;
for (int n=0;n<3;++n) for (int n=0;n<3;++n)
{ {
if ((l_start[n]<GetDiscLine(n,0)) && (l_stop[n]<GetDiscLine(n,0))) if ((l_start[n]<GetDiscLine(n,0)) && (l_stop[n]<GetDiscLine(n,0)))
@ -331,8 +331,8 @@ struct Operator::Grid_Path Operator_Cylinder::FindPath(double start[], double st
// this section comes into play, if the line moves over the angulare mesh-end/start // this section comes into play, if the line moves over the angulare mesh-end/start
// we try to have one part of the path on both "ends" of the mesh and stitch them together // we try to have one part of the path on both "ends" of the mesh and stitch them together
struct Grid_Path path1; Grid_Path path1;
struct Grid_Path path2; Grid_Path path2;
// calculate the intersection of the line with the a-max boundary // calculate the intersection of the line with the a-max boundary
double p0[3],p1[3],p2[3]; double p0[3],p1[3],p2[3];

2
FDTD/operator_cylinder.h
View File

@ -93,7 +93,7 @@ protected:
virtual bool SetupCSXGrid(CSRectGrid* grid); virtual bool SetupCSXGrid(CSRectGrid* grid);
virtual struct Grid_Path FindPath(double start[], double stop[]); virtual Grid_Path FindPath(double start[], double stop[]);
virtual double GetRawDiscDelta(int ny, const int pos) const; virtual double GetRawDiscDelta(int ny, const int pos) const;