-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <map>
#include <vector>
-extern "C"
-{
- #include "libmesh5.h"
-}
-
-#ifndef GMFVERSION
-#define GMFVERSION GmfDouble
-#endif
-#define GMFDIMENSION 3
-
class HYBRIDPlugin_Hypothesis;
class SMDS_MeshNode;
class SMESH_Mesh;
class HYBRIDPlugin_HYBRID: public SMESH_3D_Algo
{
public:
- HYBRIDPlugin_HYBRID(int hypId, int studyId, SMESH_Gen* gen);
+ HYBRIDPlugin_HYBRID(int hypId, SMESH_Gen* gen);
virtual ~HYBRIDPlugin_HYBRID();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape);
virtual void CancelCompute();
- bool computeCanceled() { return _compute_canceled;};
+ bool computeCanceled() { return _computeCanceled; }
virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape,
MapShapeNbElems& aResMap);
static const char* Name() { return "HYBRID_3D"; }
+ const HYBRIDPlugin_Hypothesis* getHyp() {return _hyp ;}
+
protected:
const HYBRIDPlugin_Hypothesis* _hyp;
- const StdMeshers_ViscousLayers* _viscousLayersHyp;
+ //const StdMeshers_ViscousLayers* _viscousLayersHyp;
std::string _genericName;
private:
- bool storeErrorDescription(const TCollection_AsciiString& logFile,
- const _Ghs2smdsConvertor & toSmdsConvertor );
+ bool storeErrorDescription(const char* logFile,
+ const std::string& log,
+ const _Ghs2smdsConvertor & toSmdsConvertor );
TopoDS_Shape entryToShape(std::string entry);
int _iShape;
bool _keepFiles;
bool _removeLogOnSuccess;
bool _logInStandardOutput;
- SALOMEDS::Study_var myStudy;
- SMESH_Gen_i* smeshGen_i;
-
- volatile bool _compute_canceled;
};
/*!