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

+ cout << "NOTE: netgen output log REMOVED " << _outputFileName << endl;

Browse Source
This commit is contained in:
eap 2013-07-03 16:20:36 +00:00
parent 1860b7824a
commit 31d67dddec
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -2134,10 +2134,9 @@ bool NETGENPlugin_Mesher::Compute()
#else #else
err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr); err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
#endif #endif
#ifdef WITH_SMESH_CANCEL_COMPUTE
if(netgen::multithread.terminate) if(netgen::multithread.terminate)
return false; return false;
#endif
comment << text(err); comment << text(err);
} }
catch (Standard_Failure& ex) catch (Standard_Failure& ex)
@ -2223,10 +2222,9 @@ bool NETGENPlugin_Mesher::Compute()
#else #else
netgen::OCCGenerateMesh(intOccgeo, tmpNgMesh, startWith, endWith, optstr); netgen::OCCGenerateMesh(intOccgeo, tmpNgMesh, startWith, endWith, optstr);
#endif #endif
#ifdef WITH_SMESH_CANCEL_COMPUTE
if(netgen::multithread.terminate) if(netgen::multithread.terminate)
return false; return false;
#endif
// copy LocalH from the main to temporary mesh // copy LocalH from the main to temporary mesh
initState.transferLocalH( ngMesh, tmpNgMesh ); initState.transferLocalH( ngMesh, tmpNgMesh );
@ -2274,10 +2272,9 @@ bool NETGENPlugin_Mesher::Compute()
#else #else
err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr); err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
#endif #endif
#ifdef WITH_SMESH_CANCEL_COMPUTE
if(netgen::multithread.terminate) if(netgen::multithread.terminate)
return false; return false;
#endif
comment << text(err); comment << text(err);
} }
catch (Standard_Failure& ex) catch (Standard_Failure& ex)
@ -2382,10 +2379,9 @@ bool NETGENPlugin_Mesher::Compute()
#else #else
err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr); err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
#endif #endif
#ifdef WITH_SMESH_CANCEL_COMPUTE
if(netgen::multithread.terminate) if(netgen::multithread.terminate)
return false; return false;
#endif
comment << text (err); comment << text (err);
} }
catch (Standard_Failure& ex) catch (Standard_Failure& ex)
@ -2480,10 +2476,9 @@ bool NETGENPlugin_Mesher::Compute()
#else #else
err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr); err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
#endif #endif
#ifdef WITH_SMESH_CANCEL_COMPUTE
if(netgen::multithread.terminate) if(netgen::multithread.terminate)
return false; return false;
#endif
if ( comment.empty() ) // do not overwrite a previos error if ( comment.empty() ) // do not overwrite a previos error
comment << text(err); comment << text(err);
} }
@ -2511,10 +2506,9 @@ bool NETGENPlugin_Mesher::Compute()
#else #else
err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr); err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
#endif #endif
#ifdef WITH_SMESH_CANCEL_COMPUTE
if(netgen::multithread.terminate) if(netgen::multithread.terminate)
return false; return false;
#endif
if ( comment.empty() ) // do not overwrite a previos error if ( comment.empty() ) // do not overwrite a previos error
comment << text(err); comment << text(err);
} }
@ -2693,10 +2687,10 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap)
#else #else
int err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr); int err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
#endif #endif
#ifdef WITH_SMESH_CANCEL_COMPUTE
if(netgen::multithread.terminate) if(netgen::multithread.terminate)
return false; return false;
#endif
ngLib.setMesh(( Ng_Mesh*) ngMesh ); ngLib.setMesh(( Ng_Mesh*) ngMesh );
if (err) { if (err) {
if ( SMESH_subMesh* sm = _mesh->GetSubMeshContaining( _shape )) if ( SMESH_subMesh* sm = _mesh->GetSubMeshContaining( _shape ))
@ -3469,7 +3463,7 @@ NETGENPlugin_NetgenLibWrapper::NETGENPlugin_NetgenLibWrapper()
_isComputeOk = false; _isComputeOk = false;
_outputFileName = getOutputFileName(); _outputFileName = getOutputFileName();
netgen::mycout = new ofstream ( _outputFileName.c_str() ); netgen::mycout = new ofstream ( _outputFileName.c_str() );
cout << "NOTE: netgen output was redirected to file " << _outputFileName << endl; cout << "NOTE: netgen output redirected to file " << _outputFileName << endl;
_ngMesh = Ng_NewMesh(); _ngMesh = Ng_NewMesh();
} }
@ -3542,4 +3536,5 @@ void NETGENPlugin_NetgenLibWrapper::removeOutputFile()
} }
SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true ); SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true );
cout << "NOTE: netgen output log REMOVED " << _outputFileName << endl;
} }