LOT7: fix compilation at med_int==int64

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1219b43ee5b8c3632f2a57a03dd2511822ce396e..b22ba9a3dea8e50581c85a850ce9152d07817527 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,6 +95,10 @@ ELSE(EXISTS ${MEDCOUPLING_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need the MEDCoupling tool, please define MEDCOUPLING_ROOT_DIR !")
 ENDIF(EXISTS ${MEDCOUPLING_ROOT_DIR})
 
+IF(MEDCOUPLING_USE_64BIT_IDS)
+  ADD_DEFINITIONS("-DMEDCOUPLING_USE_64BIT_IDS")
+ENDIF(MEDCOUPLING_USE_64BIT_IDS)
+
 #
 # Set list of prerequisites
 # =========================

diff --git a/src/MEDCalculator/MEDCalculatorDBField.cxx b/src/MEDCalculator/MEDCalculatorDBField.cxx
index 16fe0685b1cffe0a222294c66857b1292be9ff8b..3f718dbbb2f8f954901814f95d99e4245e2a7ada 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBField.cxx
+++ b/src/MEDCalculator/MEDCalculatorDBField.cxx
@@ -118,7 +118,7 @@ void MEDCalculatorDBFieldReal::setDescription(const char *descr)
 void MEDCalculatorDBFieldReal::write(const char *fName, bool writeFromScratch) const throw(INTERP_KERNEL::Exception)
 {
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   int step=ids[0];
   const MEDCouplingFieldDouble *field=_time_steps[step]->getField(_type,_file_name,_mesh_name,_field_name);
   const MEDCouplingUMesh *mesh=static_cast<const MEDCouplingUMesh *>(field->getMesh());
@@ -139,17 +139,17 @@ void MEDCalculatorDBFieldReal::write(const char *fName, bool writeFromScratch) c
         }
     }
   WriteUMesh(fName,mesh,writeFromScratch);
-  for(std::vector<int>::const_iterator iter=ids.begin();iter!=ids.end();iter++)
+  for(std::vector<std::size_t>::const_iterator iter=ids.begin();iter!=ids.end();iter++)
     _time_steps[*iter]->write(fName,_name,_description);
 }
 
 void MEDCalculatorDBFieldReal::display() const throw(INTERP_KERNEL::Exception)
 {
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   std::vector< MCAuto<MEDCouplingFieldDouble> > fs2(ids.size());
   int ii=0;
-  for(std::vector<int>::const_iterator iter=ids.begin();iter!=ids.end();iter++)
+  for(std::vector<std::size_t>::const_iterator iter=ids.begin();iter!=ids.end();iter++)
     fs2[ii++]=_time_steps[*iter]->getFieldWithoutQuestion(_c_labels.size(),_c);
   std::vector<MEDCouplingFieldDouble *> fs(fs2.size());
   std::copy(fs2.begin(),fs2.end(),fs.begin());
@@ -193,8 +193,8 @@ std::string MEDCalculatorDBFieldReal::simpleRepr() const
   oss << "Number of time steps of multitime field : " << getNumberOfSteps() << ".\n";
   oss << "Number of components of multitime field : " << getNumberOfComponents() << ".\n";
   oss << "Components names attached are : ";
-  std::vector<int> ids=_c.getIds(_c_labels.size());
-  for(std::vector<int>::const_iterator iter=ids.begin();iter!=ids.end();iter++)
+  std::vector<std::size_t> ids=_c.getIds(_c_labels.size());
+  for(std::vector<std::size_t>::const_iterator iter=ids.begin();iter!=ids.end();iter++)
     oss << "\"" << _c_labels[*iter] << "\" ";
   oss << ".\nNumber of fetched field in multime field : " << getNumberOfFetchedSteps() << "/" << getNumberOfSteps() << ".\n";
   return oss.str();
@@ -215,8 +215,8 @@ MEDCalculatorDBFieldReal::MEDCalculatorDBFieldReal(const MEDCalculatorBrowserFie
 const MEDCalculatorDBFieldReal& MEDCalculatorDBFieldReal::operator=(const MEDCalculatorDBFieldReal& other) throw(INTERP_KERNEL::Exception)
 {
   checkConsistencyLight(other);
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   unsigned int sz=ids.size();
   if(sz!=ids2.size())
     throw INTERP_KERNEL::Exception("FieldReal::operator= : Timesteps lengths mismatch !");
@@ -259,9 +259,9 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::add(const MEDCalculatorDBFieldRe
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
   other.fetchData();
-  DataArrayInt *cellCor,*nodeCor;
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  DataArrayIdType *cellCor,*nodeCor;
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   if(ids.size()!=ids2.size())
     throw INTERP_KERNEL::Exception("FieldReal::add : Timesteps lengths mismatch !");
   int step=ids[0];
@@ -309,9 +309,9 @@ bool MEDCalculatorDBFieldReal::isEqualSameType(const MEDCalculatorDBFieldReal& o
     return false;
   fetchData();
   other.fetchData();
-  DataArrayInt *cellCor,*nodeCor;
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  DataArrayIdType *cellCor,*nodeCor;
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   if(ids.size()!=ids2.size())
     return false;
   int step=ids[0];
@@ -356,9 +356,9 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::substract(const MEDCalculatorDBF
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
   other.fetchData();
-  DataArrayInt *cellCor,*nodeCor;
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  DataArrayIdType *cellCor,*nodeCor;
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   if(ids.size()!=ids2.size())
     throw INTERP_KERNEL::Exception("FieldReal::substract : Timesteps lengths mismatch !");
   int step=ids[0];
@@ -406,9 +406,9 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::multiply(const MEDCalculatorDBFi
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
   other.fetchData();
-  DataArrayInt *cellCor,*nodeCor;
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  DataArrayIdType *cellCor,*nodeCor;
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   if(ids.size()!=ids2.size())
     throw INTERP_KERNEL::Exception("FieldReal::multiply : Timesteps lengths mismatch !");
   int step=ids[0];
@@ -456,9 +456,9 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::divide(const MEDCalculatorDBFiel
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
   other.fetchData();
-  DataArrayInt *cellCor,*nodeCor;
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  DataArrayIdType *cellCor,*nodeCor;
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   if(ids.size()!=ids2.size())
     throw INTERP_KERNEL::Exception("FieldReal::divide : Timesteps lengths mismatch !");
   int step=ids[0];
@@ -491,8 +491,8 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::dot(const MEDCalculatorDBFieldRe
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
   other.fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   unsigned int sz=ids.size();
   if(sz!=ids2.size())
     throw INTERP_KERNEL::Exception("FieldReal::dot : Timesteps lengths mismatch !");
@@ -511,8 +511,8 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::crossProduct(const MEDCalculator
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
   other.fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  std::vector<int> ids2=other._t.getIds(other._time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids2=other._t.getIds(other._time_steps.size());
   unsigned int sz=ids.size();
   if(sz!=ids2.size())
     throw INTERP_KERNEL::Exception("FieldReal::crossProduct : Timesteps lengths mismatch !");
@@ -529,7 +529,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::doublyContractedProduct() const
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -544,7 +544,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::determinant() const throw(INTERP
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -559,7 +559,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenValues() const throw(INTERP
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -580,7 +580,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::eigenVectors() const throw(INTER
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -601,7 +601,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::inverse() const throw(INTERP_KER
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -622,7 +622,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::trace() const throw(INTERP_KERNE
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -637,7 +637,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::deviator() const throw(INTERP_KE
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -658,7 +658,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::magnitude() const throw(INTERP_K
 {
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   unsigned int sz=ids.size();
   ret->_time_steps.resize(sz);
   for(unsigned int i=0;i<sz;i++)
@@ -672,8 +672,8 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::magnitude() const throw(INTERP_K
 void MEDCalculatorDBFieldReal::applyFunc(const char *func) throw(INTERP_KERNEL::Exception)
 {
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  for(std::vector<int>::const_iterator it=ids.begin();it!=ids.end();it++)
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  for(std::vector<std::size_t>::const_iterator it=ids.begin();it!=ids.end();it++)
     _time_steps[*it]->applyFunc(func,_c_labels.size(),_c);
 }
 
@@ -682,7 +682,7 @@ MEDCalculatorDBFieldReal *MEDCalculatorDBFieldReal::buildCstFieldFromThis(double
   MCAuto<MEDCalculatorDBFieldReal> ret=new MEDCalculatorDBFieldReal(_type);
   ret->_p=_p;
   ret->_c_labels.resize(_c.getSize(_c_labels.size()));
-  std::vector<int> stps=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> stps=_t.getIds(_time_steps.size());
   int stepSize=stps.size();
   ret->_time_steps.resize(stepSize);
   if(stepSize==0)
@@ -709,9 +709,9 @@ void MEDCalculatorDBFieldReal::checkConsistencyLight(const MEDCalculatorDBFieldR
 void MEDCalculatorDBFieldReal::fetchData() const throw(INTERP_KERNEL::Exception)
 {
   std::vector<std::pair<int,int> > idstoFetch;
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   int sz=ids.size();
-  std::vector<int> idsInGlobalToFetch;
+  std::vector<std::size_t> idsInGlobalToFetch;
   for(int i=0;i<sz;i++)
     {
       MCAuto<MEDCalculatorDBSliceField> elt=_time_steps[ids[i]];
@@ -741,8 +741,8 @@ int MEDCalculatorDBFieldReal::getNumberOfSteps() const
 int MEDCalculatorDBFieldReal::getNumberOfFetchedSteps() const
 {
   int ret=0;
-  std::vector<int> ids=_t.getIds(_time_steps.size());
-  for(std::vector<int>::const_iterator it=ids.begin();it!=ids.end();it++)
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
+  for(std::vector<std::size_t>::const_iterator it=ids.begin();it!=ids.end();it++)
     if(_time_steps[*it]->isFetched())
       ret++;
   return ret;
@@ -759,10 +759,10 @@ int MEDCalculatorDBFieldReal::getNumberOfComponents() const
 std::vector<MEDCouplingFieldDouble *> MEDCalculatorDBFieldReal::getFields() const throw(INTERP_KERNEL::Exception)
 {
   fetchData();
-  std::vector<int> ids=_t.getIds(_time_steps.size());
+  std::vector<std::size_t> ids=_t.getIds(_time_steps.size());
   std::vector<MEDCouplingFieldDouble *> ret(ids.size());
   int i=0;
-  for(std::vector<int>::const_iterator it=ids.begin();it!=ids.end();it++,i++)
+  for(std::vector<std::size_t>::const_iterator it=ids.begin();it!=ids.end();it++,i++)
     ret[i]=_time_steps[*it]->getFieldWithoutQuestion(_c_labels.size(),_c);
   return ret;
 }

diff --git a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
index ea5d3d4e01796ee67b88ef80055f09615b020a36..b9659adacd39f2538b574e696f05a194d488e3ab 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
+++ b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
@@ -58,7 +58,7 @@ void MEDCalculatorDBRangeSelection::setPyEnd(int val)
   _end=TraducePyVal(val);
 }
 
-std::vector<int> MEDCalculatorDBRangeSelection::getIds(int lgth) const throw(INTERP_KERNEL::Exception)
+std::vector<std::size_t> MEDCalculatorDBRangeSelection::getIds(int lgth) const throw(INTERP_KERNEL::Exception)
 {
   if(_start>=lgth || _start<0)
     {
@@ -75,7 +75,7 @@ std::vector<int> MEDCalculatorDBRangeSelection::getIds(int lgth) const throw(INT
     throw INTERP_KERNEL::Exception("RangeSelection::getIds : end specficied is higher than length !");
   if(_start>trueEnd)
     throw INTERP_KERNEL::Exception("RangeSelection::getIds : begin of range after end !");
-  std::vector<int> ret(trueEnd-_start);
+  std::vector<std::size_t> ret(trueEnd-_start);
   int j=0;
   for(int i=_start;i<trueEnd;i++,j++)
     ret[j]=i;

diff --git a/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx b/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx
index 823a846057c5d66d4a2323d34a89bd0fcab7b37a..1c56a7cd01cad837f2fea64d942385632e6252aa 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx
+++ b/src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx
@@ -38,7 +38,7 @@ namespace MEDCoupling
     void setPyEnd(int val);
     MEDCalculatorDBRangeSelection& operator=(const char *v) throw(INTERP_KERNEL::Exception);
     MEDCalculatorDBRangeSelection& operator=(int v) throw(INTERP_KERNEL::Exception);
-    std::vector<int> getIds(int lgth) const throw(INTERP_KERNEL::Exception);
+    std::vector<std::size_t> getIds(int lgth) const throw(INTERP_KERNEL::Exception);
     int getSize(int lgth) const throw(INTERP_KERNEL::Exception);
     bool isAll() const;
     void setAll();

diff --git a/src/MEDCalculator/MEDCalculatorDBSliceField.cxx b/src/MEDCalculator/MEDCalculatorDBSliceField.cxx
index 4a7ced0e7c051e4ecf9b7e53a4acf84b5e5bd4aa..460f2309659474d58c1aa372a150358b5ad8a6ca 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBSliceField.cxx
+++ b/src/MEDCalculator/MEDCalculatorDBSliceField.cxx
@@ -108,7 +108,7 @@ MEDCouplingFieldDouble *MEDCalculatorDBSliceField::getField(TypeOfField type, co
  */
 MEDCouplingFieldDouble *MEDCalculatorDBSliceField::getFieldWithoutQuestion(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   return _field->keepSelectedComponents(tIds);
 }
 
@@ -124,20 +124,20 @@ MEDCouplingFieldDouble *MEDCalculatorDBSliceField::buildCstFromThis(double val,
 void MEDCalculatorDBSliceField::assign(const MEDCalculatorDBSliceField* other, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                     int sizeCOther, const MEDCalculatorDBRangeSelection& otherC)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=other->_field->keepSelectedComponents(oIds);
   _field->setSelectedComponents(f1,tIds);
 }
 
-MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::add(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::add(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                                     int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                                     int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const
 {
   if(cc!=0 || nc!=0)
     throw INTERP_KERNEL::Exception("Slice::add : not implemented yet node/cell permutation !");
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MCAuto<MEDCouplingFieldDouble> f2=other->_field->keepSelectedComponents(oIds);
   f2->setMesh(f1->getMesh());
@@ -145,14 +145,14 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::add(const MEDCalculatorDBS
   return new MEDCalculatorDBSliceField(f3);
 }
 
-MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::substract(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::substract(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                                           int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                                           int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const
 {
   if(cc!=0 || nc!=0)
     throw INTERP_KERNEL::Exception("Slice::substract : not implemented yet node/cell permutation !");
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MCAuto<MEDCouplingFieldDouble> f2=other->_field->keepSelectedComponents(oIds);
   f2->setMesh(f1->getMesh());
@@ -160,14 +160,14 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::substract(const MEDCalcula
   return new MEDCalculatorDBSliceField(f3);
 }
 
-MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::multiply(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::multiply(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                                          int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                                          int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const
 {
   if(cc!=0 || nc!=0)
     throw INTERP_KERNEL::Exception("Slice::multiply : not implemented yet node/cell permutation !");
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MCAuto<MEDCouplingFieldDouble> f2=other->_field->keepSelectedComponents(oIds);
   f2->setMesh(f1->getMesh());
@@ -175,14 +175,14 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::multiply(const MEDCalculat
   return new MEDCalculatorDBSliceField(f3);
 }
 
-MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::divide(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::divide(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                                        int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                                        int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const
 {
   if(cc!=0 || nc!=0)
     throw INTERP_KERNEL::Exception("Slice::divide : not implemented yet node/cell permutation !");
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MCAuto<MEDCouplingFieldDouble> f2=other->_field->keepSelectedComponents(oIds);
   f2->setMesh(f1->getMesh());
@@ -193,8 +193,8 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::divide(const MEDCalculator
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::dot(const MEDCalculatorDBSliceField* other, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                                     int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MCAuto<MEDCouplingFieldDouble> f2=other->_field->keepSelectedComponents(oIds);
   f2->setMesh(f1->getMesh());
@@ -205,8 +205,8 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::dot(const MEDCalculatorDBS
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::crossProduct(const MEDCalculatorDBSliceField* other, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                                              int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MCAuto<MEDCouplingFieldDouble> f2=other->_field->keepSelectedComponents(oIds);
   f2->setMesh(f1->getMesh());
@@ -216,7 +216,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::crossProduct(const MEDCalc
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::doublyContractedProduct(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->doublyContractedProduct();
   return new MEDCalculatorDBSliceField(f2);
@@ -224,7 +224,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::doublyContractedProduct(in
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::determinant(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->determinant();
   return new MEDCalculatorDBSliceField(f2);
@@ -232,7 +232,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::determinant(int sizeCThis,
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenValues(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->eigenValues();
   return new MEDCalculatorDBSliceField(f2);
@@ -240,7 +240,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenValues(int sizeCThis,
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenVectors(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->eigenVectors();
   return new MEDCalculatorDBSliceField(f2);
@@ -248,7 +248,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::eigenVectors(int sizeCThis
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::inverse(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->inverse();
   return new MEDCalculatorDBSliceField(f2);
@@ -256,7 +256,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::inverse(int sizeCThis, con
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::trace(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->trace();
   return new MEDCalculatorDBSliceField(f2);
@@ -264,7 +264,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::trace(int sizeCThis, const
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::deviator(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->deviator();
   return new MEDCalculatorDBSliceField(f2);
@@ -272,7 +272,7 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::deviator(int sizeCThis, co
 
 MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::magnitude(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MEDCouplingFieldDouble *f2=f1->magnitude();
   return new MEDCalculatorDBSliceField(f2);
@@ -280,20 +280,20 @@ MEDCalculatorDBSliceField *MEDCalculatorDBSliceField::magnitude(int sizeCThis, c
 
 void MEDCalculatorDBSliceField::applyFunc(const char *func, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC)
 {
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   f1->applyFunc(func);
   _field->setSelectedComponents(f1,tIds);
 }
 
-bool MEDCalculatorDBSliceField::isEqual(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+bool MEDCalculatorDBSliceField::isEqual(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                      int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                      int sizeCOther, const MEDCalculatorDBRangeSelection& otherC, double prec) const
 {
   if(cc!=0 || nc!=0)
     throw INTERP_KERNEL::Exception("Slice::isEqual : not implemented yet node/cell permutation !");
-  std::vector<int> tIds=thisC.getIds(sizeCThis);
-  std::vector<int> oIds=otherC.getIds(sizeCOther);
+  std::vector<std::size_t> tIds=thisC.getIds(sizeCThis);
+  std::vector<std::size_t> oIds=otherC.getIds(sizeCOther);
   MCAuto<MEDCouplingFieldDouble> f1=_field->keepSelectedComponents(tIds);
   MCAuto<MEDCouplingFieldDouble> f2=other->_field->keepSelectedComponents(oIds);
   f2->setMesh(f1->getMesh());

diff --git a/src/MEDCalculator/MEDCalculatorDBSliceField.hxx b/src/MEDCalculator/MEDCalculatorDBSliceField.hxx
index 28ae97fdc6cb43438b9686dd224a4803052e35f0..4c4095357d7f6a905047df25448fc1e978f43cb7 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBSliceField.hxx
+++ b/src/MEDCalculator/MEDCalculatorDBSliceField.hxx
@@ -57,16 +57,16 @@ namespace MEDCoupling
     //
     void assign(const MEDCalculatorDBSliceField* other, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                 int sizeCOther, const MEDCalculatorDBRangeSelection& otherC);
-    MEDCalculatorDBSliceField *add(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+    MEDCalculatorDBSliceField *add(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                 int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                 int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const;
-    MEDCalculatorDBSliceField *substract(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+    MEDCalculatorDBSliceField *substract(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                       int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                       int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const;
-    MEDCalculatorDBSliceField *multiply(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+    MEDCalculatorDBSliceField *multiply(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                      int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                      int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const;
-    MEDCalculatorDBSliceField *divide(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+    MEDCalculatorDBSliceField *divide(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                                    int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                                    int sizeCOther, const MEDCalculatorDBRangeSelection& otherC) const;
     MEDCalculatorDBSliceField *dot(const MEDCalculatorDBSliceField* other,
@@ -84,7 +84,7 @@ namespace MEDCoupling
     MEDCalculatorDBSliceField *deviator(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception);
     MEDCalculatorDBSliceField *magnitude(int sizeCThis, const MEDCalculatorDBRangeSelection& thisC) const throw(INTERP_KERNEL::Exception);
     void applyFunc(const char *func, int sizeCThis, const MEDCalculatorDBRangeSelection& thisC);
-    bool isEqual(const MEDCalculatorDBSliceField* other, const DataArrayInt *cc, const DataArrayInt *nc,
+    bool isEqual(const MEDCalculatorDBSliceField* other, const DataArrayIdType *cc, const DataArrayIdType *nc,
                  int sizeCThis, const MEDCalculatorDBRangeSelection& thisC,
                  int sizeCOther, const MEDCalculatorDBRangeSelection& otherC, double prec) const;
   private:

diff --git a/src/MEDCalculator/Swig/CMakeLists.txt b/src/MEDCalculator/Swig/CMakeLists.txt
index 70bda1ab303181506f654b1f119aeb33d1374a6c..28406e855f8ae68102a5c90570f39e2d49fc4755 100644 (file)
--- a/src/MEDCalculator/Swig/CMakeLists.txt
+++ b/src/MEDCalculator/Swig/CMakeLists.txt
@@ -45,6 +45,9 @@ INSTALL(TARGETS medcalculatorspython DESTINATION ${SALOME_INSTALL_LIBS})
 SET_SOURCE_FILES_PROPERTIES(MEDCalculator.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCalculator.i PROPERTIES SWIG_FLAGS "-py3")
 SET(SWIG_MODULE_MEDCalculator_EXTRA_FLAGS "${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}")
+IF(MEDCOUPLING_USE_64BIT_IDS)
+  STRING(APPEND SWIG_MODULE_MEDCalculator_EXTRA_FLAGS ";-DMEDCOUPLING_USE_64BIT_IDS")
+ENDIF(MEDCOUPLING_USE_64BIT_IDS)
 IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
   SWIG_ADD_MODULE(MEDCalculator python MEDCalculator.i)
 ELSE()

diff --git a/src/MEDCalculator/Test/MEDCalculatorBasicsTest.cxx b/src/MEDCalculator/Test/MEDCalculatorBasicsTest.cxx
index b4796a6e11a7f83a484a0034832e7d9a9909ace0..bb14c4237f2f9f6e5d2435bab15b5a06d33fdd74 100644 (file)
--- a/src/MEDCalculator/Test/MEDCalculatorBasicsTest.cxx
+++ b/src/MEDCalculator/Test/MEDCalculatorBasicsTest.cxx
@@ -45,7 +45,7 @@ void MEDCoupling::MEDCalculatorBasicsTest::testLightStruct1()
 void MEDCoupling::MEDCalculatorBasicsTest::testRangeSelection1()
 {
   MEDCalculatorDBRangeSelection sel1(":");
-  std::vector<int> v=sel1.getIds(6);
+  std::vector<std::size_t> v=sel1.getIds(6);
   CPPUNIT_ASSERT_EQUAL(6,(int)v.size());
   const int expected1[6]={0,1,2,3,4,5};
   CPPUNIT_ASSERT(std::equal(expected1,expected1+6,v.begin()));
@@ -111,7 +111,7 @@ void MEDCoupling::MEDCalculatorBasicsTest::testDBField1()
 void MEDCoupling::MEDCalculatorBasicsTest::generateAFile1(const char *fName)
 {
   double targetCoords[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 };
-  int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  mcIdType targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   MEDCouplingUMesh *m=MEDCouplingUMesh::New();
   m->setName("AMesh");
   m->setMeshDimension(2);

diff --git a/src/MEDCouplingCorba/Client/DataArrayDoubleClient.cxx b/src/MEDCouplingCorba/Client/DataArrayDoubleClient.cxx
index 4a48e9ed299efe9e217295cf1aa6eba98e33e98e..7023bc86c05dd085e2e310cfe353817977a18f3b 100644 (file)
--- a/src/MEDCouplingCorba/Client/DataArrayDoubleClient.cxx
+++ b/src/MEDCouplingCorba/Client/DataArrayDoubleClient.cxx
@@ -35,7 +35,7 @@ DataArrayDouble *DataArrayDoubleClient::New(SALOME_MED::DataArrayDoubleCorbaInte
   dadPtr->getTinyInfo(tinyL,tinyS);
   DataArrayDouble *ret=DataArrayDouble::New();
   int tinyLgth=tinyL->length();
-  std::vector<int> v1(tinyLgth);
+  std::vector<mcIdType> v1(tinyLgth);
   for(int j=0;j<tinyLgth;j++)
     v1[j]=(*tinyL)[j];
   delete tinyL; tinyL=0;

diff --git a/src/MEDCouplingCorba/Client/DataArrayIntClient.cxx b/src/MEDCouplingCorba/Client/DataArrayIntClient.cxx
index 07837aec27ebc9d22a07f13af70347510da5d4ab..e2917fca0762ca6babacca84c6ad187d660316e1 100644 (file)
--- a/src/MEDCouplingCorba/Client/DataArrayIntClient.cxx
+++ b/src/MEDCouplingCorba/Client/DataArrayIntClient.cxx
@@ -34,7 +34,7 @@ DataArrayInt *DataArrayIntClient::New(SALOME_MED::DataArrayIntCorbaInterface_ptr
   dadPtr->getTinyInfo(tinyL,tinyS);
   DataArrayInt *ret=DataArrayInt::New();
   int tinyLgth=tinyL->length();
-  std::vector<int> v1(tinyLgth);
+  std::vector<mcIdType> v1(tinyLgth);
   for(int j=0;j<tinyLgth;j++)
     v1[j]=(*tinyL)[j];
   delete tinyL; tinyL=0;

diff --git a/src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.cxx b/src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.cxx
index c45be0a6a36144df91529cc76595fadd1959e30c..5b2bc5f5dc5b62efc4b32a3cb1fd728cd3dd9cb6 100644 (file)
--- a/src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.cxx
+++ b/src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.cxx
@@ -36,7 +36,7 @@ MEDCouplingFieldDouble *MEDCouplingFieldDoubleClient::New(SALOME_MED::MEDCouplin
   //1st CORBA call : getting all tiny info of all types (int, double string).
   fieldPtr->getTinyInfo(tinyL,tinyD,tinyS);
   int tinyLgth=tinyL->length();
-  std::vector<int> tinyLV(tinyLgth);
+  std::vector<mcIdType> tinyLV(tinyLgth);
   for(int i=0;i<tinyLgth;i++)
     tinyLV[i]=(*tinyL)[i];
   delete tinyL;
@@ -63,7 +63,7 @@ MEDCouplingFieldDouble *MEDCouplingFieldDoubleClient::New(SALOME_MED::MEDCouplin
   CORBA::release(meshPtr);
   ret->setMesh(mesh);
   mesh->decrRef();
-  DataArrayInt *array0;
+  DataArrayIdType *array0;
   std::vector<DataArrayDouble *> arrays;
   ret->resizeForUnserialization(tinyLV,array0,arrays);
   SALOME_TYPES::ListOfLong *bigArr0;
@@ -72,9 +72,9 @@ MEDCouplingFieldDouble *MEDCouplingFieldDoubleClient::New(SALOME_MED::MEDCouplin
   fieldPtr->getSerialisationData(bigArr0,bigArr);
   if(bigArr0->length()!=0)
     {
-      int *pt=array0->getPointer();
-      int lgth=array0->getNbOfElems();
-      for(int i=0;i<lgth;i++)
+      mcIdType *pt=array0->getPointer();
+      mcIdType lgth=array0->getNbOfElems();
+      for(mcIdType i=0;i<lgth;i++)
         pt[i]=(*bigArr0)[i];
     }
   delete bigArr0;

diff --git a/src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.cxx b/src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.cxx
index 02bfedc0a04a3dc19a8422d1e5867eec57d430be..258650b8f3dc959b0ea3756e62403918dcf4420a 100644 (file)
--- a/src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.cxx
+++ b/src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.cxx
@@ -60,7 +60,7 @@ void MEDCouplingFieldOverTimeClient::retrieveFieldTemplates()
   CORBA::Long nbOfFields;
   CORBA::Long nbOfMeshes=_field_ptr->getMainTinyInfo(tinyL,tinyD,nbOfArrays,nbOfFields);
   int tinyLgth=tinyL->length();
-  std::vector<int> mainI(tinyLgth);
+  std::vector<mcIdType> mainI(tinyLgth);
   for(int i=0;i<tinyLgth;i++)
     mainI[i]=(*tinyL)[i];
   delete tinyL; tinyL=0;
@@ -79,7 +79,7 @@ void MEDCouplingFieldOverTimeClient::retrieveFieldTemplates()
     {
       _field_ptr->getTinyInfo(i,tinyL,tinyD,tinyS);
       int tinyLgth=tinyL->length();
-      std::vector<int> tinyLV(tinyLgth);
+      std::vector<mcIdType> tinyLV(tinyLgth);
       for(int j=0;j<tinyLgth;j++)
         tinyLV[j]=(*tinyL)[j];
       delete tinyL; tinyL=0;
@@ -98,13 +98,13 @@ void MEDCouplingFieldOverTimeClient::retrieveFieldTemplates()
       TypeOfField type=(TypeOfField) tinyLV[0];
       MEDCouplingFieldTemplate *f1=MEDCouplingFieldTemplate::New(type);
       //
-      DataArrayInt *array0;
+      DataArrayIdType *array0;
       f1->resizeForUnserialization(tinyLV,array0);
       if(array0)
         {
           _field_ptr->getSerialisationData(i,tinyL);
           tinyLgth=tinyL->length();
-          int *ptr=array0->getPointer();
+          mcIdType *ptr=array0->getPointer();
           for(int j=0;j<tinyLgth;j++)
             ptr[j]=(*tinyL)[j];
           delete tinyL; tinyL=0;

diff --git a/src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.cxx b/src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.cxx
index df3d2823c6fd571ad95a0e44a8d5b1050a992725..98ed43b1b12582afeff6392d01efadbab3dca846 100644 (file)
--- a/src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.cxx
+++ b/src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.cxx
@@ -37,7 +37,7 @@ MEDCouplingFieldTemplate *MEDCouplingFieldTemplateClient::New(SALOME_MED::MEDCou
   //1st CORBA call : getting all tiny info of all types (int, double string).
   fieldPtr->getTinyInfo(tinyL,tinyD,tinyS);
   int tinyLgth=tinyL->length();
-  std::vector<int> tinyLV(tinyLgth);
+  std::vector<mcIdType> tinyLV(tinyLgth);
   for(int i=0;i<tinyLgth;i++)
     tinyLV[i]=(*tinyL)[i];
   delete tinyL;
@@ -63,16 +63,16 @@ MEDCouplingFieldTemplate *MEDCouplingFieldTemplateClient::New(SALOME_MED::MEDCou
   CORBA::release(meshPtr);
   ret->setMesh(mesh);
   mesh->decrRef();
-  DataArrayInt *array0;
+  DataArrayIdType *array0;
   ret->resizeForUnserialization(tinyLV,array0);
   SALOME_TYPES::ListOfLong *bigArr0;
   //3rd CORBA invocation to get big content
   fieldPtr->getSerialisationData(bigArr0);
   if(bigArr0->length()!=0)
     {
-      int *pt=array0->getPointer();
-      int lgth=array0->getNbOfElems();
-      for(int i=0;i<lgth;i++)
+      mcIdType *pt=array0->getPointer();
+      mcIdType lgth=array0->getNbOfElems();
+      for(mcIdType i=0;i<lgth;i++)
         pt[i]=(*bigArr0)[i];
     }
   delete bigArr0;

diff --git a/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx b/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx
index 5ab5d69cd78fb9ec1c45809fe86d43ccd6098174..7b9ac556e44ab1023d697d2677110fa1aa6cb183 100644 (file)
--- a/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx
+++ b/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx
@@ -103,7 +103,7 @@ void MEDCouplingMeshClient::fillMeshFromCorbaData(MEDCouplingMesh *meshCpp, SALO
   SALOME_TYPES::ListOfString *tinyS;
   meshPtr->getTinyInfo(tinyD,tinyI,tinyS);
   int tinyLgth=tinyI->length();
-  std::vector<int> tinyV(tinyLgth);
+  std::vector<mcIdType> tinyV(tinyLgth);
   for(int i=0;i<tinyLgth;i++)
     tinyV[i]=(*tinyI)[i];
   int tinyLgth2=tinyD->length();
@@ -116,7 +116,7 @@ void MEDCouplingMeshClient::fillMeshFromCorbaData(MEDCouplingMesh *meshCpp, SALO
   delete tinyS;
   delete tinyI;
   delete tinyD;
-  DataArrayInt* a1=DataArrayInt::New();
+  DataArrayIdType* a1=DataArrayIdType::New();
   DataArrayDouble* a2=DataArrayDouble::New();
   //thanks to the entry point tinyV get from the 1st CORBA invocation,
   //resizing a1,a2 and sts.
@@ -127,7 +127,7 @@ void MEDCouplingMeshClient::fillMeshFromCorbaData(MEDCouplingMesh *meshCpp, SALO
   SALOME_TYPES::ListOfDouble *a2Corba;
   meshPtr->getSerialisationData(a1Corba,a2Corba);
   int myLgth=a1Corba->length();
-  int *ptToFill=a1->getPointer();
+  mcIdType *ptToFill=a1->getPointer();
   for(int i=0;i<myLgth;i++)
     ptToFill[i]=(*a1Corba)[i];
   delete a1Corba;

diff --git a/src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.cxx b/src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.cxx
index f9a4e9378d82e1ea10b6d296a2821cc04d0c73ec..962efa1c7e09946f94da62dbc4d686fabc7f3c1e 100644 (file)
--- a/src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.cxx
+++ b/src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.cxx
@@ -50,7 +50,7 @@ void MEDCouplingMultiFieldsClient::BuildFullMultiFieldsCorbaFetch(MEDCouplingMul
   CORBA::Long nbOfFields;
   CORBA::Long nbOfMeshes=fieldPtr->getMainTinyInfo(tinyL,tinyD,nbOfArrays,nbOfFields);
   int tinyLgth=tinyL->length();
-  std::vector<int> mainI(tinyLgth);
+  std::vector<mcIdType> mainI(tinyLgth);
   for(int i=0;i<tinyLgth;i++)
     mainI[i]=(*tinyL)[i];
   delete tinyL; tinyL=0;
@@ -83,7 +83,7 @@ void MEDCouplingMultiFieldsClient::BuildFullMultiFieldsCorbaFetch(MEDCouplingMul
     {
       fieldPtr->getTinyInfo(i,tinyL,tinyD,tinyS);
       int tinyLgth2=tinyL->length();
-      std::vector<int> tinyLV(tinyLgth2);
+      std::vector<mcIdType> tinyLV(tinyLgth2);
       for(int j=0;j<tinyLgth2;j++)
         tinyLV[j]=(*tinyL)[j];
       delete tinyL; tinyL=0;
@@ -102,13 +102,13 @@ void MEDCouplingMultiFieldsClient::BuildFullMultiFieldsCorbaFetch(MEDCouplingMul
       TypeOfField type=(TypeOfField) tinyLV[0];
       MEDCouplingFieldTemplate *f1=MEDCouplingFieldTemplate::New(type);
       //
-      DataArrayInt *array0;
+      DataArrayIdType *array0;
       f1->resizeForUnserialization(tinyLV,array0);
       if(array0)
         {
           fieldPtr->getSerialisationData(i,tinyL);
           tinyLgth2=tinyL->length();
-          int *ptr=array0->getPointer();
+          mcIdType *ptr=array0->getPointer();
           for(int j=0;j<tinyLgth2;j++)
             ptr[j]=(*tinyL)[j];
           delete tinyL; tinyL=0;

diff --git a/src/MEDCouplingCorba/DataArrayDoubleServant.cxx b/src/MEDCouplingCorba/DataArrayDoubleServant.cxx
index 4ae12f64b4e8e8ce8357a0dad454bc375f94fe02..2efc1e610c04ff989a2850b892647a252337fb7a 100644 (file)
--- a/src/MEDCouplingCorba/DataArrayDoubleServant.cxx
+++ b/src/MEDCouplingCorba/DataArrayDoubleServant.cxx
@@ -30,7 +30,7 @@ DataArrayDoubleServant::DataArrayDoubleServant(const DataArrayDouble *cppPointer
 void DataArrayDoubleServant::getTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfString_out sa)
 {
   la=new SALOME_TYPES::ListOfLong;
-  std::vector<int> tinyInfo;
+  std::vector<mcIdType> tinyInfo;
   getPointer()->getTinySerializationIntInformation(tinyInfo);
   la->length(tinyInfo.size());
   for(int i=0;i<(int)tinyInfo.size();i++)

diff --git a/src/MEDCouplingCorba/DataArrayIntServant.cxx b/src/MEDCouplingCorba/DataArrayIntServant.cxx
index 560779be6f99aafaa57983e0ce6683bde24ecaec..174b528198c486cea5e26f2245ec10631ca02176 100644 (file)
--- a/src/MEDCouplingCorba/DataArrayIntServant.cxx
+++ b/src/MEDCouplingCorba/DataArrayIntServant.cxx
@@ -30,7 +30,7 @@ DataArrayIntServant::DataArrayIntServant(const DataArrayInt *cppPointer):DataArr
 void DataArrayIntServant::getTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfString_out sa)
 {
   la=new SALOME_TYPES::ListOfLong;
-  std::vector<int> tinyInfo;
+  std::vector<mcIdType> tinyInfo;
   getPointer()->getTinySerializationIntInformation(tinyInfo);
   la->length(tinyInfo.size());
   for(int i=0;i<(int)tinyInfo.size();i++)

diff --git a/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.cxx b/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.cxx
index 3feb67cc7a3b34a63ece135d9ab71b97a20017cb..bb529fed30d60071675771b343db5a00fc15a165 100644 (file)
--- a/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.cxx
+++ b/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.cxx
@@ -51,7 +51,7 @@ SALOME_TYPES::ListOfString *MEDCouplingFieldDoubleServant::getInfoOnComponents()
 void MEDCouplingFieldDoubleServant::getTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfDouble_out da, SALOME_TYPES::ListOfString_out sa)
 {
   la=new SALOME_TYPES::ListOfLong;
-  std::vector<int> tinyInfo;
+  std::vector<mcIdType> tinyInfo;
   getPointer()->getTinySerializationIntInformation(tinyInfo);
   la->length(tinyInfo.size());
   for(int i=0;i<(int)tinyInfo.size();i++)
@@ -75,16 +75,16 @@ void MEDCouplingFieldDoubleServant::getTinyInfo(SALOME_TYPES::ListOfLong_out la,
 void MEDCouplingFieldDoubleServant::getSerialisationData(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfDouble2_out da2)
 {
   std::vector<DataArrayDouble *> arrays;
-  DataArrayInt *dataInt;
+  DataArrayIdType *dataInt;
   getPointer()->serialize(dataInt,arrays);
   //
   la=new SALOME_TYPES::ListOfLong;
   if(dataInt)
     {
-      int lgth=dataInt->getNbOfElems();
-      const int *ptr=dataInt->getConstPointer();
+      mcIdType lgth=dataInt->getNbOfElems();
+      const mcIdType *ptr=dataInt->getConstPointer();
       la->length(lgth);
-      for(int i=0;i<lgth;i++)
+      for(mcIdType i=0;i<lgth;i++)
         (*la)[i]=ptr[i];
     }
   else

diff --git a/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.cxx b/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.cxx
index 17ac95fc8faed9ca5743d23f3a1cf95c7f8a238a..a920c87de57fea0cb8d68f01525c98af63267b41 100644 (file)
--- a/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.cxx
+++ b/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.cxx
@@ -32,7 +32,7 @@ MEDCouplingFieldTemplateServant::MEDCouplingFieldTemplateServant(const MEDCoupli
 void MEDCouplingFieldTemplateServant::getTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfDouble_out da, SALOME_TYPES::ListOfString_out sa)
 {
   la=new SALOME_TYPES::ListOfLong;
-  std::vector<int> tinyInfo;
+  std::vector<mcIdType> tinyInfo;
   getPointer()->getTinySerializationIntInformation(tinyInfo);
   la->length(tinyInfo.size());
   for(int i=0;i<(int)tinyInfo.size();i++)
@@ -55,16 +55,16 @@ void MEDCouplingFieldTemplateServant::getTinyInfo(SALOME_TYPES::ListOfLong_out l
 
 void MEDCouplingFieldTemplateServant::getSerialisationData(SALOME_TYPES::ListOfLong_out la)
 {
-  DataArrayInt *dataInt;
+  DataArrayIdType *dataInt;
   getPointer()->serialize(dataInt);
   //
   la=new SALOME_TYPES::ListOfLong;
   if(dataInt)
     {
-      int lgth=dataInt->getNbOfElems();
-      const int *ptr=dataInt->getConstPointer();
+      mcIdType lgth=dataInt->getNbOfElems();
+      const mcIdType *ptr=dataInt->getConstPointer();
       la->length(lgth);
-      for(int i=0;i<lgth;i++)
+      for(mcIdType i=0;i<lgth;i++)
         (*la)[i]=ptr[i];
     }
   else

diff --git a/src/MEDCouplingCorba/MEDCouplingMeshServant.cxx b/src/MEDCouplingCorba/MEDCouplingMeshServant.cxx
index 4ad005aa599fa7cf985f7cd3bab5c0844ef5cba9..c0042d3c6ed3087317dae3269a2adf4b0e083b20 100644 (file)
--- a/src/MEDCouplingCorba/MEDCouplingMeshServant.cxx
+++ b/src/MEDCouplingCorba/MEDCouplingMeshServant.cxx
@@ -39,7 +39,7 @@ void MEDCouplingMeshServant::getTinyInfo(SALOME_TYPES::ListOfDouble_out da, SALO
   da=new SALOME_TYPES::ListOfDouble;
   la=new SALOME_TYPES::ListOfLong;
   std::vector<double> tinyInfoD;
-  std::vector<int> tinyInfoI;
+  std::vector<mcIdType> tinyInfoI;
   std::vector<std::string> tinyInfoS;
   getPointer()->getTinySerializationInformation(tinyInfoD,tinyInfoI,tinyInfoS);
   da->length(tinyInfoD.size());
@@ -58,14 +58,14 @@ void MEDCouplingMeshServant::getTinyInfo(SALOME_TYPES::ListOfDouble_out da, SALO
 
 void MEDCouplingMeshServant::getSerialisationData(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfDouble_out da)
 {
-  DataArrayInt *array1;
+  DataArrayIdType *array1;
   DataArrayDouble *array2;
   getPointer()->serialize(array1,array2);
   la=new SALOME_TYPES::ListOfLong;
   if(array1)
     {
       int lgth=array1->getNbOfElems();
-      const int *data=array1->getConstPointer();
+      const mcIdType *data=array1->getConstPointer();
       la->length(lgth);
       for(int i=0;i<lgth;i++)
         (*la)[i]=data[i];

diff --git a/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.cxx b/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.cxx
index 0f5acf3e03c78a34416e014ddb82ebdaef41d714..ec67959ec535c751d807b138f753671f87ee2fe7 100644 (file)
--- a/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.cxx
+++ b/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.cxx
@@ -80,7 +80,7 @@ SALOME_TYPES::ListOfString *MEDCouplingMultiFieldsServant::getInfoOnComponents()
 
 CORBA::Long MEDCouplingMultiFieldsServant::getMainTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfDouble_out da, CORBA::Long& nbOfArrays, CORBA::Long& nbOfFields)
 {
-  std::vector<int> tinyInfo;
+  std::vector<mcIdType> tinyInfo;
   std::vector<double> tinyInfo2;
   int nbOfDiffMeshes, nbOfDiffArr;
   nbOfFields=getPointer()->getNumberOfFields();
@@ -103,7 +103,7 @@ void MEDCouplingMultiFieldsServant::getTinyInfo(CORBA::Long id, SALOME_TYPES::Li
   const MEDCouplingFieldDouble *f=getPointer()->getFieldWithId(id);
   MEDCouplingFieldTemplate *f2=MEDCouplingFieldTemplate::New(*f);
   la=new SALOME_TYPES::ListOfLong;
-  std::vector<int> tinyInfo;
+  std::vector<mcIdType> tinyInfo;
   f2->getTinySerializationIntInformation(tinyInfo);
   la->length(tinyInfo.size());
   for(int i=0;i<(int)tinyInfo.size();i++)
@@ -129,16 +129,16 @@ void MEDCouplingMultiFieldsServant::getSerialisationData(CORBA::Long id, SALOME_
 {
   const MEDCouplingFieldDouble *f=getPointer()->getFieldWithId(id);
   MEDCouplingFieldTemplate *f2=MEDCouplingFieldTemplate::New(*f);
-  DataArrayInt *dataInt;
+  DataArrayIdType *dataInt;
   f2->serialize(dataInt);
   //
   la=new SALOME_TYPES::ListOfLong;
   if(dataInt)
     {
-      int lgth=dataInt->getNbOfElems();
-      const int *ptr=dataInt->getConstPointer();
+      mcIdType lgth=dataInt->getNbOfElems();
+      const mcIdType *ptr=dataInt->getConstPointer();
       la->length(lgth);
-      for(int i=0;i<lgth;i++)
+      for(mcIdType i=0;i<lgth;i++)
         (*la)[i]=ptr[i];
     }
   else

diff --git a/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.cxx b/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.cxx
index 6ecfd9c111e04e799003c255f5d36740af717006..c286f03e7c328e2a37f95da9cf71e81402a1b59d 100644 (file)
--- a/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.cxx
+++ b/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.cxx
@@ -39,7 +39,7 @@ namespace SALOME_TEST
   MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build1DMesh()
   {
     double coords[4]={ 0.0, 0.3, 0.75, 1.0 };
-    int conn[2*3]={ 0,1, 1,2, 2,3 };
+    mcIdType conn[2*3]={ 0,1, 1,2, 2,3 };
     MEDCoupling::MEDCouplingUMesh *mesh=MEDCoupling::MEDCouplingUMesh::New("1DMeshForCorba",1);
     mesh->setDescription("build1DMesh");
     mesh->allocateCells(3);
@@ -68,7 +68,7 @@ namespace SALOME_TEST
   MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build2DMesh()
   {
     double targetCoords[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 };
-    int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+    mcIdType targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
     MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(2);
     targetMesh->setName("MyMesh2D");
@@ -93,7 +93,7 @@ namespace SALOME_TEST
     double targetCoords[81]={ 0., 0., 0., 50., 0., 0. , 200., 0., 0.  , 0., 50., 0., 50., 50., 0. , 200., 50., 0.,   0., 200., 0., 50., 200., 0. , 200., 200., 0. ,
                               0., 0., 50., 50., 0., 50. , 200., 0., 50.  , 0., 50., 50., 50., 50., 50. , 200., 50., 50.,   0., 200., 50., 50., 200., 50. , 200., 200., 50. ,
                               0., 0., 200., 50., 0., 200. , 200., 0., 200.  , 0., 50., 200., 50., 50., 200. , 200., 50., 200.,   0., 200., 200., 50., 200., 200. , 200., 200., 200. };
-    int targetConn[64]={0,1,4,3,9,10,13,12, 1,2,5,4,10,11,14,13, 3,4,7,6,12,13,16,15, 4,5,8,7,13,14,17,16,
+    mcIdType targetConn[64]={0,1,4,3,9,10,13,12, 1,2,5,4,10,11,14,13, 3,4,7,6,12,13,16,15, 4,5,8,7,13,14,17,16,
                         9,10,13,12,18,19,22,21, 10,11,14,13,19,20,23,22, 12,13,16,15,21,22,25,24, 13,14,17,16,22,23,26,25};
     MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(3);
@@ -115,7 +115,7 @@ namespace SALOME_TEST
   MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build3DSurfMesh()
   {
     double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
-    int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+    mcIdType targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
     MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(2);
     targetMesh->setName("MyMesh3DSurf");
@@ -141,7 +141,7 @@ namespace SALOME_TEST
   MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build0DMesh()
   {
     double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
-    const int targetConn[]={0,1,2,3,4,5,7,6};
+    const mcIdType targetConn[]={0,1,2,3,4,5,7,6};
     MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(0);
     targetMesh->allocateCells(8);
@@ -228,7 +228,7 @@ namespace SALOME_TEST
     targetMesh->setTimeUnit("us");
     targetMesh->setName("Example of IMesh");
     targetMesh->setDescription("buildIMesh");
-    int ns[3]={6,7,8};
+    mcIdType ns[3]={6,7,8};
     double orig[3]={4.25,3.75,-6.125};
     double inter[3]={0.5,0.375,0.75};
     targetMesh->setSpaceDimension(3);
@@ -252,7 +252,7 @@ namespace SALOME_TEST
     a1->rearrange(3);
     targetMesh->setCoords(a1);
     a1->decrRef();
-    int structure[2]={4,5};
+    mcIdType structure[2]={4,5};
     targetMesh->setNodeGridStructure(structure,structure+2);
     //
     targetMesh->checkConsistencyLight();
@@ -268,9 +268,9 @@ namespace SALOME_TEST
     targetMesh->setDescription("My Description of 1SGTU");
     MEDCoupling::DataArrayDouble *a1=MEDCoupling::DataArrayDouble::New(); a1->alloc(10,3); a1->setInfoOnComponent(0,"X1 [m]");  a1->setInfoOnComponent(1,"YY2 [km]"); a1->setInfoOnComponent(2,"ZZZ3 [km]");
     const double coords[30]={1.,1.,0.,2.,1.,0.,3.,1.,0.,1.,0.,0.,2.,0.,0.,0.,0.,0.,0.,1.,0.,3.,0.,0.,4.,0.,0.,4.,1.,0.};
-    const int conn[16]={6,0,3,5,3,0,1,4,1,2,7,4,8,7,2,9};
+    const mcIdType conn[16]={6,0,3,5,3,0,1,4,1,2,7,4,8,7,2,9};
     std::copy(coords,coords+30,a1->getPointer()); targetMesh->setCoords(a1); a1->decrRef();
-    MEDCoupling::DataArrayInt *a2(MEDCoupling::DataArrayInt::New()); a2->alloc(4*4,1);
+    MEDCoupling::DataArrayIdType *a2(MEDCoupling::DataArrayIdType::New()); a2->alloc(4*4,1);
     std::copy(conn,conn+16,a2->getPointer());
     targetMesh->setNodalConnectivity(a2); a2->decrRef();
     //
@@ -287,12 +287,12 @@ namespace SALOME_TEST
     targetMesh->setDescription("My Description of 1DGTU");
     MEDCoupling::DataArrayDouble *a1=MEDCoupling::DataArrayDouble::New(); a1->alloc(10,3); a1->setInfoOnComponent(0,"X1 [m]");  a1->setInfoOnComponent(1,"YY2 [km]"); a1->setInfoOnComponent(2,"ZZZ3 [km]");
     const double coords[30]={1.,1.,0.,2.,1.,0.,3.,1.,0.,1.,0.,0.,2.,0.,0.,0.,0.,0.,0.,1.,0.,3.,0.,0.,4.,0.,0.,4.,1.,0.};
-    const int conn[15]={6,0,3,5,3,0,1,4,1,2,7,4,8,7,2};
-    const int conni[5]={0,4,8,12,15};
+    const mcIdType conn[15]={6,0,3,5,3,0,1,4,1,2,7,4,8,7,2};
+    const mcIdType conni[5]={0,4,8,12,15};
     std::copy(coords,coords+30,a1->getPointer()); targetMesh->setCoords(a1); a1->decrRef();
-    MEDCoupling::DataArrayInt *a2(MEDCoupling::DataArrayInt::New()); a2->alloc(15,1);
+    MEDCoupling::DataArrayIdType *a2(MEDCoupling::DataArrayIdType::New()); a2->alloc(15,1);
     std::copy(conn,conn+15,a2->getPointer());
-    MEDCoupling::DataArrayInt *a3(MEDCoupling::DataArrayInt::New()); a3->alloc(5,1);
+    MEDCoupling::DataArrayIdType *a3(MEDCoupling::DataArrayIdType::New()); a3->alloc(5,1);
     std::copy(conni,conni+5,a3->getPointer());
     targetMesh->setNodalConnectivity(a2,a3); a2->decrRef(); a3->decrRef();
     //

diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt
index 6284e9f5c841d586758643af7c960571d29abd1d..570b7648b14122d799a7415fe415569bfb8fa95c 100644 (file)
--- a/src/MEDCouplingCorba_Swig/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt
@@ -28,6 +28,9 @@ INCLUDE(${SWIG_USE_FILE})
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES SWIG_FLAGS "-py3")
 SET(SWIG_MODULE_MEDCouplingCorba_EXTRA_FLAGS "${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}")
+IF(MEDCOUPLING_USE_64BIT_IDS)
+  STRING(APPEND SWIG_MODULE_MEDCouplingCorba_EXTRA_FLAGS ";-DMEDCOUPLING_USE_64BIT_IDS")
+ENDIF(MEDCOUPLING_USE_64BIT_IDS)
 
 SET(MEDCouplingCorba_SWIG_DPYS_FILES
     MEDCouplingCorbaTypemaps.i)

diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
index a45af8f4003fecaf473e04d99de4478bdf1678c8..fa7f4cf2309b6aba1ddd714fccf21eb86945f73d 100644 (file)
--- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
@@ -26,6 +26,9 @@ INCLUDE(${SWIG_USE_FILE})
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_FLAGS "-py3")
 SET(SWIG_MODULE_MEDCouplingClient_EXTRA_FLAGS "${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}")
+IF(MEDCOUPLING_USE_64BIT_IDS)
+  STRING(APPEND SWIG_MODULE_MEDCouplingClient_EXTRA_FLAGS ";-DMEDCOUPLING_USE_64BIT_IDS")
+ENDIF(MEDCOUPLING_USE_64BIT_IDS)
 
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}