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

MSVC: fix for windows compiler 

Signed-off-by: Thorsten Liebig <liebig@imst.de>
py_gui
Thorsten Liebig 2022-12-29 13:08:44 +01:00
parent 9737661b94
commit e52babccbf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FDTD/excitation.cpp
View File

@ -228,7 +228,7 @@ void Excitation::CalcCustomExcitation(double f0, int nTS, string signal)
delete[] Signal_curr; delete[] Signal_curr;
Signal_volt = new FDTD_FLOAT[Length]; Signal_volt = new FDTD_FLOAT[Length];
Signal_curr = new FDTD_FLOAT[Length]; Signal_curr = new FDTD_FLOAT[Length];
std::setlocale(LC_NUMERIC, "en_US.UTF-8"); setlocale(LC_NUMERIC, "en_US.UTF-8");
FunctionParser fParse; FunctionParser fParse;
fParse.AddConstant("pi", 3.14159265358979323846); fParse.AddConstant("pi", 3.14159265358979323846);
fParse.AddConstant("e", 2.71828182845904523536); fParse.AddConstant("e", 2.71828182845904523536);

2
FDTD/extensions/operator_ext_upml.cpp
View File

@ -25,7 +25,7 @@ using namespace std;
Operator_Ext_UPML::Operator_Ext_UPML(Operator* op) : Operator_Extension(op) Operator_Ext_UPML::Operator_Ext_UPML(Operator* op) : Operator_Extension(op)
{ {
std::setlocale(LC_NUMERIC, "en_US.UTF-8"); setlocale(LC_NUMERIC, "en_US.UTF-8");
m_GradingFunction = new FunctionParser(); m_GradingFunction = new FunctionParser();
//default grading function //default grading function
SetGradingFunction(" -log(1e-6)*log(2.5)/(2*dl*Z*(pow(2.5,W/dl)-1)) * pow(2.5, D/dl) "); SetGradingFunction(" -log(1e-6)*log(2.5)/(2*dl*Z*(pow(2.5,W/dl)-1)) * pow(2.5, D/dl) ");

2
nf2ff/nf2ff.cpp
View File

@ -38,7 +38,7 @@ using namespace std;
nf2ff::nf2ff(vector<float> freq, vector<float> theta, vector<float> phi, vector<float> center, unsigned int numThreads) nf2ff::nf2ff(vector<float> freq, vector<float> theta, vector<float> phi, vector<float> center, unsigned int numThreads)
{ {
std::setlocale(LC_NUMERIC, "en_US.UTF-8"); setlocale(LC_NUMERIC, "en_US.UTF-8");
m_freq = freq; m_freq = freq;
m_numTheta = theta.size(); m_numTheta = theta.size();

4
openems.cpp
View File

@ -64,7 +64,7 @@ double CalcDiffTime(timeval t1, timeval t2)
openEMS::openEMS() openEMS::openEMS()
{ {
std::setlocale(LC_NUMERIC, "en_US.UTF-8"); setlocale(LC_NUMERIC, "en_US.UTF-8");
FDTD_Op=NULL; FDTD_Op=NULL;
FDTD_Eng=NULL; FDTD_Eng=NULL;
Eng_Ext_SSD=NULL; Eng_Ext_SSD=NULL;
@ -394,7 +394,7 @@ bool openEMS::SetupProcessing()
if (pb->GetProbeType()==0) if (pb->GetProbeType()==0)
{ {
CSPrimBox* box = prim->ToBox(); CSPrimBox* box = prim->ToBox();
if (!(box) or box->GetDimension()!=1) if (!(box) || box->GetDimension()!=1)
{ {
cerr << "openEMS::SetupProcessing: Error: Probe primitive type or dimension not suitable ... skipping probe " << pb->GetName() << endl; cerr << "openEMS::SetupProcessing: Error: Probe primitive type or dimension not suitable ... skipping probe " << pb->GetName() << endl;
continue; continue;