Merge remote branch 'seb/master'

pull/1/head
Thorsten Liebig 2010-08-23 18:46:56 +02:00
commit a075955db3
3 changed files with 13 additions and 2 deletions

View File

@ -54,6 +54,7 @@ int main(int argc, char *argv[])
cout << "\t\t--engine=sse_compressed\t\tengine using compressed operator + sse vector extensions" << endl;
cout << "\t\t--engine=multithreaded\t\tengine using compressed operator + sse vector extensions + multithreading" << endl;
cout << "\t--numThreads=<n>\tForce use n threads for multithreaded engine (needs: --engine=multithreaded)" << endl;
cout << "\t--no-simulation\tonly run preprocessing; do not simulate" << endl;
cout << endl;
exit(-1);
}

View File

@ -55,7 +55,7 @@ openEMS::openEMS()
DebugMat = false;
DebugOp = false;
m_debugCSX = false;
m_debugBox = m_debugPEC = false;
m_debugBox = m_debugPEC = m_no_simulation = false;
endCrit = 1e-6;
m_OverSampling = 4;
@ -150,6 +150,12 @@ bool openEMS::parseCommandLineArgument( const char *argv )
m_engine = EngineType_Multithreaded;
return true;
}
else if (strcmp(argv,"--no-simulation")==0)
{
cout << "openEMS - disabling simulation => preprocessing only" << endl;
m_no_simulation = true;
return true;
}
return false;
}
@ -254,6 +260,10 @@ int openEMS::SetupFDTD(const char* file)
else
NrTS = help;
// if the command line switch --no-simulation is used, fix NrTS
if (m_no_simulation)
NrTS = 0;
help = 0;
FDTD_Opts->QueryIntAttribute("CylinderCoords",&help);
if (help==1)

View File

@ -53,7 +53,7 @@ protected:
bool DebugMat;
bool DebugOp;
bool m_debugCSX;
bool m_debugBox, m_debugPEC;
bool m_debugBox, m_debugPEC, m_no_simulation;
double endCrit;
int m_OverSampling;
Operator* FDTD_Op;