Example Updates/ gaussian-excite f0/fc update

pull/1/head
Thorsten Liebig 2010-03-11 15:35:12 +01:00
parent 98e4790c0e
commit dba10746e7
8 changed files with 304 additions and 18 deletions

100
examples/Coax_Cart.xml Normal file
View File

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes" ?>
<openEMS-Parameter NumberOfTimesteps="1000">
<Excitation Type="0" f0="1000000000" fc="1000000000" />
<BoundaryCond xmin="0" xmax="0" ymin="0" ymax="0" zmin="0" zmax="0" />
</openEMS-Parameter>
<ContinuousStructure>
<RectilinearGrid DeltaUnit="0.001000">
<XLines Qty="93">-230,-225,-220,-215,-210,-205,-200,-195,-190,-185,-180,-175,-170,-165,-160,-155,-150,-145,-140,-135,-130,-125,-120,-115,-110,-105,-100,-95,-90,-85,-80,-75,-70,-65,-60,-55,-50,-45,-40,-35,-30,-25,-20,-15,-10,-5,0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230</XLines>
<YLines Qty="93">-230,-225,-220,-215,-210,-205,-200,-195,-190,-185,-180,-175,-170,-165,-160,-155,-150,-145,-140,-135,-130,-125,-120,-115,-110,-105,-100,-95,-90,-85,-80,-75,-70,-65,-60,-55,-50,-45,-40,-35,-30,-25,-20,-15,-10,-5,0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230</YLines>
<ZLines Qty="201">-500,-490,-480,-470,-460,-450,-440,-430,-420,-410,-400,-390,-380,-370,-360,-350,-340,-330,-320,-310,-300,-290,-280,-270,-260,-250,-240,-230,-220,-210,-200,-190,-180,-170,-160,-150,-140,-130,-120,-110,-100,-90,-80,-70,-60,-50,-40,-30,-20,-10,0,10,20,30,40,50,60,70,80,90,100,110,120,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450,460,470,480,490,500,510,520,530,540,550,560,570,580,590,600,610,620,630,640,650,660,670,680,690,700,710,720,730,740,750,760,770,780,790,800,810,820,830,840,850,860,870,880,890,900,910,920,930,940,950,960,970,980,990,1000,1010,1020,1030,1040,1050,1060,1070,1080,1090,1100,1110,1120,1130,1140,1150,1160,1170,1180,1190,1200,1210,1220,1230,1240,1250,1260,1270,1280,1290,1300,1310,1320,1330,1340,1350,1360,1370,1380,1390,1400,1410,1420,1430,1440,1450,1460,1470,1480,1490,1500</ZLines>
</RectilinearGrid>
<ParameterSet />
<Properties>
<Material ID="0" Name="" Isotropy="1">
<FillColor R="90" G="37" B="93" a="255" />
<EdgeColor R="90" G="37" B="93" a="255" />
<Property Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="1.875000e-10" Sigma="2.661107e-05" />
<PropertyY Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="0.000000e+00" Sigma="0.000000e+00" />
<PropertyZ Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="0.000000e+00" Sigma="0.000000e+00" />
<WeightX Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="term:pow(abs(z)-1300,4)" Sigma="term:pow(abs(z)-1300,4)" />
<WeightY Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="term:pow(abs(z)-1300,4)" Sigma="term:pow(abs(z)-1300,4)" />
<WeightZ Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="term:pow(abs(z)-1300,4)" Sigma="term:pow(abs(z)-1300,4)" />
</Material>
<Electrode ID="1" Name="" Number="0" Delay="0.000000e+00">
<FillColor R="5" G="23" B="88" a="255" />
<EdgeColor R="5" G="23" B="88" a="255" />
<Excitation Type="0" Excit_X="1.000000e+00" Excit_Y="1.000000e+00" Excit_Z="0.000000e+00" />
<Weight X="term:x/pow(rho,2)" Y="term:y/pow(rho,2)" Z="1.000000e+00" />
</Electrode>
<DumpBox ID="2" Name="tmp/Et_" GlobalSetting="1" DumpType="0" DumpMode="2">
<FillColor R="233" G="94" B="212" a="255" />
<EdgeColor R="233" G="94" B="212" a="255" />
<ScalarDump DumpPhi="1" DumpDivE="0" DumpDivD="0" DumpDivP="0" DumpFieldW="0" DumpChargeW="0" />
<VectorDump DumpEField="0" DumpDField="0" DumpPField="0" />
<SubGridDump SubGridDump="0" SimpleDump="0" SubGridLevel="-1" />
</DumpBox>
<ProbeBox ID="3" Name="tmp/u1" Number="0" Type="0">
<FillColor R="171" G="178" B="205" a="255" />
<EdgeColor R="171" G="178" B="205" a="255" />
</ProbeBox>
<ProbeBox ID="4" Name="tmp/i1" Number="0" Type="1">
<FillColor R="198" G="155" B="180" a="255" />
<EdgeColor R="198" G="155" B="180" a="255" />
</ProbeBox>
<Material ID="5" Name="" Isotropy="1">
<FillColor R="84" G="17" B="14" a="255" />
<EdgeColor R="84" G="17" B="14" a="255" />
<Property Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="5.600000e+10" Sigma="0.000000e+00" />
<PropertyY Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="0.000000e+00" Sigma="0.000000e+00" />
<PropertyZ Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="0.000000e+00" Sigma="0.000000e+00" />
<WeightX Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="1.000000e+00" Sigma="1.000000e+00" />
<WeightY Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="1.000000e+00" Sigma="1.000000e+00" />
<WeightZ Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="1.000000e+00" Sigma="1.000000e+00" />
</Material>
<Material ID="6" Name="" Isotropy="1">
<FillColor R="130" G="116" B="65" a="255" />
<EdgeColor R="130" G="116" B="65" a="255" />
<Property Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="0.000000e+00" Sigma="0.000000e+00" />
<PropertyY Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="0.000000e+00" Sigma="0.000000e+00" />
<PropertyZ Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="0.000000e+00" Sigma="0.000000e+00" />
<WeightX Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="1.000000e+00" Sigma="1.000000e+00" />
<WeightY Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="1.000000e+00" Sigma="1.000000e+00" />
<WeightZ Epsilon="1.000000e+00" Mue="1.000000e+00" Kappa="1.000000e+00" Sigma="1.000000e+00" />
</Material>
</Properties>
<Primitives>
<Box ID="0" PropertyID="0" Priority="10">
<P1 X="-2.300000e+02" Y="-2.300000e+02" Z="1.300000e+03" />
<P2 X="2.300000e+02" Y="2.300000e+02" Z="1.500000e+03" />
</Box>
<Box ID="1" PropertyID="1" Priority="5">
<P1 X="-2.300000e+02" Y="-2.300000e+02" Z="-5.000000e+02" />
<P2 X="2.300000e+02" Y="2.300000e+02" Z="-5.000000e+02" />
</Box>
<Box ID="2" PropertyID="2" Priority="0">
<P1 X="-2.300000e+02" Y="0.000000e+00" Z="-5.000000e+02" />
<P2 X="2.300000e+02" Y="0.000000e+00" Z="1.500000e+03" />
</Box>
<Box ID="3" PropertyID="3" Priority="0">
<P1 X="1.000000e+02" Y="0.000000e+00" Z="0.000000e+00" />
<P2 X="2.300000e+02" Y="0.000000e+00" Z="0.000000e+00" />
</Box>
<Box ID="4" PropertyID="4" Priority="0">
<P1 X="-1.500000e+02" Y="-1.500000e+02" Z="0.000000e+00" />
<P2 X="1.500000e+02" Y="1.500000e+02" Z="0.000000e+00" />
</Box>
<Cylinder ID="5" PropertyID="5" Priority="100" Radius="1.000000e+02">
<P0 X="0.000000e+00" Y="0.000000e+00" Z="-5.000000e+02" />
<P1 X="0.000000e+00" Y="0.000000e+00" Z="1.500000e+03" />
</Cylinder>
<Box ID="6" PropertyID="5" Priority="1">
<P1 X="-2.300000e+02" Y="-2.300000e+02" Z="-5.000000e+02" />
<P2 X="2.300000e+02" Y="2.300000e+02" Z="1.500000e+03" />
</Box>
<Cylinder ID="7" PropertyID="6" Priority="9" Radius="2.300000e+02">
<P0 X="0.000000e+00" Y="0.000000e+00" Z="-5.000000e+02" />
<P1 X="0.000000e+00" Y="0.000000e+00" Z="1.500000e+03" />
</Cylinder>
</Primitives>
</ContinuousStructure>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes" ?>
<openEMS-Parameter NumberOfTimesteps="1000">
<Excitation Type="0" f0="1000000000" />
<Excitation Type="0" f0="500000000" fc="500000000" />
<BoundaryCond xmin="1" xmax="1" ymin="0" ymax="0" zmin="0" zmax="0" />
</openEMS-Parameter>
<ContinuousStructure>
@ -25,7 +25,7 @@
<FillColor R="115" G="81" B="255" a="255" />
<EdgeColor R="115" G="81" B="255" a="255" />
<Excitation Type="1" Excit_X="0.000000e+00" Excit_Y="1.000000e+00" Excit_Z="0.000000e+00" />
<Weight Function_X="1.000000e+00" Function_Y="1.000000e+00" Function_Z="1.000000e+00" />
<Weight X="1.000000e+00" Y="1.000000e+00" Z="1.000000e+00" />
</Electrode>
</Properties>
<Primitives>

View File

@ -4,7 +4,8 @@
void BuildDipol(const char* filename)
{
int maxIter = 1000;
double fmax=1e9;
double f0=0.5e9;
double fc=0.5e9;
int Excit_Type=0;
int bounds[] = {1,1,0,0,0,0};
@ -55,7 +56,8 @@ void BuildDipol(const char* filename)
TiXmlElement Excite("Excitation");
Excite.SetAttribute("Type",Excit_Type);
Excite.SetAttribute("f0",fmax);
Excite.SetAttribute("f0",f0);
Excite.SetAttribute("fc",fc);
FDTD_Opts.InsertEndChild(Excite);
TiXmlElement BC("BoundaryCond");
@ -81,7 +83,8 @@ void BuildDipol(const char* filename)
void BuildPlaneWave(const char* filename)
{
int maxIter = 1000;
double fmax=1e9;
double f0=0.5e9;
double fc=0.5e9;
int Excit_Type=0;
int bounds[] = {1,1,0,0,0,0};
@ -194,7 +197,8 @@ void BuildPlaneWave(const char* filename)
TiXmlElement Excite("Excitation");
Excite.SetAttribute("Type",Excit_Type);
Excite.SetAttribute("f0",fmax);
Excite.SetAttribute("f0",f0);
Excite.SetAttribute("fc",fc);
FDTD_Opts.InsertEndChild(Excite);
TiXmlElement BC("BoundaryCond");
@ -220,7 +224,8 @@ void BuildPlaneWave(const char* filename)
void BuildMSL(const char* filename)
{
int maxIter = 1000;
double fmax=1e9;
double f0=0.5e9;
double fc=0.5e9;
int Excit_Type=0;
int bounds[] = {1,1,0,0,0,0};
@ -365,7 +370,8 @@ void BuildMSL(const char* filename)
TiXmlElement Excite("Excitation");
Excite.SetAttribute("Type",Excit_Type);
Excite.SetAttribute("f0",fmax);
Excite.SetAttribute("f0",f0);
Excite.SetAttribute("fc",fc);
FDTD_Opts.InsertEndChild(Excite);
TiXmlElement BC("BoundaryCond");
@ -388,4 +394,173 @@ void BuildMSL(const char* filename)
doc.SaveFile();
}
void BuildCoaxial_Cartesian(const char* filename)
{
int maxIter = 1000;
double f0=1e9;
double fc=1e9;
int Excit_Type=0;
int bounds[] = {0,0,0,0,0,0};
cerr << "Create Geometry..." << endl;
ContinuousStructure CSX;
double rad[] = {100, 230};
double length[] = {-500,1500};
double abs_l = 200;
double delta[] = {5,5,10};
CSPrimBox* box = NULL;
//fake pml....
CSPropMaterial* mat = new CSPropMaterial(CSX.GetParameterSet());
// mat->SetEpsilon(3.6);
double finalKappa = 0.3/pow(abs_l,4);
mat->SetKappa(finalKappa);
std::ostringstream fct;
fct << "pow(abs(z)-" << length[1]-abs_l << ",4)";
mat->SetKappaWeightFunction(fct.str(),0);
mat->SetKappaWeightFunction(fct.str(),1);
mat->SetKappaWeightFunction(fct.str(),2);
mat->SetSigma(finalKappa*__MUE0__/__EPS0__);
mat->SetSigmaWeightFunction(fct.str(),0);
mat->SetSigmaWeightFunction(fct.str(),1);
mat->SetSigmaWeightFunction(fct.str(),2);
CSX.AddProperty(mat);
box = new CSPrimBox(CSX.GetParameterSet(),mat);
box->SetCoord(0,-1.0*rad[1]);box->SetCoord(1,1.0*rad[1]);
box->SetCoord(2,-1.0*rad[1]);box->SetCoord(3,1.0*rad[1]);
box->SetCoord(4,length[1]-abs_l); box->SetCoord(5,length[1]);
box->SetPriority(10);
CSX.AddPrimitive(box);
CSPropElectrode* elec = new CSPropElectrode(CSX.GetParameterSet());
elec->SetExcitation(1.0,0);
elec->SetExcitation(1.0,1);
elec->SetWeightFunction("x/pow(rho,2)",0);
elec->SetWeightFunction("y/pow(rho,2)",1);
elec->SetExcitType(0);
// elec->SetActiveDir(0,0);//disable x
// elec->SetActiveDir(0,2);//disable z
// elec->SetDelay(2.0e-9);
CSX.AddProperty(elec);
// double coords[] = {-100,-100,0};
// cerr << elec->GetWeightedExcitation(0,coords) << endl;
// cerr << elec->GetWeightedExcitation(1,coords) << endl;
// exit(0);
box = new CSPrimBox(CSX.GetParameterSet(),elec);
box->SetCoord(0,-1.0*rad[1]);box->SetCoord(1,1.0*rad[1]);
box->SetCoord(2,-1.0*rad[1]);box->SetCoord(3,1.0*rad[1]);
box->SetCoord(4,length[0]);box->SetCoord(5,length[0]);
box->SetPriority(5);
CSX.AddPrimitive(box);
//E-field dump
CSPropDumpBox* Edump = new CSPropDumpBox(CSX.GetParameterSet());
Edump->SetDumpType(0);
Edump->SetDumpMode(2);
Edump->SetName("tmp/Et_");
CSX.AddProperty(Edump);
box = new CSPrimBox(CSX.GetParameterSet(),Edump);
box->SetCoord(0,-1*rad[1]);box->SetCoord(1,rad[1]);
box->SetCoord(2,-0*rad[1]);box->SetCoord(3,0*rad[1]);
box->SetCoord(4,length[0]);box->SetCoord(5,length[1]);
CSX.AddPrimitive(box);
//voltage calc
CSPropProbeBox* volt = new CSPropProbeBox(CSX.GetParameterSet());
volt->SetProbeType(0);
volt->SetName("tmp/u1");
CSX.AddProperty(volt);
box = new CSPrimBox(CSX.GetParameterSet(),volt);
box->SetCoord(0,rad[0]);box->SetCoord(1,rad[1]);
box->SetCoord(2,0.0);box->SetCoord(3,0.0);
box->SetCoord(4,0.0);box->SetCoord(5,0.0);
CSX.AddPrimitive(box);
//current calc
CSPropProbeBox* curr = new CSPropProbeBox(CSX.GetParameterSet());
curr->SetProbeType(1);
curr->SetName("tmp/i1");
CSX.AddProperty(curr);
box = new CSPrimBox(CSX.GetParameterSet(),curr);
box->SetCoord(0,-1.5*rad[0]);box->SetCoord(1,1.5*rad[0]);
box->SetCoord(2,-1.5*rad[0]);box->SetCoord(3,1.5*rad[0]);
box->SetCoord(4,0.0);box->SetCoord(5,0.0);
CSX.AddPrimitive(box);
CSPropMaterial* metal = new CSPropMaterial(CSX.GetParameterSet());
metal->SetKappa(56e9);
// CSPropMetal* metal = new CSPropMetal(CSX.GetParameterSet());
CSX.AddProperty(metal);
CSPrimCylinder* cyl = new CSPrimCylinder(CSX.GetParameterSet(),metal);
cyl->SetRadius(rad[0]);
cyl->SetCoord(0,0.0);cyl->SetCoord(1,0.0);
cyl->SetCoord(2,0.0);cyl->SetCoord(3,0.0);
cyl->SetCoord(4,length[0]);cyl->SetCoord(5,length[1]);
cyl->SetPriority(100);
CSX.AddPrimitive(cyl);
box = new CSPrimBox(CSX.GetParameterSet(),metal);
box->SetCoord(0,-1.0*rad[1]);box->SetCoord(1,1.0*rad[1]);
box->SetCoord(2,-1.0*rad[1]);box->SetCoord(3,1.0*rad[1]);
box->SetCoord(4,length[0]);box->SetCoord(5,length[1]);
box->SetPriority(1);
CSX.AddPrimitive(box);
CSPropMaterial* air = new CSPropMaterial(CSX.GetParameterSet());
CSX.AddProperty(air);
cyl = new CSPrimCylinder(CSX.GetParameterSet(),air);
cyl->SetRadius(rad[1]);
cyl->SetCoord(0,0.0);cyl->SetCoord(1,0.0);
cyl->SetCoord(2,0.0);cyl->SetCoord(3,0.0);
cyl->SetCoord(4,length[0]);cyl->SetCoord(5,length[1]);
cyl->SetPriority(9);
CSX.AddPrimitive(cyl);
CSRectGrid* grid = CSX.GetGrid();
for (int n=-1.0*rad[1];n<=rad[1];n+=delta[0])
grid->AddDiscLine(0,(double)n);
for (int n=-1.0*rad[1];n<=rad[1];n+=delta[1])
grid->AddDiscLine(1,(double)n);
for (int n=length[0];n<=length[1];n+=delta[2])
grid->AddDiscLine(2,(double)n);
grid->SetDeltaUnit(1e-3);
//*************** Create XML file **********************
TiXmlDocument doc(filename);
doc.InsertEndChild(TiXmlDeclaration("1.0","ISO-8859-1","yes"));
TiXmlElement FDTD_Opts("openEMS-Parameter");
FDTD_Opts.SetAttribute("NumberOfTimesteps",maxIter);
TiXmlElement Excite("Excitation");
Excite.SetAttribute("Type",Excit_Type);
Excite.SetAttribute("f0",f0);
Excite.SetAttribute("fc",fc);
FDTD_Opts.InsertEndChild(Excite);
TiXmlElement BC("BoundaryCond");
BC.SetAttribute("xmin",bounds[0]);
BC.SetAttribute("xmax",bounds[1]);
BC.SetAttribute("ymin",bounds[2]);
BC.SetAttribute("ymax",bounds[3]);
BC.SetAttribute("zmin",bounds[4]);
BC.SetAttribute("zmax",bounds[5]);
FDTD_Opts.InsertEndChild(BC);
doc.InsertEndChild(FDTD_Opts);
if (CSX.Write2XML(&doc,true)==false)
{
cerr << "writing failed" << endl;
exit(-1);
}
doc.SaveFile();
}

View File

@ -10,4 +10,7 @@ void BuildPlaneWave(const char* filename);
void BuildMSL(const char* filename);
void BuildCoaxial_Cartesian(const char* filename);
#endif // FDTD_EXAMPLES_H

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes" ?>
<openEMS-Parameter NumberOfTimesteps="1000">
<Excitation Type="0" f0="1000000000" />
<Excitation Type="0" f0="500000000" fc="500000000" />
<BoundaryCond xmin="1" xmax="1" ymin="0" ymax="0" zmin="0" zmax="0" />
</openEMS-Parameter>
<ContinuousStructure>
@ -35,7 +35,7 @@
<FillColor R="99" G="51" B="159" a="255" />
<EdgeColor R="99" G="51" B="159" a="255" />
<Excitation Type="0" Excit_X="0.000000e+00" Excit_Y="-1.000000e+00" Excit_Z="0.000000e+00" />
<Weight Function_X="1.000000e+00" Function_Y="1.000000e+00" Function_Z="1.000000e+00" />
<Weight X="1.000000e+00" Y="1.000000e+00" Z="1.000000e+00" />
</Electrode>
<DumpBox ID="3" Name="tmp/Et_" GlobalSetting="1" DumpType="0" DumpMode="2">
<FillColor R="201" G="154" B="102" a="255" />

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes" ?>
<openEMS-Parameter NumberOfTimesteps="1000">
<Excitation Type="0" f0="1000000000" />
<Excitation Type="0" f0="500000000" fc="500000000" />
<BoundaryCond xmin="1" xmax="1" ymin="0" ymax="0" zmin="0" zmax="0" />
</openEMS-Parameter>
<ContinuousStructure>
@ -35,7 +35,7 @@
<FillColor R="242" G="251" B="227" a="255" />
<EdgeColor R="242" G="251" B="227" a="255" />
<Excitation Type="0" Excit_X="0.000000e+00" Excit_Y="1.000000e+00" Excit_Z="0.000000e+00" />
<Weight Function_X="1.000000e+00" Function_Y="1.000000e+00" Function_Z="1.000000e+00" />
<Weight X="1.000000e+00" Y="1.000000e+00" Z="1.000000e+00" />
</Electrode>
<DumpBox ID="3" Name="tmp/Et_" GlobalSetting="1" DumpType="0" DumpMode="0">
<FillColor R="70" G="124" B="194" a="255" />

View File

@ -32,7 +32,10 @@ int main(int argc, char *argv[])
const char* fileMSL="examples/MSL.xml";
BuildMSL(fileMSL);
const char* file=fileMSL;
const char* fileCoax="examples/Coax_Cart.xml";
BuildCoaxial_Cartesian(fileCoax);
const char* file=fileCoax;
// cerr << CSX.ReadFromXML("examples/PlaneWave.xml") << endl;
#endif

View File

@ -42,7 +42,8 @@ int openEMS::SetupFDTD(const char* file)
{
if (file==NULL) return -1;
Reset();
double fmax=0;
double f0=0;
double fc=0;
int Excit_Type=0;
bool EnableDump = true;
int bounds[6];
@ -72,7 +73,11 @@ int openEMS::SetupFDTD(const char* file)
exit(-2);
}
Excite->QueryIntAttribute("Type",&Excit_Type);
Excite->QueryDoubleAttribute("f0",&fmax);
if (Excit_Type==0)
{
Excite->QueryDoubleAttribute("f0",&f0);
Excite->QueryDoubleAttribute("fc",&fc);
}
TiXmlElement* BC = FDTD_Opts->FirstChildElement("BoundaryCond");
if (BC==NULL)
@ -108,7 +113,7 @@ int openEMS::SetupFDTD(const char* file)
FDTD_Op->CalcECOperator();
if (Excit_Type==0)
FDTD_Op->CalcGaussianPulsExcitation(fmax/2,fmax/2);
FDTD_Op->CalcGaussianPulsExcitation(f0,fc);
else
{
cerr << "openEMS: Excitation type is unknown" << endl;
@ -121,8 +126,8 @@ int openEMS::SetupFDTD(const char* file)
FDTD_Op->ApplyMagneticBC(PMC);
cerr << "Nyquist number of timesteps: " << FDTD_Op->GetNyquistNum(fmax) << endl;
unsigned int Nyquist = FDTD_Op->GetNyquistNum(fmax);
cerr << "Nyquist number of timesteps: " << FDTD_Op->GetNyquistNum(f0+fc) << endl;
unsigned int Nyquist = FDTD_Op->GetNyquistNum(f0+fc);
cerr << "Time for operator: " << difftime(OpDoneTime,startTime) << endl;