From 207e22f1db2f92eb302bac936f895b69b1a0c122 Mon Sep 17 00:00:00 2001 From: Thorsten Liebig Date: Fri, 26 Mar 2010 19:33:44 +0100 Subject: [PATCH 1/5] fix in operator curve handling --- FDTD/operator.cpp | 56 +++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp index 71d0ea0..08906d9 100644 --- a/FDTD/operator.cpp +++ b/FDTD/operator.cpp @@ -139,19 +139,17 @@ struct Operator::Grid_Path Operator::FindPath(double start[], double stop[]) double meshStart[] = {discLines[0][uiStart[0]], discLines[1][uiStart[1]], discLines[2][uiStart[2]]}; double meshStop[] = {discLines[0][uiStop[0]], discLines[1][uiStop[1]], discLines[2][uiStop[2]]}; - double foot,dist,minFoot,minDist,minDir; + double foot,dist,minFoot,minDist; + int minDir; + bool UpDir; unsigned int minPos[3]; double startFoot,stopFoot,currFoot; Point_Line_Distance(meshStart,start,stop,startFoot,dist); Point_Line_Distance(meshStop,start,stop,stopFoot,dist); currFoot=startFoot; - + minFoot=startFoot; double P[3]; -// cerr << "start pos " << discLines[0][currPos[0]] << " " << discLines[1][currPos[1]] << " " << discLines[2][currPos[2]] << endl; -// -// FDTD_FLOAT**** array = Create_N_3DArray(numLines); - while (minFootGetPoint(i-1,p1); curv->GetPoint(i,p2); path = FindPath(p1,p2); -// cerr << p1[0] << " " << p1[1] << " " << p1[2] << endl; -// cerr << p2[0] << " " << p2[1] << " " << p2[2] << endl; for (size_t t=0;t Date: Fri, 26 Mar 2010 19:51:09 +0100 Subject: [PATCH 2/5] fixed lots of int/u-int comparison and missing return values --- FDTD/operator.cpp | 16 +++++++++------- FDTD/processcurrent.cpp | 12 ++++++------ FDTD/processfields.cpp | 5 ++++- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp index 08906d9..514f571 100644 --- a/FDTD/operator.cpp +++ b/FDTD/operator.cpp @@ -139,9 +139,9 @@ struct Operator::Grid_Path Operator::FindPath(double start[], double stop[]) double meshStart[] = {discLines[0][uiStart[0]], discLines[1][uiStart[1]], discLines[2][uiStart[2]]}; double meshStop[] = {discLines[0][uiStop[0]], discLines[1][uiStop[1]], discLines[2][uiStop[2]]}; - double foot,dist,minFoot,minDist; - int minDir; bool UpDir; + double foot=0,dist=0,minFoot=0,minDist=0; + int minDir=0; unsigned int minPos[3]; double startFoot,stopFoot,currFoot; Point_Line_Distance(meshStart,start,stop,startFoot,dist); @@ -158,7 +158,7 @@ struct Operator::Grid_Path Operator::FindPath(double start[], double stop[]) P[0] = discLines[0][currPos[0]]; P[1] = discLines[1][currPos[1]]; P[2] = discLines[2][currPos[2]]; - if ((currPos[n]-1)>=0) + if (((int)currPos[n]-1)>=0) { P[n] = discLines[n][currPos[n]-1]; Point_Line_Distance(P,start,stop,foot,dist); @@ -725,13 +725,13 @@ bool Operator::CalcEFieldExcitation() double delta[3]; double amp=0; - for (pos[2]=0;pos[2]GetIndexDelta(2,pos[2])); - for (pos[1]=0;pos[1]GetIndexDelta(1,pos[1])); - for (pos[0]=0;pos[0]GetIndexDelta(0,pos[0])); coord[0] = discLines[0][pos[0]]; @@ -748,7 +748,7 @@ bool Operator::CalcEFieldExcitation() CSPropElectrode* elec = prop->ToElectrode(); if (elec!=NULL) { - if ((elec->GetActiveDir(n)) && (pos[n]GetActiveDir(n)) && (pos[n]<(int)numLines[n]-1)) { amp = elec->GetWeightedExcitation(n,coord)*delta[n]*gridDelta; if (amp!=0) @@ -865,5 +865,7 @@ bool Operator::CalcPEC() } } } + + return true; } diff --git a/FDTD/processcurrent.cpp b/FDTD/processcurrent.cpp index 381d567..66c23a0 100644 --- a/FDTD/processcurrent.cpp +++ b/FDTD/processcurrent.cpp @@ -65,22 +65,22 @@ int ProcessCurrent::Process() } //x-current - for (int i=start[0];icurr[0][i][start[1]][start[2]]; //y-current - for (int i=start[1];icurr[1][stop[0]][i][start[2]]; //z-current - for (int i=start[2];icurr[2][stop[0]][stop[1]][i]; //x-current - for (int i=start[0];icurr[0][i][stop[1]][stop[2]]; //y-current - for (int i=start[1];icurr[1][start[0]][i][stop[2]]; //z-current - for (int i=start[2];icurr[2][start[0]][start[1]][i]; // cerr << "ts: " << Eng->numTS << " i: " << current << endl; diff --git a/FDTD/processfields.cpp b/FDTD/processfields.cpp index 49214c7..3d538c6 100644 --- a/FDTD/processfields.cpp +++ b/FDTD/processfields.cpp @@ -193,6 +193,7 @@ bool ProcessFields::DumpMultiVectorArray2VTK(ofstream &file, string names[], FDT WriteVTKVectorArray(file, names[n], array[n], numLines); file << endl; } + return true; } void ProcessFields::WriteVTKScalarArray(ofstream &file, string name, FDTD_FLOAT*** array, unsigned int* numLines) @@ -220,16 +221,18 @@ bool ProcessFields::DumpScalarArray2VTK(ofstream &file, string name, FDTD_FLOAT* { WriteVTKHeader(file, discLines, numLines); WriteVTKScalarArray(file, name, array, numLines); + return true; } bool ProcessFields::DumpMultiScalarArray2VTK(ofstream &file, string names[], FDTD_FLOAT*** array[], unsigned int numFields, double** discLines, unsigned int* numLines) { WriteVTKHeader(file, discLines, numLines); - for (int n=0;n Date: Sat, 27 Mar 2010 23:05:45 +0100 Subject: [PATCH 3/5] added Curve for excitation and dump excitation in operator-dump --- FDTD/operator.cpp | 93 ++++++++++++++++++++++++++++++++++++++++++----- FDTD/operator.h | 4 +- openems.cpp | 33 ++++++++++++----- 3 files changed, 109 insertions(+), 21 deletions(-) diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp index 514f571..7f7006e 100644 --- a/FDTD/operator.cpp +++ b/FDTD/operator.cpp @@ -106,7 +106,7 @@ bool Operator::SnapToMesh(double* dcoord, unsigned int* uicoord, bool lower) else 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]) {uicoord[n]=numLines[n]-1; if (lower) uicoord[n]=numLines[n]-2;} else - for (unsigned int i=1;i vec_prop = CSX->GetPropertyByType(CSProperties::ELECTRODE); + for (size_t p=0;pToElectrode(); + for (size_t n=0;nGetQtyPrimitives();++n) + { + CSPrimitives* prim = prop->GetPrimitive(n); + CSPrimCurve* curv = prim->ToCurve(); + if (curv) + { + for (size_t i=1;iGetNumberOfPoints();++i) + { + curv->GetPoint(i-1,p1); + curv->GetPoint(i,p2); + path = FindPath(p1,p2); + for (size_t t=0;tSetPos(pos[0],pos[1],pos[2]); + deltaN=fabs(MainOp->GetIndexDelta(n,pos[n])); + coord[0] = discLines[0][pos[0]]; + coord[1] = discLines[1][pos[1]]; + coord[2] = discLines[2][pos[2]]; + coord[n] += 0.5*deltaN; +// cerr << n << " " << coord[0] << " " << coord[1] << " " << coord[2] << endl; + if (elec!=NULL) + { + if ((elec->GetActiveDir(n)) && (pos[n]<(int)numLines[n]-1)) + { + amp = elec->GetWeightedExcitation(n,coord)*deltaN*gridDelta; + if (amp!=0) + { + vExcit.push_back(amp); + vDelay.push_back((unsigned int)(elec->GetDelay()/dT)); + vDir.push_back(n); + vIndex[0].push_back(pos[0]); + vIndex[1].push_back(pos[1]); + vIndex[2].push_back(pos[2]); + } + if (elec->GetExcitType()==1) //hard excite + { + vv[n][pos[0]][pos[1]][pos[2]] = 0; + vi[n][pos[0]][pos[1]][pos[2]] = 0; + } + } + } + } + } + } + } + } + E_Exc_Count = vExcit.size(); cerr << "Operator::CalcEFieldExcitation: Found number of excitations points: " << E_Exc_Count << endl; if (E_Exc_Count==0) diff --git a/FDTD/operator.h b/FDTD/operator.h index fc3047a..cc25e6e 100644 --- a/FDTD/operator.h +++ b/FDTD/operator.h @@ -38,9 +38,9 @@ public: virtual int CalcECOperator(); //! Calculate an excitation with center of f0 and the half bandwidth fc - virtual void CalcGaussianPulsExcitation(double f0, double fc); + virtual bool CalcGaussianPulsExcitation(double f0, double fc); //! Calculate a sinusoidal excitation with frequency f0 and a duration of nTS number of timesteps - virtual void CalcSinusExcitation(double f0, int nTS); + virtual bool CalcSinusExcitation(double f0, int nTS); virtual void ApplyElectricBC(bool* dirs); //applied by default to all boundaries virtual void ApplyMagneticBC(bool* dirs); diff --git a/openems.cpp b/openems.cpp index fe9790e..a9eb635 100644 --- a/openems.cpp +++ b/openems.cpp @@ -185,26 +185,39 @@ int openEMS::SetupFDTD(const char* file) FDTD_Op = new Operator(); if (FDTD_Op->SetGeometryCSX(&CSX)==false) return(-1); - if (DebugMat) - { - FDTD_Op->DumpMaterial2File("material_dump.vtk"); - } FDTD_Op->CalcECOperator(); - if (DebugOp) - { - FDTD_Op->DumpOperator2File("operator_dump.vtk"); - } if (Excit_Type==0) - FDTD_Op->CalcGaussianPulsExcitation(f0,fc); + { + if (!FDTD_Op->CalcGaussianPulsExcitation(f0,fc)) + { + cerr << "openEMS: excitation setup failed!!" << endl; + exit(2); + } + } else if (Excit_Type==1) - FDTD_Op->CalcSinusExcitation(f0,NrTS); + { + if (!FDTD_Op->CalcSinusExcitation(f0,NrTS)) + { + cerr << "openEMS: excitation setup failed!!" << endl; + exit(2); + } + } else { cerr << "openEMS: Excitation type is unknown" << endl; exit(-1); } + if (DebugMat) + { + FDTD_Op->DumpMaterial2File("material_dump.vtk"); + } + if (DebugOp) + { + FDTD_Op->DumpOperator2File("operator_dump.vtk"); + } + time_t OpDoneTime=time(NULL); FDTD_Op->ShowSize(); From fd2623d7407cc03b2fe113fe45b335a579682557 Mon Sep 17 00:00:00 2001 From: Thorsten Liebig Date: Mon, 29 Mar 2010 10:01:38 +0200 Subject: [PATCH 4/5] removed engine friend classes, use only engine methods to access protected data --- FDTD/engine.h | 8 +++----- FDTD/processcurrent.cpp | 15 ++++++++------- FDTD/processfields.cpp | 14 ++++++++------ FDTD/processfields_td.cpp | 32 +++++++++++++++++++------------- FDTD/processing.cpp | 4 ++-- FDTD/processvoltage.cpp | 2 +- 6 files changed, 41 insertions(+), 34 deletions(-) diff --git a/FDTD/engine.h b/FDTD/engine.h index 401fa13..e1660b7 100644 --- a/FDTD/engine.h +++ b/FDTD/engine.h @@ -22,11 +22,6 @@ class Engine { - friend class Processing; - friend class ProcessVoltage; - friend class ProcessCurrent; - friend class ProcessFields; - friend class ProcessFieldsTD; public: Engine(Operator* op); virtual ~Engine(); @@ -39,6 +34,9 @@ public: unsigned int GetNumberOfTimesteps() {return numTS;}; + virtual FDTD_FLOAT**** GetVoltages() {return volt;}; + virtual FDTD_FLOAT**** GetCurrents() {return curr;}; + protected: Operator* Op; diff --git a/FDTD/processcurrent.cpp b/FDTD/processcurrent.cpp index 66c23a0..a63a997 100644 --- a/FDTD/processcurrent.cpp +++ b/FDTD/processcurrent.cpp @@ -45,6 +45,7 @@ void ProcessCurrent::DefineStartStopCoord(double* dstart, double* dstop) int ProcessCurrent::Process() { + FDTD_FLOAT**** curr = Eng->GetCurrents(); if (Enabled==false) return -1; if (CheckTimestep()==false) return GetNextInterval(); FDTD_FLOAT current=0; @@ -66,25 +67,25 @@ int ProcessCurrent::Process() //x-current for (unsigned int i=start[0];icurr[0][i][start[1]][start[2]]; + current+=curr[0][i][start[1]][start[2]]; //y-current for (unsigned int i=start[1];icurr[1][stop[0]][i][start[2]]; + current+=curr[1][stop[0]][i][start[2]]; //z-current for (unsigned int i=start[2];icurr[2][stop[0]][stop[1]][i]; + current+=curr[2][stop[0]][stop[1]][i]; //x-current for (unsigned int i=start[0];icurr[0][i][stop[1]][stop[2]]; + current-=curr[0][i][stop[1]][stop[2]]; //y-current for (unsigned int i=start[1];icurr[1][start[0]][i][stop[2]]; + current-=curr[1][start[0]][i][stop[2]]; //z-current for (unsigned int i=start[2];icurr[2][start[0]][start[1]][i]; + current-=curr[2][start[0]][start[1]][i]; // cerr << "ts: " << Eng->numTS << " i: " << current << endl; v_current.push_back(current); - file << (double)Eng->numTS*Op->GetTimestep() << "\t" << current << endl; + file << (double)Eng->GetNumberOfTimesteps()*Op->GetTimestep() << "\t" << current << endl; return GetNextInterval(); } diff --git a/FDTD/processfields.cpp b/FDTD/processfields.cpp index 3d538c6..4c46261 100644 --- a/FDTD/processfields.cpp +++ b/FDTD/processfields.cpp @@ -101,6 +101,8 @@ void ProcessFields::DefineStartStopCoord(double* dstart, double* dstop) double ProcessFields::CalcTotalEnergy() { + FDTD_FLOAT**** volt = Eng->GetVoltages(); + FDTD_FLOAT**** curr = Eng->GetCurrents(); double energy=0; if (Eng==NULL) return 0.0; unsigned int pos[3]; @@ -110,12 +112,12 @@ double ProcessFields::CalcTotalEnergy() { for (pos[2]=0;pos[2]numLines[2];++pos[2]) { - energy+=fabs(Eng->volt[0][pos[0]][pos[1]][pos[2]] * Eng->curr[1][pos[0]][pos[1]][pos[2]]); - energy+=fabs(Eng->volt[0][pos[0]][pos[1]][pos[2]] * Eng->curr[2][pos[0]][pos[1]][pos[2]]); - energy+=fabs(Eng->volt[1][pos[0]][pos[1]][pos[2]] * Eng->curr[0][pos[0]][pos[1]][pos[2]]); - energy+=fabs(Eng->volt[1][pos[0]][pos[1]][pos[2]] * Eng->curr[2][pos[0]][pos[1]][pos[2]]); - energy+=fabs(Eng->volt[2][pos[0]][pos[1]][pos[2]] * Eng->curr[0][pos[0]][pos[1]][pos[2]]); - energy+=fabs(Eng->volt[2][pos[0]][pos[1]][pos[2]] * Eng->curr[1][pos[0]][pos[1]][pos[2]]); + energy+=fabs(volt[0][pos[0]][pos[1]][pos[2]] * curr[1][pos[0]][pos[1]][pos[2]]); + energy+=fabs(volt[0][pos[0]][pos[1]][pos[2]] * curr[2][pos[0]][pos[1]][pos[2]]); + energy+=fabs(volt[1][pos[0]][pos[1]][pos[2]] * curr[0][pos[0]][pos[1]][pos[2]]); + energy+=fabs(volt[1][pos[0]][pos[1]][pos[2]] * curr[2][pos[0]][pos[1]][pos[2]]); + energy+=fabs(volt[2][pos[0]][pos[1]][pos[2]] * curr[0][pos[0]][pos[1]][pos[2]]); + energy+=fabs(volt[2][pos[0]][pos[1]][pos[2]] * curr[1][pos[0]][pos[1]][pos[2]]); } } } diff --git a/FDTD/processfields_td.cpp b/FDTD/processfields_td.cpp index e95d9b5..bc8a93c 100644 --- a/FDTD/processfields_td.cpp +++ b/FDTD/processfields_td.cpp @@ -31,6 +31,9 @@ ProcessFieldsTD::~ProcessFieldsTD() void ProcessFieldsTD::DumpCellInterpol(ofstream &file) { + FDTD_FLOAT**** volt = Eng->GetVoltages(); + FDTD_FLOAT**** curr = Eng->GetCurrents(); + if (DumpType==0) { //create array @@ -50,15 +53,15 @@ void ProcessFieldsTD::DumpCellInterpol(ofstream &file) OpPos[2]=start[2]+pos[2]; //in x delta = Op->discLines[0][OpPos[0]+1] - Op->discLines[0][OpPos[0]]; - E_T[0][pos[0]][pos[1]][pos[2]] = Eng->volt[0][OpPos[0]][OpPos[1]][OpPos[2]] + Eng->volt[0][OpPos[0]][OpPos[1]+1][OpPos[2]] + Eng->volt[0][OpPos[0]][OpPos[1]][OpPos[2]+1] + Eng->volt[0][OpPos[0]][OpPos[1]+1][OpPos[2]+1]; + E_T[0][pos[0]][pos[1]][pos[2]] = volt[0][OpPos[0]][OpPos[1]][OpPos[2]] + volt[0][OpPos[0]][OpPos[1]+1][OpPos[2]] + volt[0][OpPos[0]][OpPos[1]][OpPos[2]+1] + volt[0][OpPos[0]][OpPos[1]+1][OpPos[2]+1]; E_T[0][pos[0]][pos[1]][pos[2]] /= (4*delta*Op->gridDelta); //in y delta = Op->discLines[1][OpPos[1]+1] - Op->discLines[1][OpPos[1]]; - E_T[1][pos[0]][pos[1]][pos[2]] = Eng->volt[1][OpPos[0]][OpPos[1]][OpPos[2]] + Eng->volt[1][OpPos[0]+1][OpPos[1]][OpPos[2]] + Eng->volt[1][OpPos[0]][OpPos[1]][OpPos[2]+1] + Eng->volt[1][OpPos[0]+1][OpPos[1]][OpPos[2]+1]; + E_T[1][pos[0]][pos[1]][pos[2]] = volt[1][OpPos[0]][OpPos[1]][OpPos[2]] + volt[1][OpPos[0]+1][OpPos[1]][OpPos[2]] + volt[1][OpPos[0]][OpPos[1]][OpPos[2]+1] + volt[1][OpPos[0]+1][OpPos[1]][OpPos[2]+1]; E_T[1][pos[0]][pos[1]][pos[2]] /= (4*delta*Op->gridDelta); //in z delta = Op->discLines[2][OpPos[2]+1] - Op->discLines[2][OpPos[2]]; - E_T[2][pos[0]][pos[1]][pos[2]] = Eng->volt[2][OpPos[0]][OpPos[1]][OpPos[2]] + Eng->volt[2][OpPos[0]][OpPos[1]+1][OpPos[2]] + Eng->volt[2][OpPos[0]+1][OpPos[1]][OpPos[2]] + Eng->volt[2][OpPos[0]+1][OpPos[1]+1][OpPos[2]]; + E_T[2][pos[0]][pos[1]][pos[2]] = volt[2][OpPos[0]][OpPos[1]][OpPos[2]] + volt[2][OpPos[0]][OpPos[1]+1][OpPos[2]] + volt[2][OpPos[0]+1][OpPos[1]][OpPos[2]] + volt[2][OpPos[0]+1][OpPos[1]+1][OpPos[2]]; E_T[2][pos[0]][pos[1]][pos[2]] /= (4*delta*Op->gridDelta); } } @@ -88,15 +91,15 @@ void ProcessFieldsTD::DumpCellInterpol(ofstream &file) //in x if (OpPos[0]==0) delta = Op->discLines[0][OpPos[0]+1] - Op->discLines[0][OpPos[0]]; else delta = 0.5* (Op->discLines[0][OpPos[0]+1] - Op->discLines[0][OpPos[0]-1]); - H_T[0][pos[0]][pos[1]][pos[2]] = Eng->curr[0][OpPos[0]][OpPos[1]][OpPos[2]] + Eng->curr[0][OpPos[0]+1][OpPos[1]][OpPos[2]]; + H_T[0][pos[0]][pos[1]][pos[2]] = curr[0][OpPos[0]][OpPos[1]][OpPos[2]] + curr[0][OpPos[0]+1][OpPos[1]][OpPos[2]]; H_T[0][pos[0]][pos[1]][pos[2]] /= (2*delta*Op->gridDelta); //in y delta = Op->discLines[1][OpPos[1]+1] - Op->discLines[1][OpPos[1]]; - H_T[1][pos[0]][pos[1]][pos[2]] = Eng->curr[1][OpPos[0]][OpPos[1]][OpPos[2]] + Eng->curr[1][OpPos[0]][OpPos[1]+1][OpPos[2]]; + H_T[1][pos[0]][pos[1]][pos[2]] = curr[1][OpPos[0]][OpPos[1]][OpPos[2]] + curr[1][OpPos[0]][OpPos[1]+1][OpPos[2]]; H_T[1][pos[0]][pos[1]][pos[2]] /= (2*delta*Op->gridDelta); //in z delta = Op->discLines[2][OpPos[2]+1] - Op->discLines[2][OpPos[2]]; - H_T[2][pos[0]][pos[1]][pos[2]] = Eng->curr[2][OpPos[0]][OpPos[1]][OpPos[2]] + Eng->curr[2][OpPos[0]][OpPos[1]][OpPos[2]+1]; + H_T[2][pos[0]][pos[1]][pos[2]] = curr[2][OpPos[0]][OpPos[1]][OpPos[2]] + curr[2][OpPos[0]][OpPos[1]][OpPos[2]+1]; H_T[2][pos[0]][pos[1]][pos[2]] /= (2*delta*Op->gridDelta); } } @@ -109,6 +112,9 @@ void ProcessFieldsTD::DumpCellInterpol(ofstream &file) void ProcessFieldsTD::DumpNoInterpol(ofstream &file) { + FDTD_FLOAT**** volt = Eng->GetVoltages(); + FDTD_FLOAT**** curr = Eng->GetCurrents(); + unsigned int pos[3]; double delta[3]; if (DumpType==0) @@ -124,9 +130,9 @@ void ProcessFieldsTD::DumpNoInterpol(ofstream &file) for (pos[2]=0;pos[2]MainOp->GetIndexDelta(2,pos[2]+start[2])); - E_T[0][pos[0]][pos[1]][pos[2]] = Eng->volt[0][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[0]/Op->gridDelta; - E_T[1][pos[0]][pos[1]][pos[2]] = Eng->volt[1][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[1]/Op->gridDelta; - E_T[2][pos[0]][pos[1]][pos[2]] = Eng->volt[2][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[2]/Op->gridDelta; + E_T[0][pos[0]][pos[1]][pos[2]] = volt[0][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[0]/Op->gridDelta; + E_T[1][pos[0]][pos[1]][pos[2]] = volt[1][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[1]/Op->gridDelta; + E_T[2][pos[0]][pos[1]][pos[2]] = volt[2][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[2]/Op->gridDelta; } } } @@ -149,9 +155,9 @@ void ProcessFieldsTD::DumpNoInterpol(ofstream &file) { delta[2]=fabs(Op->MainOp->GetIndexWidth(2,pos[2]+start[2])); //in x - H_T[0][pos[0]][pos[1]][pos[2]] = Eng->curr[0][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[0]/Op->gridDelta; - H_T[1][pos[0]][pos[1]][pos[2]] = Eng->curr[1][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[1]/Op->gridDelta; - H_T[2][pos[0]][pos[1]][pos[2]] = Eng->curr[2][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[2]/Op->gridDelta; + H_T[0][pos[0]][pos[1]][pos[2]] = curr[0][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[0]/Op->gridDelta; + H_T[1][pos[0]][pos[1]][pos[2]] = curr[1][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[1]/Op->gridDelta; + H_T[2][pos[0]][pos[1]][pos[2]] = curr[2][pos[0]+start[0]][pos[1]+start[1]][pos[2]+start[2]]/delta[2]/Op->gridDelta; } } } @@ -167,7 +173,7 @@ int ProcessFieldsTD::Process() if (filePattern.empty()) return -1; if (CheckTimestep()==false) return GetNextInterval(); stringstream ss; - ss << std::setw( pad_length ) << std::setfill( '0' ) << Eng->numTS; + ss << std::setw( pad_length ) << std::setfill( '0' ) << Eng->GetNumberOfTimesteps(); string filename = filePattern + ss.str() + ".vtk"; ofstream file(filename.c_str()); diff --git a/FDTD/processing.cpp b/FDTD/processing.cpp index 5be1f68..a54dcca 100644 --- a/FDTD/processing.cpp +++ b/FDTD/processing.cpp @@ -51,9 +51,9 @@ double Processing::CalcLineIntegral(unsigned int* start, unsigned int* stop, int double result=0; FDTD_FLOAT**** array; if (field==0) - array=Eng->volt; + array=Eng->GetVoltages(); else if (field==1) - array=Eng->curr; + array=Eng->GetCurrents(); else return 0.0; for (int n=0;n<3;++n) diff --git a/FDTD/processvoltage.cpp b/FDTD/processvoltage.cpp index 25fe31a..64d41b0 100644 --- a/FDTD/processvoltage.cpp +++ b/FDTD/processvoltage.cpp @@ -45,6 +45,6 @@ int ProcessVoltage::Process() FDTD_FLOAT voltage=CalcLineIntegral(start,stop,0); // cerr << voltage << endl; voltages.push_back(voltage); - file << (double)Eng->numTS*Op->GetTimestep() << "\t" << voltage << endl; + file << (double)Eng->GetNumberOfTimesteps()*Op->GetTimestep() << "\t" << voltage << endl; return GetNextInterval(); } From 5a47a6443a46b4df9345e7df02708086263ffa95 Mon Sep 17 00:00:00 2001 From: Thorsten Liebig Date: Mon, 29 Mar 2010 10:12:38 +0200 Subject: [PATCH 5/5] some more int vs. u-int fixes --- FDTD/operator.cpp | 12 ++++++------ FDTD/processfields.cpp | 3 ++- openems.cpp | 11 ++++++++--- openems.h | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp index 7f7006e..f7b5588 100644 --- a/FDTD/operator.cpp +++ b/FDTD/operator.cpp @@ -731,18 +731,18 @@ bool Operator::CalcEFieldExcitation() vector vDelay; vector vDir; unsigned int ipos; - int pos[3]; + unsigned int pos[3]; double coord[3]; double delta[3]; double amp=0; - for (pos[2]=0;pos[2]<(int)numLines[2];++pos[2]) + for (pos[2]=0;pos[2]GetIndexDelta(2,pos[2])); - for (pos[1]=0;pos[1]<(int)numLines[1];++pos[1]) + for (pos[1]=0;pos[1]GetIndexDelta(1,pos[1])); - for (pos[0]=0;pos[0]<(int)numLines[0];++pos[0]) + for (pos[0]=0;pos[0]GetIndexDelta(0,pos[0])); coord[0] = discLines[0][pos[0]]; @@ -759,7 +759,7 @@ bool Operator::CalcEFieldExcitation() CSPropElectrode* elec = prop->ToElectrode(); if (elec!=NULL) { - if ((elec->GetActiveDir(n)) && (pos[n]<(int)numLines[n]-1)) + if ((elec->GetActiveDir(n)) && (pos[n]GetWeightedExcitation(n,coord)*delta[n]*gridDelta; if (amp!=0) @@ -824,7 +824,7 @@ bool Operator::CalcEFieldExcitation() // cerr << n << " " << coord[0] << " " << coord[1] << " " << coord[2] << endl; if (elec!=NULL) { - if ((elec->GetActiveDir(n)) && (pos[n]<(int)numLines[n]-1)) + if ((elec->GetActiveDir(n)) && (pos[n]GetWeightedExcitation(n,coord)*deltaN*gridDelta; if (amp!=0) diff --git a/FDTD/processfields.cpp b/FDTD/processfields.cpp index 4c46261..ff70810 100644 --- a/FDTD/processfields.cpp +++ b/FDTD/processfields.cpp @@ -185,12 +185,13 @@ bool ProcessFields::DumpVectorArray2VTK(ofstream &file, string name, FDTD_FLOAT* { WriteVTKHeader(file, discLines, numLines); WriteVTKVectorArray(file, name, array, numLines); + return true; } bool ProcessFields::DumpMultiVectorArray2VTK(ofstream &file, string names[], FDTD_FLOAT**** array[], unsigned int numFields, double** discLines, unsigned int* numLines) { WriteVTKHeader(file, discLines, numLines); - for (int n=0;nQueryIntAttribute("NumberOfTimesteps",&NrTS); + int help=0; + FDTD_Opts->QueryIntAttribute("NumberOfTimesteps",&help); + if (help<0) + NrTS=0; + else + NrTS = help; FDTD_Opts->QueryDoubleAttribute("endCriteria",&endCrit); if (endCrit==0) endCrit=1e-6; @@ -325,14 +330,14 @@ void openEMS::RunFDTD() double t_diff; //*************** simulate ************// int step=PA->Process(); - if ((step<0) || (step>NrTS)) step=NrTS; + if ((step<0) || (step>(int)NrTS)) step=NrTS; while ((FDTD_Eng->GetNumberOfTimesteps()endCrit)) { FDTD_Eng->IterateTS(step); step=PA->Process(); // cout << " do " << step << " steps; current: " << eng.GetNumberOfTimesteps() << endl; currTS = FDTD_Eng->GetNumberOfTimesteps(); - if ((step<0) || (step>NrTS - currTS)) step=NrTS - currTS; + if ((step<0) || (step>(int)(NrTS - currTS))) step=NrTS - currTS; gettimeofday(&currTime,NULL); diff --git a/openems.h b/openems.h index 73bc943..ca3378b 100644 --- a/openems.h +++ b/openems.h @@ -44,7 +44,7 @@ public: protected: //! Number of Timesteps - int NrTS; + unsigned int NrTS; bool Enable_Dumps; bool DebugMat; bool DebugOp;