-// Copyright (C) 2007-2020 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <Basics_Utils.hxx>
#include <utilities.h>
+#include <boost/filesystem.hpp>
+namespace boofs = boost::filesystem;
+
+#include <fstream>
#include <algorithm>
#define castToNode(n) static_cast<const SMDS_MeshNode *>( n );
}
}
+// change results files permissions to user only (using boost to be used without C++17)
+static void chmodUserOnly(const char* filename)
+{
+ if (boofs::exists(filename))
+ boofs::permissions(filename, boofs::remove_perms | boofs::group_all | boofs::others_all );
+}
+
//=============================================================================
/*!
*
TopoDS_Shape HYBRIDPlugin_HYBRID::entryToShape(std::string entry)
{
- if ( SMESH_Gen_i::getStudyServant()->_is_nil() )
+ if ( SMESH_Gen_i::GetSMESHGen()->getStudyServant()->_is_nil() )
throw SALOME_Exception("MG-HYBRID plugin can't work w/o publishing in the study");
GEOM::GEOM_Object_var aGeomObj;
TopoDS_Shape S = TopoDS_Shape();
- SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() );
+ SALOMEDS::SObject_var aSObj = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindObjectID( entry.c_str() );
if (!aSObj->_is_nil() ) {
CORBA::Object_var obj = aSObj->GetObject();
aGeomObj = GEOM::GEOM_Object::_narrow(obj);
std::map<int, std::set<int> >::const_iterator subdomainIt = subdomainId2tetraId.begin();
std::string aSubdomainFileName = theFile;
aSubdomainFileName = aSubdomainFileName + ".subdomain";
- ofstream aSubdomainFile ( aSubdomainFileName , ios::out);
+ std::ofstream aSubdomainFile ( aSubdomainFileName , ios::out);
aSubdomainFile << "Nb subdomains " << subdomainId2tetraId.size() << std::endl;
for(;subdomainIt != subdomainId2tetraId.end() ; ++subdomainIt) {
}
MGInput->GmfCloseMesh(idx);
+ chmodUserOnly(theMeshFileName);
if (idxRequired)
- MGInput->GmfCloseMesh(idxRequired);
+ {
+ MGInput->GmfCloseMesh(idxRequired);
+ chmodUserOnly(theRequiredFileName);
+ }
if (idxSol)
- MGInput->GmfCloseMesh(idxSol);
-
+ {
+ MGInput->GmfCloseMesh(idxSol);
+ chmodUserOnly(theSolFileName);
+ }
return true;
}
// Write aSmdsToHybridIdMap to temp file
std::string aSmdsToHybridIdMapFileName;
aSmdsToHybridIdMapFileName = aGenericName + ".ids"; // ids relation
- ofstream aIdsFile ( aSmdsToHybridIdMapFileName , ios::out);
+ std::ofstream aIdsFile ( aSmdsToHybridIdMapFileName , ios::out);
Ok = aIdsFile.rdbuf()->is_open();
if (!Ok) {
INFOS( "Can't write into " << aSmdsToHybridIdMapFileName);
}
aIdsFile.close();
+ chmodUserOnly(aSmdsToHybridIdMapFileName.c_str());
if ( ! Ok ) {
if ( !_keepFiles ) {
if ( _logInStandardOutput && mgHybrid.IsLibrary() )
std::cout << std::endl << mgHybrid.GetLog() << std::endl;
+ else
+ chmodUserOnly(aLogFileName.c_str());
if ( Ok )
std::cout << "End of Hybrid execution !" << std::endl;
+ if ( mgHybrid.IsExecutable() )
+ {
+ chmodUserOnly(aResultFileName.c_str());
+ chmodUserOnly(aResSolFileName.c_str());
+ }
+
// --------------
// read a result
// --------------
if ( _logInStandardOutput && mgHybrid.IsLibrary() )
std::cout << std::endl << mgHybrid.GetLog() << std::endl;
+ else
+ chmodUserOnly(aLogFileName.c_str());
if ( Ok )
std::cout << "End of Hybrid execution !" << std::endl;
+ if (mgHybrid.IsExecutable())
+ {
+ chmodUserOnly(aResultFileName.c_str());
+ chmodUserOnly(aResSolFileName.c_str());
+ }
+
// --------------
// read a result
// --------------
if ( errDescription.empty() ) { // no errors found
char msgLic1[] = "connection to server failed";
char msgLic2[] = " Dlim ";
+ char msgLic3[] = "license is not valid";
if ( std::search( &buf[0], bufEnd, msgLic1, msgLic1 + strlen(msgLic1)) != bufEnd ||
std::search( &buf[0], bufEnd, msgLic2, msgLic2 + strlen(msgLic2)) != bufEnd )
- errDescription << "Licence problems.";
+ errDescription << "Network license problem.";
+ else if ( std::search( &buf[0], bufEnd, msgLic3, msgLic3 + strlen(msgLic3)) != bufEnd )
+ errDescription << "License is not valid.";
else
{
char msg2[] = "SEGMENTATION FAULT";
"Submesh can not be evaluated",this));
return false;
}
- std::vector<int> aVec = (*anIt).second;
- nbtri += Max(aVec[SMDSEntity_Triangle],aVec[SMDSEntity_Quad_Triangle]);
- nbqua += Max(aVec[SMDSEntity_Quadrangle],aVec[SMDSEntity_Quad_Quadrangle]);
+ std::vector<smIdType> aVec = (*anIt).second;
+ nbtri += std::max(aVec[SMDSEntity_Triangle],aVec[SMDSEntity_Quad_Triangle]);
+ nbqua += std::max(aVec[SMDSEntity_Quadrangle],aVec[SMDSEntity_Quad_Quadrangle]);
GProp_GProps G;
BRepGProp::SurfaceProperties(F,G);
double anArea = G.Mass();
tmpMap.Add(E);
SMESH_subMesh *aSubMesh = aMesh.GetSubMesh(exp.Current());
MapShapeNbElemsItr anIt = aResMap.find(aSubMesh);
- std::vector<int> aVec = (*anIt).second;
+ std::vector<smIdType> aVec = (*anIt).second;
nb0d_e += aVec[SMDSEntity_Node];
- nb1d_e += Max(aVec[SMDSEntity_Edge],aVec[SMDSEntity_Quad_Edge]);
+ nb1d_e += std::max(aVec[SMDSEntity_Edge],aVec[SMDSEntity_Quad_Edge]);
if(IsFirst) {
IsQuadratic = (aVec[SMDSEntity_Quad_Edge] > aVec[SMDSEntity_Edge]);
IsFirst = false;
int nbVols = int(aVolume/tetrVol/CoeffQuality);
int nb1d_f = (nbtri*3 + nbqua*4 - nb1d_e) / 2;
int nb1d_in = (int) ( nbVols*6 - nb1d_e - nb1d_f ) / 5;
- std::vector<int> aVec(SMDSEntity_Last);
+ std::vector<smIdType> aVec(SMDSEntity_Last);
for(int i=SMDSEntity_Node; i<SMDSEntity_Last; i++) aVec[i]=0;
if( IsQuadratic ) {
aVec[SMDSEntity_Node] = nb1d_in/6 + 1 + nb1d_in;