ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redirect netgen output depending on KEEP_NETGEN_OUTPUT envvar

Browse Source
This commit is contained in:
eap 2014-04-17 19:16:16 +04:00
parent 147970666c
commit 60f38435d4
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -3648,8 +3648,11 @@ NETGENPlugin_NetgenLibWrapper::NETGENPlugin_NetgenLibWrapper()
{ {
Ng_Init(); Ng_Init();
// redirect all netgen output (mycout,myerr,cout) to _outputFileName
_isComputeOk = false; _isComputeOk = false;
_coutBuffer = NULL;
if ( !getenv( "KEEP_NETGEN_OUTPUT" ))
{
// redirect all netgen output (mycout,myerr,cout) to _outputFileName
_outputFileName = getOutputFileName(); _outputFileName = getOutputFileName();
netgen::mycout = new ofstream ( _outputFileName.c_str() ); netgen::mycout = new ofstream ( _outputFileName.c_str() );
netgen::myerr = netgen::mycout; netgen::myerr = netgen::mycout;
@ -3659,6 +3662,7 @@ NETGENPlugin_NetgenLibWrapper::NETGENPlugin_NetgenLibWrapper()
#else #else
std::cout.rdbuf( netgen::mycout->rdbuf() ); std::cout.rdbuf( netgen::mycout->rdbuf() );
#endif #endif
}
_ngMesh = Ng_NewMesh(); _ngMesh = Ng_NewMesh();
} }
@ -3674,6 +3678,7 @@ NETGENPlugin_NetgenLibWrapper::~NETGENPlugin_NetgenLibWrapper()
Ng_DeleteMesh( _ngMesh ); Ng_DeleteMesh( _ngMesh );
Ng_Exit(); Ng_Exit();
NETGENPlugin_Mesher::RemoveTmpFiles(); NETGENPlugin_Mesher::RemoveTmpFiles();
if ( _coutBuffer )
std::cout.rdbuf( _coutBuffer ); std::cout.rdbuf( _coutBuffer );
#ifdef _DEBUG_ #ifdef _DEBUG_
if( _isComputeOk ) if( _isComputeOk )
@ -3726,20 +3731,20 @@ std::string NETGENPlugin_NetgenLibWrapper::getOutputFileName()
void NETGENPlugin_NetgenLibWrapper::removeOutputFile() void NETGENPlugin_NetgenLibWrapper::removeOutputFile()
{ {
string tmpDir = SALOMEDS_Tool::GetDirFromPath( _outputFileName ); if ( !_outputFileName.empty() )
SALOMEDS::ListOfFileNames_var aFiles = new SALOMEDS::ListOfFileNames; {
aFiles->length(1); if ( netgen::mycout )
std::string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out";
aFiles[0] = aFileName.c_str();
if ( netgen::mycout)
{ {
delete netgen::mycout; delete netgen::mycout;
netgen::mycout = 0; netgen::mycout = 0;
netgen::myerr = 0; netgen::myerr = 0;
} }
string tmpDir = SALOMEDS_Tool::GetDirFromPath ( _outputFileName );
string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out";
SALOMEDS::ListOfFileNames_var aFiles = new SALOMEDS::ListOfFileNames;
aFiles->length(1);
aFiles[0] = aFileName.c_str();
SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true ); SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true );
#ifdef _DEBUG_ }
//cout << "NOTE: netgen output log was REMOVED " << _outputFileName << endl;
#endif
} }