X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGHS3DPRLPlugin%2FGHS3DPRLPlugin_Hypothesis.hxx;h=06af923ee39e90475f20e07689dd10ece3a0b686;hb=0ab6a3e0b79a17ae0777497eea855925d5b1464b;hp=47f2679690ab8ecfa00e1d7be678e3ff53bd0284;hpb=c76ddc0ae514ae0ab3780dc579817b277971c0b1;p=plugins%2Fghs3dprlplugin.git

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
old mode 100755
new mode 100644
index 47f2679..06af923
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  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
@@ -37,7 +37,7 @@ class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_Hypothesis: public SMESH_Hypothesis
 {
 public:
 
-  GHS3DPRLPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen* gen);
+  GHS3DPRLPlugin_Hypothesis(int hypId, SMESH_Gen* gen);
 
   static const char* GetHypType() { return "MG-Tetra Parallel Parameters"; }
 
@@ -52,19 +52,22 @@ public:
 
   void                  SetBackground(bool theVal);
   bool                  GetBackground() const { return _Background; }
-  
+
+  void                  SetMultithread(bool theVal);
+  bool                  GetMultithread() const { return _Multithread; }
+
   //ToMergeSubdomains ToTagSubdomains ToOutputInterfaces ToDiscardSubdomains
-  void                  SetToMergeSubdomains(bool theVal);
-  bool                  GetToMergeSubdomains() const { return _ToMergeSubdomains; }
-  
-  void                  SetToTagSubdomains(bool theVal);
-  bool                  GetToTagSubdomains() const { return _ToTagSubdomains; }
-  
-  void                  SetToOutputInterfaces(bool theVal);
-  bool                  GetToOutputInterfaces() const { return _ToOutputInterfaces; }
-  
-  void                  SetToDiscardSubdomains(bool theVal);
-  bool                  GetToDiscardSubdomains() const { return _ToDiscardSubdomains; }
+  void                  SetGradation(float theVal);
+  float                 GetGradation() const { return _Gradation; }
+
+  void                  SetMinSize(float theVal);
+  float                 GetMinSize() const { return _MinSize; }
+
+  void                  SetMaxSize(float theVal);
+  float                 GetMaxSize() const { return _MaxSize; }
+
+  void                  SetAdvancedOption(const char* theOptAndVals );
+  std::string           GetAdvancedOption() const { return _AdvOptions; }
 
   // the parameters default values
 
@@ -72,16 +75,14 @@ public:
   static int            GetDefaultNbPart();
   static bool           GetDefaultKeepFiles();
   static bool           GetDefaultBackground();
-  static bool           GetDefaultToMergeSubdomains();
-  static bool           GetDefaultToTagSubdomains();
-  static bool           GetDefaultToOutputInterfaces();
-  static bool           GetDefaultToDiscardSubdomains();
+  static bool           GetDefaultMultithread();
+  static float          GetDefaultGradation();
+  static float          GetDefaultMinSize();
+  static float          GetDefaultMaxSize();
 
   // Persistence
   virtual std::ostream& SaveTo(std::ostream& save);
   virtual std::istream& LoadFrom(std::istream& load);
-  friend std::ostream&  operator <<(std::ostream& save, GHS3DPRLPlugin_Hypothesis& hyp);
-  friend std::istream&  operator >>(std::istream& load, GHS3DPRLPlugin_Hypothesis& hyp);
 
   /*!
    * \brief Does nothing
@@ -97,18 +98,19 @@ public:
   virtual bool          SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0);
 
 private:
-  int          _countSubMesh;
-  int          _countTotal;
-  int          _nodeRefNumber;
-
-  std::string  _MEDName;     // generic path/name of med files
-  int          _NbPart;      // number of partitions
-  bool         _KeepFiles;   // keep intermediates tepal files or not
-  bool         _Background;  // tepal in background
-  bool         _ToMergeSubdomains;
-  bool         _ToTagSubdomains;
-  bool         _ToOutputInterfaces;
-  bool         _ToDiscardSubdomains;
+  int         _countSubMesh;
+  int         _countTotal;
+  int         _nodeRefNumber;
+
+  std::string _MEDName;     // generic path/name of med files
+  int         _NbPart;      // number of partitions
+  bool        _KeepFiles;   // keep intermediates tepal files or not
+  bool        _Background;  // mg-tetra_hpc in background
+  bool        _Multithread; // launch mg-tetra_hpc multithread version, else mpi version
+  float       _Gradation;
+  float       _MinSize;
+  float       _MaxSize;
+  std::string _AdvOptions;
   };
 
 #endif