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
Fix merge errors post 8.3.0
[tools/medcoupling.git]
/
src
/
MEDCoupling
/
MEDCouplingField.cxx
diff --git
a/src/MEDCoupling/MEDCouplingField.cxx
b/src/MEDCoupling/MEDCouplingField.cxx
index 293d8aede9692c3c2e945b99b95a63f8c5e2b9e9..4afc32168ddf94a64f24540f6ddd8a0bd6487bc4 100644
(file)
--- a/
src/MEDCoupling/MEDCouplingField.cxx
+++ b/
src/MEDCoupling/MEDCouplingField.cxx
@@
-236,6
+236,8
@@
NatureOfField MEDCouplingField::getNature() const
void MEDCouplingField::setNature(NatureOfField nat)
{
MEDCouplingNatureOfField::GetRepr(nat);//generate a throw if nat not recognized
+ if(_type)
+ _type->checkCompatibilityWithNature(nat);
_nature=nat;
}