Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#18963 Minimize compiler warnings
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_W_Field.cxx
diff --git
a/src/DriverMED/DriverMED_W_Field.cxx
b/src/DriverMED/DriverMED_W_Field.cxx
index 71082464c27dc547bd3fd487494adf3648cca0b3..197cd1cb8271afc209cf3af5c3b12eb7e6022e5f 100644
(file)
--- a/
src/DriverMED/DriverMED_W_Field.cxx
+++ b/
src/DriverMED/DriverMED_W_Field.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-33,7
+33,6
@@
#include "MED_Wrapper.hxx"
#include "SMDS_IteratorOnIterators.hxx"
#include "SMDS_MeshElement.hxx"
#include "MED_Wrapper.hxx"
#include "SMDS_IteratorOnIterators.hxx"
#include "SMDS_MeshElement.hxx"
-#include "SMDS_PolyhedralVolumeOfNodes.hxx"
#include "SMDS_SetIterator.hxx"
#include "SMESHDS_Mesh.hxx"
#include "SMDS_SetIterator.hxx"
#include "SMESHDS_Mesh.hxx"
@@
-95,19
+94,19
@@
bool DriverMED_W_Field::Set(SMESHDS_Mesh * mesh,
if ( _nbElemsByGeom.empty() || _elemType != type )
{
_elemType = type;
if ( _nbElemsByGeom.empty() || _elemType != type )
{
_elemType = type;
- _nbElemsByGeom.resize( 1, make_pair( SMDSEntity_Last, 0 ));
+ _nbElemsByGeom.resize( 1,
std::
make_pair( SMDSEntity_Last, 0 ));
// count nb of elems of each geometry
for ( int iG = 0; iG < SMDSEntity_Last; ++iG )
{
SMDSAbs_EntityType geom = (SMDSAbs_EntityType) iG;
// count nb of elems of each geometry
for ( int iG = 0; iG < SMDSEntity_Last; ++iG )
{
SMDSAbs_EntityType geom = (SMDSAbs_EntityType) iG;
- SMDSAbs_ElementType
t = SMDS_MeshCell::toSmds
Type( geom );
+ SMDSAbs_ElementType
t = SMDS_MeshCell::Elem
Type( geom );
if ( t != _elemType ) continue;
nbElems = mesh->GetMeshInfo().NbElements( geom );
if ( nbElems < 1 ) continue;
if ( t != _elemType ) continue;
nbElems = mesh->GetMeshInfo().NbElements( geom );
if ( nbElems < 1 ) continue;
- _nbElemsByGeom.push_back( make_pair( geom, nbElems + _nbElemsByGeom.back().second ));
+ _nbElemsByGeom.push_back(
std::
make_pair( geom, nbElems + _nbElemsByGeom.back().second ));
}
// add nodes of missing 0D elements on VERTEXes
if ( _addODOnVertices && _elemType == SMDSAbs_0DElement )
}
// add nodes of missing 0D elements on VERTEXes
if ( _addODOnVertices && _elemType == SMDSAbs_0DElement )
@@
-118,8
+117,8
@@
bool DriverMED_W_Field::Set(SMESHDS_Mesh * mesh,
if ( !nodes.empty() )
{
if ( _nbElemsByGeom.size() == 1 )
if ( !nodes.empty() )
{
if ( _nbElemsByGeom.size() == 1 )
- _nbElemsByGeom.push_back( make_pair( SMDSEntity_0D, 0));
- _nbElemsByGeom.push_back( make_pair( SMDSEntity_Node,
+ _nbElemsByGeom.push_back(
std::
make_pair( SMDSEntity_0D, 0));
+ _nbElemsByGeom.push_back(
std::
make_pair( SMDSEntity_Node,
nodes.size() + _nbElemsByGeom.back().second ));
}
}
nodes.size() + _nbElemsByGeom.back().second ));
}
}
@@
-157,7
+156,7
@@
bool DriverMED_W_Field::Set(SMESHDS_Mesh * mesh,
else
_dblValues.reserve( nbElems * nbComps );
else
_dblValues.reserve( nbElems * nbComps );
- return nbElems
*
nbComps;
+ return nbElems
&&
nbComps;
}
//================================================================================
}
//================================================================================
@@
-168,7
+167,7
@@
bool DriverMED_W_Field::Set(SMESHDS_Mesh * mesh,
void DriverMED_W_Field::SetCompName(const int iComp, const char* name)
{
void DriverMED_W_Field::SetCompName(const int iComp, const char* name)
{
- if ( _compNames.size() <= iComp )
+ if (
(int)
_compNames.size() <= iComp )
_compNames.resize( iComp + 1 );
_compNames[ iComp ] = name;
}
_compNames.resize( iComp + 1 );
_compNames[ iComp ] = name;
}
@@
-254,7
+253,11
@@
Driver_Mesh::Status DriverMED_W_Field::Perform()
if ( !myMesh )
return addMessage("Supporting mesh not set", /*isFatal=*/true );
if ( !myMesh )
return addMessage("Supporting mesh not set", /*isFatal=*/true );
- MED::PWrapper medFile = MED::CrWrapper( myFile, MED::eV2_2 );
+ int version = -1, major, minor, release;
+ if ( MED::GetMEDVersion( myFile, major, minor, release ))
+ version = major * 10 + minor;
+
+ MED::PWrapper medFile = MED::CrWrapperW( myFile, version );
MED::PMeshInfo meshInfo;
if ( myMeshId > 0 )
{
MED::PMeshInfo meshInfo;
if ( myMeshId > 0 )
{
@@
-277,7
+280,7
@@
Driver_Mesh::Status DriverMED_W_Field::Perform()
( !myMeshName.empty() && meshInfo->GetName() != myMeshName ))
{
myMeshId = -1;
( !myMeshName.empty() && meshInfo->GetName() != myMeshName ))
{
myMeshId = -1;
- return addMessage("Specified mesh not found in the file", /*isFatal=*/true );
+ return addMessage("
DriverMED_W_Field:
Specified mesh not found in the file", /*isFatal=*/true );
}
// create a field
}
// create a field
@@
-314,7
+317,7
@@
Driver_Mesh::Status DriverMED_W_Field::Perform()
SMDSAbs_EntityType smdsType = _nbElemsByGeom[iG].first;
MED::EGeometrieElement medType = (MED::EGeometrieElement) DriverMED::GetMedGeoType( smdsType );
int nbElems = _nbElemsByGeom[iG].second - _nbElemsByGeom[iG-1].second;
SMDSAbs_EntityType smdsType = _nbElemsByGeom[iG].first;
MED::EGeometrieElement medType = (MED::EGeometrieElement) DriverMED::GetMedGeoType( smdsType );
int nbElems = _nbElemsByGeom[iG].second - _nbElemsByGeom[iG-1].second;
- type2nb.insert( make_pair( medType, nbElems ));
+ type2nb.insert(
std::
make_pair( medType, nbElems ));
}
MED::EEntiteMaillage entity = ( _elemType == SMDSAbs_Node ? MED::eNOEUD : MED::eMAILLE );
}
MED::EEntiteMaillage entity = ( _elemType == SMDSAbs_Node ? MED::eNOEUD : MED::eMAILLE );
@@
-327,7
+330,7
@@
Driver_Mesh::Status DriverMED_W_Field::Perform()
MED::PIntTimeStampValue timeStampIntVal = timeStampVal;
// set values
MED::PIntTimeStampValue timeStampIntVal = timeStampVal;
// set values
- int iVal = 0
, i, nbE
;
+ int iVal = 0;
MED::TFloat* ptrDbl = 0;
MED::TInt* ptrInt = 0;
for ( size_t iG = 1; iG < _nbElemsByGeom.size(); ++iG )
MED::TFloat* ptrDbl = 0;
MED::TInt* ptrInt = 0;
for ( size_t iG = 1; iG < _nbElemsByGeom.size(); ++iG )
@@
-354,9
+357,11
@@
Driver_Mesh::Status DriverMED_W_Field::Perform()
_dblValues.clear();
_intValues.clear();
_dblValues.clear();
_intValues.clear();
+
+ return DRS_OK;
}
}
-namespace DriverMED // Impleme
tation of fu
ctions declared in DriverMED.hxx
+namespace DriverMED // Impleme
ntation of fun
ctions declared in DriverMED.hxx
{
//================================================================================
/*!
{
//================================================================================
/*!
@@
-391,6
+396,7
@@
namespace DriverMED // Implemetation of fuctions declared in DriverMED.hxx
theVec[ SMDSEntity_TriQuad_Hexa ] = MED::eHEXA27 ;
theVec[ SMDSEntity_Penta ] = MED::ePENTA6 ;
theVec[ SMDSEntity_Quad_Penta ] = MED::ePENTA15 ;
theVec[ SMDSEntity_TriQuad_Hexa ] = MED::eHEXA27 ;
theVec[ SMDSEntity_Penta ] = MED::ePENTA6 ;
theVec[ SMDSEntity_Quad_Penta ] = MED::ePENTA15 ;
+ theVec[ SMDSEntity_BiQuad_Penta ] = MED::ePENTA18 ;
theVec[ SMDSEntity_Hexagonal_Prism ] = MED::eOCTA12 ;
theVec[ SMDSEntity_Polyhedra ] = MED::ePOLYEDRE;
//theVec[ SMDSEntity_Quad_Polyhedra ] = MED::ePOLYEDRE; // !!
theVec[ SMDSEntity_Hexagonal_Prism ] = MED::eOCTA12 ;
theVec[ SMDSEntity_Polyhedra ] = MED::ePOLYEDRE;
//theVec[ SMDSEntity_Quad_Polyhedra ] = MED::ePOLYEDRE; // !!