bos #20256: [CEA 18523] Porting SMESH to int 64 bits

diff --git a/src/GMSHPlugin/GMSHPlugin_GMSH.cxx b/src/GMSHPlugin/GMSHPlugin_GMSH.cxx
index a0132dbde180f25686ac804142deffb92c43b0e5..1ed47f4d88c0a6e36fec4629858f9dc4a8e83a70 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_GMSH.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_GMSH.cxx
@@ -34,7 +34,7 @@ using namespace std;
 
 //=============================================================================
 /*!
- *  
+ *
  */
 //=============================================================================
 
@@ -53,7 +53,7 @@ GMSHPlugin_GMSH::GMSHPlugin_GMSH(int hypId, SMESH_Gen* gen)
 
 //=============================================================================
 /*!
- *  
+ *
  */
 //=============================================================================
 
@@ -64,19 +64,18 @@ GMSHPlugin_GMSH::~GMSHPlugin_GMSH()
 
 //=============================================================================
 /*!
- *  
+ *
  */
 //=============================================================================
 
-bool GMSHPlugin_GMSH::CheckHypothesis
-                         (SMESH_Mesh& aMesh,
-                          const TopoDS_Shape& aShape,
-                          SMESH_Hypothesis::Hypothesis_Status& aStatus)
+bool GMSHPlugin_GMSH::CheckHypothesis (SMESH_Mesh&                          aMesh,
+                                       const TopoDS_Shape&                  aShape,
+                                       SMESH_Hypothesis::Hypothesis_Status& aStatus)
 {
   MESSAGE("GMSHPlugin_GMSH::CheckHypothesis");
-  
+
   _hypothesis = NULL;
-  
+
   const list<const SMESHDS_Hypothesis*>& hyps = GetUsedHypothesis(aMesh, aShape);
   int nbHyp = hyps.size();
   if (!nbHyp)
@@ -86,7 +85,7 @@ bool GMSHPlugin_GMSH::CheckHypothesis
   }
   // use only the first hypothesis
   const SMESHDS_Hypothesis* theHyp = hyps.front();
-  
+
   string hypName = theHyp->GetName();
   if ( find( _compatibleHypothesis.begin(), _compatibleHypothesis.end(),
              hypName ) != _compatibleHypothesis.end() )
@@ -109,7 +108,7 @@ bool GMSHPlugin_GMSH::CheckHypothesis
 //=============================================================================
 
 bool GMSHPlugin_GMSH::Compute(SMESH_Mesh&         aMesh,
-                                       const TopoDS_Shape& aShape)
+                              const TopoDS_Shape& aShape)
 {
   GMSHPlugin_Mesher mesher(&aMesh, aShape);
   mesher.SetParameters(dynamic_cast<const GMSHPlugin_Hypothesis*>(_hypothesis));
@@ -128,15 +127,15 @@ void GMSHPlugin_GMSH::CancelCompute()
 //=============================================================================
 
 bool GMSHPlugin_GMSH::Evaluate(SMESH_Mesh&         aMesh,
-                                        const TopoDS_Shape& aShape,
-                                        MapShapeNbElems& aResMap)
+                               const TopoDS_Shape& aShape,
+                               MapShapeNbElems& aResMap)
 {
-  std::vector<int> aResVec(SMDSEntity_Last);
-  for(int i=SMDSEntity_Node; i<SMDSEntity_Last; i++) aResVec[i] = 0;
+  std::vector<smIdType> aResVec(SMDSEntity_Last);
+  for(smIdType i=SMDSEntity_Node; i<SMDSEntity_Last; i++) aResVec[i] = 0;
   SMESH_subMesh * sm = aMesh.GetSubMesh(aShape);
   aResMap.insert(std::make_pair(sm,aResVec));
   SMESH_ComputeErrorPtr& smError = sm->GetComputeError();
   smError.reset( new SMESH_ComputeError(COMPERR_ALGO_FAILED,"Evaluation is not implemented",this));
-  
+
   return true;
 }

diff --git a/src/GMSHPlugin/GMSHPlugin_GMSH_2D.cxx b/src/GMSHPlugin/GMSHPlugin_GMSH_2D.cxx
index 5773d37266b22669a8d8a2a686d6a5859e9b6612..d19060dc4ae031a783a77372b4d7704821e58ebb 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_GMSH_2D.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_GMSH_2D.cxx
@@ -131,8 +131,8 @@ bool GMSHPlugin_GMSH_2D::Evaluate(SMESH_Mesh&         aMesh,
                                         const TopoDS_Shape& aShape,
                                         MapShapeNbElems& aResMap)
 {
-  std::vector<int> aResVec(SMDSEntity_Last);
-  for(int i=SMDSEntity_Node; i<SMDSEntity_Last; i++) aResVec[i] = 0;
+  std::vector<smIdType> aResVec(SMDSEntity_Last);
+  for(smIdType i=SMDSEntity_Node; i<SMDSEntity_Last; i++) aResVec[i] = 0;
   SMESH_subMesh * sm = aMesh.GetSubMesh(aShape);
   aResMap.insert(std::make_pair(sm,aResVec));
   SMESH_ComputeErrorPtr& smError = sm->GetComputeError();

diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
index 6782ac448e19768040bbf7a622b05967117dd5df..9d21d3d2b7e2695e4d3f5e4f6d09320d9a1f4643 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
@@ -239,7 +239,7 @@ void GMSHPlugin_Mesher::SetGmshOptions()
   printf("We chose _useIncomplElem %d \n", (_useIncomplElem)?1:0);
   printf("We are in dimension      %d \n", (_is2d)?2:3);
   //*/
-  
+
   std::map <int,double> mapAlgo2d;
   mapAlgo2d[0]=2; mapAlgo2d[1]=1; mapAlgo2d[2]=5; mapAlgo2d[3]=6; mapAlgo2d[4]=8; mapAlgo2d[5]=9;
   std::map <int,double> mapAlgo3d;
@@ -249,10 +249,10 @@ void GMSHPlugin_Mesher::SetGmshOptions()
   ok = GmshSetOption("Mesh", "Algorithm"                , mapAlgo2d[_algo2d])    ;
   ASSERT(ok);
   if ( !_is2d)
-    {
+  {
     ok = GmshSetOption("Mesh", "Algorithm3D"            , mapAlgo2d[_algo3d])    ;
     ASSERT(ok);
-    }
+  }
   ok = GmshSetOption("Mesh", "RecombinationAlgorithm"   , (double)_recomb2DAlgo) ;
   ASSERT(ok);
   ok = GmshSetOption("Mesh", "RecombineAll"             , (_recombineAll)?1.:0.) ;
@@ -274,10 +274,10 @@ void GMSHPlugin_Mesher::SetGmshOptions()
   ok = GmshSetOption("Mesh", "ElementOrder"             , (_secondOrder)?2.:1.)  ;
   ASSERT(ok);
   if (_secondOrder)
-    {
+  {
     ok = GmshSetOption("Mesh", "SecondOrderIncomplete"  ,(_useIncomplElem)?1.:0.);
     ASSERT(ok);
-    }
+  }
 }
 
 //================================================================================
@@ -289,9 +289,9 @@ void GMSHPlugin_Mesher::SetGmshOptions()
 void GMSHPlugin_Mesher::CreateGmshCompounds()
 {
   MESSAGE("GMSHPlugin_Mesher::CreateGmshCompounds");
-  
+
   SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
-  
+
   OCC_Internals* occgeo = _gModel->getOCCInternals();
   bool toSynchronize = false;