Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ParaUMesh.redistributeCells implementation.
[tools/medcoupling.git]
/
src
/
MEDCoupling
/
MEDCouplingFieldTemplate.cxx
diff --git
a/src/MEDCoupling/MEDCouplingFieldTemplate.cxx
b/src/MEDCoupling/MEDCouplingFieldTemplate.cxx
index a9871a43dba95729246d7dfff5fd40a3fcbb8659..4c10da4950b2b4531813824f76cb892fae9d2b94 100644
(file)
--- a/
src/MEDCoupling/MEDCouplingFieldTemplate.cxx
+++ b/
src/MEDCoupling/MEDCouplingFieldTemplate.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D
+// Copyright (C) 2007-20
20
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-140,17
+140,17
@@
std::string MEDCouplingFieldTemplate::advancedRepr() const
return simpleRepr();
}
return simpleRepr();
}
-void MEDCouplingFieldTemplate::getTinySerializationIntInformation(std::vector<
int
>& tinyInfo) const
+void MEDCouplingFieldTemplate::getTinySerializationIntInformation(std::vector<
mcIdType
>& tinyInfo) const
{
if(!((const MEDCouplingFieldDiscretization *)_type))
throw INTERP_KERNEL::Exception("No spatial discretization underlying this field to perform getTinySerializationIntInformation !");
tinyInfo.clear();
{
if(!((const MEDCouplingFieldDiscretization *)_type))
throw INTERP_KERNEL::Exception("No spatial discretization underlying this field to perform getTinySerializationIntInformation !");
tinyInfo.clear();
- tinyInfo.push_back(
(int)_type->getEnum(
));
- tinyInfo.push_back(
(int)_nature
);
- std::vector<
int
> tinyInfo2;
+ tinyInfo.push_back(
ToIdType(_type->getEnum()
));
+ tinyInfo.push_back(
ToIdType(_nature)
);
+ std::vector<
mcIdType
> tinyInfo2;
_type->getTinySerializationIntInformation(tinyInfo2);
tinyInfo.insert(tinyInfo.end(),tinyInfo2.begin(),tinyInfo2.end());
_type->getTinySerializationIntInformation(tinyInfo2);
tinyInfo.insert(tinyInfo.end(),tinyInfo2.begin(),tinyInfo2.end());
- tinyInfo.push_back(
(int)tinyInfo2.size(
));
+ tinyInfo.push_back(
ToIdType(tinyInfo2.size()
));
}
void MEDCouplingFieldTemplate::getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const
}
void MEDCouplingFieldTemplate::getTinySerializationDbleInformation(std::vector<double>& tinyInfo) const
@@
-168,16
+168,16
@@
void MEDCouplingFieldTemplate::getTinySerializationStrInformation(std::vector<st
tinyInfo.push_back(_desc);
}
tinyInfo.push_back(_desc);
}
-void MEDCouplingFieldTemplate::resizeForUnserialization(const std::vector<
int>& tinyInfoI, DataArrayInt
*&dataInt)
+void MEDCouplingFieldTemplate::resizeForUnserialization(const std::vector<
mcIdType>& tinyInfoI, DataArrayIdType
*&dataInt)
{
if(!((const MEDCouplingFieldDiscretization *)_type))
throw INTERP_KERNEL::Exception("No spatial discretization underlying this field to perform resizeForUnserialization !");
dataInt=0;
{
if(!((const MEDCouplingFieldDiscretization *)_type))
throw INTERP_KERNEL::Exception("No spatial discretization underlying this field to perform resizeForUnserialization !");
dataInt=0;
- std::vector<
int
> tinyInfoITmp(tinyInfoI.begin()+2,tinyInfoI.end());
+ std::vector<
mcIdType
> tinyInfoITmp(tinyInfoI.begin()+2,tinyInfoI.end());
_type->resizeForUnserialization(tinyInfoITmp,dataInt);
}
_type->resizeForUnserialization(tinyInfoITmp,dataInt);
}
-void MEDCouplingFieldTemplate::finishUnserialization(const std::vector<
int
>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS)
+void MEDCouplingFieldTemplate::finishUnserialization(const std::vector<
mcIdType
>& tinyInfoI, const std::vector<double>& tinyInfoD, const std::vector<std::string>& tinyInfoS)
{
if(!((const MEDCouplingFieldDiscretization *)_type))
throw INTERP_KERNEL::Exception("No spatial discretization underlying this field to perform finishUnserialization !");
{
if(!((const MEDCouplingFieldDiscretization *)_type))
throw INTERP_KERNEL::Exception("No spatial discretization underlying this field to perform finishUnserialization !");
@@
-187,7
+187,7
@@
void MEDCouplingFieldTemplate::finishUnserialization(const std::vector<int>& tin
_desc=tinyInfoS[1];
}
_desc=tinyInfoS[1];
}
-void MEDCouplingFieldTemplate::serialize(DataArrayI
nt
*&dataInt) const
+void MEDCouplingFieldTemplate::serialize(DataArrayI
dType
*&dataInt) const
{
_type->getSerializationIntArray(dataInt);
}
{
_type->getSerializationIntArray(dataInt);
}