From 577f3435638cdcc47a18557af14efa4581c22fec Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 26 Apr 2011 06:17:10 +0000 Subject: [PATCH] Coding rules. --- src/INTERP_KERNEL/CellModel.cxx | 4 +- src/INTERP_KERNEL/CellModel.hxx | 2 +- .../GaussPoints/InterpKernelGaussCoords.cxx | 2 +- src/INTERP_KERNEL/Geometric2DIntersector.txx | 4 +- .../InterpKernelCellSimplify.cxx | 4 +- src/INTERP_KERNEL/IntersectorCU2D.txx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP0P1.txx | 2 +- src/INTERP_KERNEL/PlanarIntersectorP1P0.txx | 2 +- .../PlanarIntersectorP1P0Bary.txx | 2 +- .../PointLocator2DIntersector.txx | 4 +- .../PointLocator3DIntersectorP0P0.txx | 2 +- .../PointLocator3DIntersectorP0P1.txx | 2 +- .../PointLocator3DIntersectorP1P0.txx | 2 +- .../PointLocator3DIntersectorP1P1.txx | 2 +- src/INTERP_KERNEL/PointLocatorAlgos.txx | 4 +- src/INTERP_KERNEL/SplitterTetra.txx | 8 ++-- src/MEDCoupling/MEDCouplingExtrudedMesh.cxx | 4 +- .../MEDCouplingFieldDiscretization.cxx | 14 +++---- .../MEDCouplingGaussLocalization.cxx | 8 ++-- src/MEDCoupling/MEDCouplingUMesh.cxx | 38 +++++++++---------- src/MEDCoupling/MEDCouplingUMeshDesc.cxx | 2 +- src/MEDLoader/MEDFileField.cxx | 6 +-- src/MEDLoader/MEDFileMeshElt.cxx | 4 +- src/MEDLoader/MEDLoader.cxx | 18 ++++----- 24 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/INTERP_KERNEL/CellModel.cxx b/src/INTERP_KERNEL/CellModel.cxx index 68a038d68..298e7f5f7 100644 --- a/src/INTERP_KERNEL/CellModel.cxx +++ b/src/INTERP_KERNEL/CellModel.cxx @@ -39,7 +39,7 @@ namespace INTERP_KERNEL std::map CellModel::_map_of_unique_instance; - const CellModel& CellModel::getCellModel(NormalizedCellType type) + const CellModel& CellModel::GetCellModel(NormalizedCellType type) { if(_map_of_unique_instance.empty()) buildUniqueInstance(); @@ -64,7 +64,7 @@ namespace INTERP_KERNEL { if(_type==type) return true; - const CellModel& other=getCellModel(type); + const CellModel& other=GetCellModel(type); if(_dim!=other.getDimension()) return false; bool b1=isQuadratic(); diff --git a/src/INTERP_KERNEL/CellModel.hxx b/src/INTERP_KERNEL/CellModel.hxx index 2125870d0..01e3551f3 100644 --- a/src/INTERP_KERNEL/CellModel.hxx +++ b/src/INTERP_KERNEL/CellModel.hxx @@ -40,7 +40,7 @@ namespace INTERP_KERNEL CellModel(NormalizedCellType type); static void buildUniqueInstance(); public: - INTERPKERNEL_EXPORT static const CellModel& getCellModel(NormalizedCellType type); + INTERPKERNEL_EXPORT static const CellModel& GetCellModel(NormalizedCellType type); INTERPKERNEL_EXPORT const char *getRepr() const; INTERPKERNEL_EXPORT bool isDynamic() const { return _dyn; } INTERPKERNEL_EXPORT bool isQuadratic() const { return _quadratic; } diff --git a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx index ba21d3c1b..350333d44 100644 --- a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx +++ b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx @@ -193,7 +193,7 @@ bool GaussInfo::isSatisfy() void GaussInfo::initLocalInfo() throw (INTERP_KERNEL::Exception) { bool aSatify = false; - const CellModel& cellModel=CellModel::getCellModel(_my_geometry); + const CellModel& cellModel=CellModel::GetCellModel(_my_geometry); switch( _my_geometry ) { case NORM_SEG2: diff --git a/src/INTERP_KERNEL/Geometric2DIntersector.txx b/src/INTERP_KERNEL/Geometric2DIntersector.txx index ef03918c2..ccb21ae71 100644 --- a/src/INTERP_KERNEL/Geometric2DIntersector.txx +++ b/src/INTERP_KERNEL/Geometric2DIntersector.txx @@ -166,7 +166,7 @@ namespace INTERP_KERNEL std::vector nodes(nbNodes); for(int i=0;i nodes(nbOfPoints); for(int i=0;i::_coordsT+OTT::coo2C(startOfCellNodeConn[i])*SPACEDIM); - if(CellModel::getCellModel(type).isQuadratic()) + if(CellModel::GetCellModel(type).isQuadratic()) return QuadraticPolygon::buildLinearPolygon(nodes); else return QuadraticPolygon::buildArcCirclePolygon(nodes); diff --git a/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx b/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx index f53e74789..bf5eed0a9 100644 --- a/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx +++ b/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx @@ -39,7 +39,7 @@ using namespace INTERP_KERNEL; INTERP_KERNEL::NormalizedCellType CellSimplify::simplifyDegeneratedCell(INTERP_KERNEL::NormalizedCellType type, const int *conn, int lgth, int *retConn, int& retLgth) throw(INTERP_KERNEL::Exception) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); std::set c(conn,conn+lgth); c.erase(-1); bool isObviousNonDegeneratedCell=((int)c.size()==lgth); @@ -104,7 +104,7 @@ INTERP_KERNEL::NormalizedCellType CellSimplify::tryToUnPoly2D(const int *conn, i int *CellSimplify::getFullPolyh3DCell(INTERP_KERNEL::NormalizedCellType type, const int *conn, int lgth, int& retNbOfFaces, int& retLgth) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); unsigned nbOfFaces=cm.getNumberOfSons2(conn,lgth); int *tmp=new int[nbOfFaces*(lgth+1)]; int *work=tmp; diff --git a/src/INTERP_KERNEL/IntersectorCU2D.txx b/src/INTERP_KERNEL/IntersectorCU2D.txx index e6174d823..533f9982c 100644 --- a/src/INTERP_KERNEL/IntersectorCU2D.txx +++ b/src/INTERP_KERNEL/IntersectorCU2D.txx @@ -60,7 +60,7 @@ namespace INTERP_KERNEL getUCoordinates( icellT, uCoords ); NormalizedCellType tT = INTER_CU::_meshU.getTypeOfElement( _TMIU(icellT)); - bool is_tgt_quad = CellModel::getCellModel(tT).isQuadratic(); + bool is_tgt_quad = CellModel::GetCellModel(tT).isQuadratic(); double quad[8] = { INTER_CU::_coordsC[0][icellS[0]], INTER_CU::_coordsC[1][icellS[1]], INTER_CU::_coordsC[0][icellS[0]+1], INTER_CU::_coordsC[1][icellS[1]], diff --git a/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx b/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx index 4f87fbaa7..2b867d406 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP0P1.txx @@ -79,7 +79,7 @@ namespace INTERP_KERNEL if(SPACEDIM==3) orientation=PlanarIntersector::projectionThis(&sourceCellCoordsTmp[0],quadrangle,sourceCellCoords.size()/SPACEDIM,4); NormalizedCellType tS=PlanarIntersector::_meshS.getTypeOfElement(OTT::indFC(iS)); - double surf=orientation*intersectGeometryWithQuadrangle(quadrangle,sourceCellCoordsTmp,CellModel::getCellModel(tS).isQuadratic()); + double surf=orientation*intersectGeometryWithQuadrangle(quadrangle,sourceCellCoordsTmp,CellModel::GetCellModel(tS).isQuadratic()); surf=PlanarIntersector::getValueRegardingOption(surf); if(surf!=0.) { diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx index 3bc961fa6..890ae9c70 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0.txx @@ -55,7 +55,7 @@ namespace INTERP_KERNEL int orientation=1; PlanarIntersector::getRealTargetCoordinates(OTT::indFC(icellT),targetCellCoords); NormalizedCellType tT=PlanarIntersector::_meshT.getTypeOfElement(OTT::indFC(icellT)); - bool isTargetQuad=CellModel::getCellModel(tT).isQuadratic(); + bool isTargetQuad=CellModel::GetCellModel(tT).isQuadratic(); typename MyMatrix::value_type& resRow=res[icellT]; for(typename std::vector::const_iterator iter=icellsS.begin();iter!=icellsS.end();iter++) { diff --git a/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx b/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx index dd59b8c42..4f39a0a65 100644 --- a/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx +++ b/src/INTERP_KERNEL/PlanarIntersectorP1P0Bary.txx @@ -76,7 +76,7 @@ namespace INTERP_KERNEL std::vector * tgtCoords = & tgtCellCoords; int tgtNbNodes = tgtCellCoords.size()/SPACEDIM; NormalizedCellType tT=PlanarIntersector::_meshT.getTypeOfElement(OTT::indFC(icellT)); - bool isTargetQuad=CellModel::getCellModel(tT).isQuadratic(); + bool isTargetQuad=CellModel::GetCellModel(tT).isQuadratic(); typename MyMatrix::value_type& resRow=res[icellT]; diff --git a/src/INTERP_KERNEL/PointLocator2DIntersector.txx b/src/INTERP_KERNEL/PointLocator2DIntersector.txx index f6a329047..ba4ab6724 100644 --- a/src/INTERP_KERNEL/PointLocator2DIntersector.txx +++ b/src/INTERP_KERNEL/PointLocator2DIntersector.txx @@ -128,7 +128,7 @@ namespace INTERP_KERNEL std::vector nodes(nbNodes); for(int i=0;i nodes(nbOfPoints); for(int i=0;i::_coordsT+OTT::coo2C(startOfCellNodeConn[i])*SPACEDIM); - if(CellModel::getCellModel(type).isQuadratic()) + if(CellModel::GetCellModel(type).isQuadratic()) return QuadraticPolygon::buildLinearPolygon(nodes); else return QuadraticPolygon::buildArcCirclePolygon(nodes); diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx index b88c0b468..8a5e2d339 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P0.txx @@ -63,7 +63,7 @@ namespace INTERP_KERNEL for(typename std::vector::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++) { NormalizedCellType tS=Intersector3DP0P0::_src_mesh.getTypeOfElement(OTT::indFC(*iterCellS)); - const CellModel& cmTypeS=CellModel::getCellModel(tS); + const CellModel& cmTypeS=CellModel::GetCellModel(tS); std::vector connOfCurCellS; Intersector3DP0P0::getConnOfSourceCell(OTT::indFC(*iterCellS),connOfCurCellS); if(PointLocatorAlgos::isElementContainsPointAlg3D(bary,&connOfCurCellS[0],connOfCurCellS.size(),coordsS,cmTypeS,_precision)) diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx index 1f84569d3..d25300bc9 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP0P1.txx @@ -59,7 +59,7 @@ namespace INTERP_KERNEL for(typename std::vector::const_iterator iterCellS=srcCells.begin();iterCellS!=srcCells.end();iterCellS++) { NormalizedCellType tS=Intersector3DP0P1::_src_mesh.getTypeOfElement(OTT::indFC(*iterCellS)); - const CellModel& cmTypeS=CellModel::getCellModel(tS); + const CellModel& cmTypeS=CellModel::GetCellModel(tS); std::vector connOfCurCellS; Intersector3DP0P1::getConnOfSourceCell(OTT::indFC(*iterCellS),connOfCurCellS); for(int nodeIdT=0;nodeIdT::_src_mesh.getTypeOfElement(OTT::indFC(*iterCellS)); if(tS!=NORM_TETRA4) throw INTERP_KERNEL::Exception("Invalid source cell detected for meshdim==3. Only TETRA4 supported !"); - const CellModel& cmTypeS=CellModel::getCellModel(tS); + const CellModel& cmTypeS=CellModel::GetCellModel(tS); std::vector connOfCurCellS; Intersector3DP1P0::getConnOfSourceCell(OTT::indFC(*iterCellS),connOfCurCellS); if( PointLocatorAlgos::isElementContainsPointAlg3D(baryT,&connOfCurCellS[0],connOfCurCellS.size(),coordsS,cmTypeS,_precision) ) diff --git a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx index 78bbb7655..b38e334dc 100644 --- a/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx +++ b/src/INTERP_KERNEL/PointLocator3DIntersectorP1P1.txx @@ -60,7 +60,7 @@ namespace INTERP_KERNEL NormalizedCellType tS=Intersector3DP1P1::_src_mesh.getTypeOfElement(OTT::indFC(*iterCellS)); if(tS!=NORM_TETRA4) throw INTERP_KERNEL::Exception("Invalid source cell detected for meshdim==3. Only TETRA4 supported !"); - const CellModel& cmTypeS=CellModel::getCellModel(tS); + const CellModel& cmTypeS=CellModel::GetCellModel(tS); const ConnType *startOfCellNodeConnT=Intersector3DP1P1::getStartConnOfTargetCell(targetCell); for(int nodeIdT=0;nodeIdT::ind2C(conn_index[i]); int conn_elem_sz=conn_index[i+1]-conn_index[i]; NormalizedCellType type=_mesh.getTypeOfElement(OTT::indFC(i)); - CellModel cell = CellModel::getCellModel(type); + CellModel cell = CellModel::GetCellModel(type); if ( cell.isQuadratic() ) throw Exception("P2 not implemented yet"); diff --git a/src/INTERP_KERNEL/SplitterTetra.txx b/src/INTERP_KERNEL/SplitterTetra.txx index da0f74756..f430cdf28 100644 --- a/src/INTERP_KERNEL/SplitterTetra.txx +++ b/src/INTERP_KERNEL/SplitterTetra.txx @@ -192,7 +192,7 @@ namespace INTERP_KERNEL // get type of cell NormalizedCellType normCellType=_src_mesh.getTypeOfElement(OTT::indFC(element)); - const CellModel& cellModelCell=CellModel::getCellModel(normCellType); + const CellModel& cellModelCell=CellModel::GetCellModel(normCellType); unsigned nbOfNodes4Type=cellModelCell.isDynamic() ? _src_mesh.getNumberOfNodesOfElement(OTT::indFC(element)) : cellModelCell.getNumberOfNodes(); // halfspace filtering bool isOutside[8] = {true, true, true, true, true, true, true, true}; @@ -253,7 +253,7 @@ namespace INTERP_KERNEL else { faceType = cellModelCell.getSonType(ii); - const CellModel& faceModel=CellModel::getCellModel(faceType); + const CellModel& faceModel=CellModel::GetCellModel(faceType); assert(faceModel.getDimension() == 2); faceNodes=new int[faceModel.getNumberOfNodes()]; cellModelCell.fillSonCellNodalConnectivity(ii,cellNodes,faceNodes); @@ -415,7 +415,7 @@ namespace INTERP_KERNEL if(!isTargetOutside) { - const CellModel& cellModelCell=CellModel::getCellModel(NORM_TETRA4); + const CellModel& cellModelCell=CellModel::GetCellModel(NORM_TETRA4); int cellNodes[4] = { 0, 1, 2, 3 }, faceNodes[3]; for(unsigned ii = 0 ; ii < 4 ; ++ii) @@ -795,7 +795,7 @@ namespace INTERP_KERNEL // get type of cell and nb of cell nodes NormalizedCellType normCellType=_target_mesh.getTypeOfElement(OTT::indFC(targetCell)); - const CellModel& cellModelCell=CellModel::getCellModel(normCellType); + const CellModel& cellModelCell=CellModel::GetCellModel(normCellType); unsigned nbOfCellNodes=cellModelCell.isDynamic() ? _target_mesh.getNumberOfNodesOfElement(OTT::indFC(targetCell)) : cellModelCell.getNumberOfNodes(); // get nb of cell sons (faces) diff --git a/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx b/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx index 70e880883..5e2f7b343 100644 --- a/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx +++ b/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx @@ -206,7 +206,7 @@ INTERP_KERNEL::NormalizedCellType MEDCouplingExtrudedMesh::getTypeOfCell(int cel int nbOfCells2D=_mesh2D->getNumberOfCells(); int locId=std::distance(ids,where)%nbOfCells2D; INTERP_KERNEL::NormalizedCellType tmp=_mesh2D->getTypeOfCell(locId); - return INTERP_KERNEL::CellModel::getCellModel(tmp).getExtrudedType(); + return INTERP_KERNEL::CellModel::GetCellModel(tmp).getExtrudedType(); } int MEDCouplingExtrudedMesh::getNumberOfCellsWithType(INTERP_KERNEL::NormalizedCellType type) const @@ -216,7 +216,7 @@ int MEDCouplingExtrudedMesh::getNumberOfCellsWithType(INTERP_KERNEL::NormalizedC for(int i=0;igetTypeOfCell(i); - if(INTERP_KERNEL::CellModel::getCellModel(t).getExtrudedType()==type) + if(INTERP_KERNEL::CellModel::GetCellModel(t).getExtrudedType()==type) ret++; } return ret*_mesh1D->getNumberOfCells(); diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx index 183dbb471..7e13c7f25 100644 --- a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx +++ b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx @@ -854,9 +854,9 @@ DataArrayDouble *MEDCouplingFieldDiscretizationGauss::getLocalizationOfDiscValue const MEDCouplingGaussLocalization& cli=_loc[*it];//curLocInfo INTERP_KERNEL::NormalizedCellType typ=cli.getType(); const std::vector& wg=cli.getWeights(); - calculator.addGaussInfo(typ,INTERP_KERNEL::CellModel::getCellModel(typ).getDimension(), + calculator.addGaussInfo(typ,INTERP_KERNEL::CellModel::GetCellModel(typ).getDimension(), &cli.getGaussCoords()[0],wg.size(),&cli.getRefCoords()[0], - INTERP_KERNEL::CellModel::getCellModel(typ).getNumberOfNodes()); + INTERP_KERNEL::CellModel::GetCellModel(typ).getNumberOfNodes()); } int nbt=parts2[i]->getNumberOfTuples(); for(const int *w=parts2[i]->getConstPointer();w!=parts2[i]->getConstPointer()+nbt;w++) @@ -1031,7 +1031,7 @@ void MEDCouplingFieldDiscretizationGauss::renumberValuesOnCellsR(const MEDCoupli void MEDCouplingFieldDiscretizationGauss::setGaussLocalizationOnType(const MEDCouplingMesh *m, INTERP_KERNEL::NormalizedCellType type, const std::vector& refCoo, const std::vector& gsCoo, const std::vector& wg) throw(INTERP_KERNEL::Exception) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); if((int)cm.getDimension()!=m->getMeshDimension()) { std::ostringstream oss; oss << "MEDCouplingFieldDiscretizationGauss::setGaussLocalizationOnType : mismatch of dimensions ! MeshDim==" << m->getMeshDimension(); @@ -1308,7 +1308,7 @@ int MEDCouplingFieldDiscretizationGaussNE::getNumberOfTuples(const MEDCouplingMe for(int i=0;igetTypeOfCell(i); - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); if(cm.isDynamic()) throw INTERP_KERNEL::Exception("Not implemented yet Gauss node on elements for polygons and polyedrons !"); ret+=cm.getNumberOfNodes(); @@ -1330,14 +1330,14 @@ void MEDCouplingFieldDiscretizationGaussNE::renumberArraysForCell(const MEDCoupl for(int i=1;igetTypeOfCell(std::distance(array,std::find(array,array+nbOfCells,i-1))); - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); array3[i]=array3[i-1]+cm.getNumberOfNodes(); } int j=0; for(int i=0;igetTypeOfCell(i); - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); for(int k=0;k<(int)cm.getNumberOfNodes();k++,j++) array2[j]=array3[array[i]]+k; } @@ -1372,7 +1372,7 @@ double MEDCouplingFieldDiscretizationGaussNE::getIJK(const MEDCouplingMesh *mesh for(int i=0;igetTypeOfCell(i); - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); offset+=cm.getNumberOfNodes(); } return da->getIJ(offset+nodeIdInCell,compoId); diff --git a/src/MEDCoupling/MEDCouplingGaussLocalization.cxx b/src/MEDCoupling/MEDCouplingGaussLocalization.cxx index 68c9a0611..18eb833bd 100644 --- a/src/MEDCoupling/MEDCouplingGaussLocalization.cxx +++ b/src/MEDCoupling/MEDCouplingGaussLocalization.cxx @@ -42,7 +42,7 @@ catch(INTERP_KERNEL::Exception& e) void ParaMEDMEM::MEDCouplingGaussLocalization::checkCoherency() const throw(INTERP_KERNEL::Exception) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_type); int nbNodes=cm.getNumberOfNodes(); int dim=cm.getDimension(); if(!cm.isDynamic()) @@ -90,7 +90,7 @@ bool ParaMEDMEM::MEDCouplingGaussLocalization::isEqual(const MEDCouplingGaussLoc double ParaMEDMEM::MEDCouplingGaussLocalization::getRefCoord(int ptIdInCell, int comp) const throw(INTERP_KERNEL::Exception) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_type); int nbNodes=cm.getNumberOfNodes(); int dim=cm.getDimension(); if(ptIdInCell<0 || ptIdInCell>=nbNodes) @@ -160,7 +160,7 @@ const double *ParaMEDMEM::MEDCouplingGaussLocalization::fillWithValues(const dou */ void ParaMEDMEM::MEDCouplingGaussLocalization::setRefCoord(int ptIdInCell, int comp, double newVal) throw(INTERP_KERNEL::Exception) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_type); int nbNodes=cm.getNumberOfNodes(); int dim=cm.getDimension(); if(ptIdInCell<0 || ptIdInCell>=nbNodes) @@ -193,7 +193,7 @@ ParaMEDMEM::MEDCouplingGaussLocalization ParaMEDMEM::MEDCouplingGaussLocalizatio int ParaMEDMEM::MEDCouplingGaussLocalization::checkCoherencyOfRequest(int gaussPtIdInCell, int comp) const throw(INTERP_KERNEL::Exception) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_type); int dim=cm.getDimension(); int nbGsPts=getNumberOfGaussPt(); if(gaussPtIdInCell<0 || gaussPtIdInCell>=nbGsPts) diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx index 4460b2cf8..5aed80b1d 100644 --- a/src/MEDCoupling/MEDCouplingUMesh.cxx +++ b/src/MEDCoupling/MEDCouplingUMesh.cxx @@ -96,7 +96,7 @@ void MEDCouplingUMesh::checkCoherency() const throw(INTERP_KERNEL::Exception) throw INTERP_KERNEL::Exception("No mesh dimension specified !"); for(std::set::const_iterator iter=_types.begin();iter!=_types.end();iter++) { - if((int)INTERP_KERNEL::CellModel::getCellModel(*iter).getDimension()!=_mesh_dim) + if((int)INTERP_KERNEL::CellModel::GetCellModel(*iter).getDimension()!=_mesh_dim) { std::ostringstream message; message << "Mesh invalid because dimension is " << _mesh_dim << " and there is presence of cell(s) with type " << (*iter); @@ -136,7 +136,7 @@ void MEDCouplingUMesh::checkCoherency1(double eps) const throw(INTERP_KERNEL::Ex const int *ptrI=_nodal_connec_index->getConstPointer(); for(int i=0;i shareableCells(revNodalB[tmp[0]].begin(),revNodalB[tmp[0]].end()); for(unsigned j=1;j& cellIdsToConve int pos=connIndex[*iter]; int posP1=connIndex[(*iter)+1]; int lgthOld=posP1-pos-1; - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel((INTERP_KERNEL::NormalizedCellType)connNew[pos]); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel((INTERP_KERNEL::NormalizedCellType)connNew[pos]); connNew[pos]=INTERP_KERNEL::NORM_POLYHED; unsigned nbOfFaces=cm.getNumberOfSons2(&connNew[pos+1],lgthOld); int *tmp=new int[nbOfFaces*lgthOld]; @@ -686,7 +686,7 @@ void MEDCouplingUMesh::unPolyze() { lgthOfCurCell=index[i+1]-posOfCurCell; INTERP_KERNEL::NormalizedCellType type=(INTERP_KERNEL::NormalizedCellType)conn[posOfCurCell]; - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(type); INTERP_KERNEL::NormalizedCellType newType=INTERP_KERNEL::NORM_ERROR; int newLgth; if(cm.isDynamic()) @@ -1592,7 +1592,7 @@ std::string MEDCouplingUMesh::simpleRepr() const ret << "Cell types present : "; for(std::set::const_iterator iter=_types.begin();iter!=_types.end();iter++) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(*iter); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(*iter); ret << cm.getRepr() << " "; } ret << "\n"; @@ -1628,7 +1628,7 @@ void MEDCouplingUMesh::reprConnectivityOfThisLL(std::ostringstream& stream) cons const int *ci=_nodal_connec_index->getConstPointer(); for(int i=0;i(stream," ")); stream << "\n"; @@ -2367,7 +2367,7 @@ void MEDCouplingUMesh::checkButterflyCells(std::vector& cells) const int nbOfNodesForCell=connI[i+1]-offset-1; if(nbOfNodesForCell<=3) continue; - bool isQuad=INTERP_KERNEL::CellModel::getCellModel((INTERP_KERNEL::NormalizedCellType)conn[offset]).isQuadratic(); + bool isQuad=INTERP_KERNEL::CellModel::GetCellModel((INTERP_KERNEL::NormalizedCellType)conn[offset]).isQuadratic(); project2DCellOnXY(conn+offset+1,conn+connI[i+1],cell2DinS2); if(isButterfly2DCell(cell2DinS2,isQuad)) cells.push_back(i); @@ -2668,7 +2668,7 @@ bool MEDCouplingUMesh::isFullyQuadratic() const for(int i=0;igetConstPointer(); for(int i=0;i& ret) { INTERP_KERNEL::NormalizedCellType flatType=(INTERP_KERNEL::NormalizedCellType)connBg[0]; - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(flatType); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(flatType); ret.push_back(cm.getExtrudedType()); int deltaz=isQuad?2*nbOfNodesPerLev:nbOfNodesPerLev; switch(flatType) diff --git a/src/MEDCoupling/MEDCouplingUMeshDesc.cxx b/src/MEDCoupling/MEDCouplingUMeshDesc.cxx index e1dbe3fc4..5a80b25a7 100644 --- a/src/MEDCoupling/MEDCouplingUMeshDesc.cxx +++ b/src/MEDCoupling/MEDCouplingUMeshDesc.cxx @@ -67,7 +67,7 @@ void MEDCouplingUMeshDesc::checkCoherency() const throw(INTERP_KERNEL::Exception { for(std::set::const_iterator iter=_types.begin();iter!=_types.end();iter++) { - if((int)INTERP_KERNEL::CellModel::getCellModel(*iter).getDimension()!=_mesh_dim) + if((int)INTERP_KERNEL::CellModel::GetCellModel(*iter).getDimension()!=_mesh_dim) { std::ostringstream message; message << "MeshDesc invalid because dimension is " << _mesh_dim << " and there is presence of cell(s) with type " << (*iter); diff --git a/src/MEDLoader/MEDFileField.cxx b/src/MEDLoader/MEDFileField.cxx index 2705b7088..d67a2f00e 100644 --- a/src/MEDLoader/MEDFileField.cxx +++ b/src/MEDLoader/MEDFileField.cxx @@ -50,7 +50,7 @@ MEDFileFieldLoc::MEDFileFieldLoc(med_idt fid, const char *locName):_name(locName INTERP_KERNEL::AutoPtr sectionmeshname=MEDLoaderBase::buildEmptyString(MED_NAME_SIZE); MEDlocalizationInfoByName(fid,locName,&geotype,&_dim,&_nb_gauss_pt,geointerpname,sectionmeshname,&nsectionmeshcell,§iongeotype); _geo_type=(INTERP_KERNEL::NormalizedCellType)(std::distance(typmai3,std::find(typmai3,typmai3+32,geotype))); - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_geo_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_geo_type); _nb_node_per_cell=cm.getNumberOfNodes(); _ref_coo.resize(_dim*_nb_node_per_cell); _gs_coo.resize(_dim*_nb_gauss_pt); @@ -212,7 +212,7 @@ const MEDFileFieldPerMesh *MEDFileFieldPerMeshPerType::getFather() const void MEDFileFieldPerMeshPerType::getDimension(int& dim) const { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_geo_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_geo_type); int curDim=(int)cm.getDimension(); dim=std::max(dim,curDim); } @@ -286,7 +286,7 @@ void MEDFileFieldPerMeshPerType::getFieldAtLevel(int meshDim, TypeOfField type, { if(_geo_type!=INTERP_KERNEL::NORM_ERROR) { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_geo_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_geo_type); if(meshDim!=(int)cm.getDimension()) return ; } diff --git a/src/MEDLoader/MEDFileMeshElt.cxx b/src/MEDLoader/MEDFileMeshElt.cxx index a696fcfa2..542b3f792 100644 --- a/src/MEDLoader/MEDFileMeshElt.cxx +++ b/src/MEDLoader/MEDFileMeshElt.cxx @@ -56,7 +56,7 @@ bool MEDFileUMeshPerType::isExisting(med_idt fid, const char *mName, int dt, int int MEDFileUMeshPerType::getDim() const { - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(_type); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(_type); return cm.getDimension(); } @@ -224,7 +224,7 @@ void MEDFileUMeshPerType::write(med_idt fid, const char *mname, int mdim, const int dt,it; double timm=m->getTime(dt,it); INTERP_KERNEL::NormalizedCellType ikt=m->getTypeOfCell(0); - const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::getCellModel(ikt); + const INTERP_KERNEL::CellModel& cm=INTERP_KERNEL::CellModel::GetCellModel(ikt); med_geometry_type curMedType=typmai3[(int)ikt]; const int *conn=m->getNodalConnectivity()->getConstPointer(); const int *connI=m->getNodalConnectivityIndex()->getConstPointer(); diff --git a/src/MEDLoader/MEDLoader.cxx b/src/MEDLoader/MEDLoader.cxx index 41fd9721a..c87d6fbc7 100644 --- a/src/MEDLoader/MEDLoader.cxx +++ b/src/MEDLoader/MEDLoader.cxx @@ -318,8 +318,8 @@ void MEDLoaderNS::fillGaussDataOnField(const char *fileName, const std::list refcoo(nbPtPerCell*dim),gscoo(nbOfGaussPt*dim),w(nbOfGaussPt); MEDlocalizationRd(fid,(*iter).getLocName().c_str(),MED_FULL_INTERLACE,&refcoo[0],&gscoo[0],&w[0]); f->setGaussLocalizationOnType((*iter).getType(),refcoo,gscoo,w); @@ -1203,7 +1203,7 @@ int MEDLoaderNS::readUMeshDimFromFile(const char *fileName, const char *meshName if(curNbOfElem>0) { INTERP_KERNEL::NormalizedCellType type=typmai2[i]; - int curDim=(int)INTERP_KERNEL::CellModel::getCellModel(type).getDimension(); + int curDim=(int)INTERP_KERNEL::CellModel::GetCellModel(type).getDimension(); poss.insert(curDim); } } @@ -1375,7 +1375,7 @@ namespace MEDLoaderNS unsigned ret=0; for(typename std::list::const_iterator iter=conn.begin();iter!=conn.end();iter++) { - unsigned curDim=INTERP_KERNEL::CellModel::getCellModel((*iter).getType()).getDimension(); + unsigned curDim=INTERP_KERNEL::CellModel::GetCellModel((*iter).getType()).getDimension(); if(ret::iterator iter=conn.begin();iter!=conn.end();) { - unsigned curDim=INTERP_KERNEL::CellModel::getCellModel((*iter).getType()).getDimension(); + unsigned curDim=INTERP_KERNEL::CellModel::GetCellModel((*iter).getType()).getDimension(); if(curDim!=meshDim) { (*iter).releaseArray(); @@ -1478,7 +1478,7 @@ void MEDLoaderNS::tradMEDFileCoreFrmt2MEDCouplingUMesh(const std::list& connIndex4MEDFile, std::vector& connIndexRk24MEDFile, std::vector& fam4MEDFile, std::vector& renumber) { - const INTERP_KERNEL::CellModel& cellMod=INTERP_KERNEL::CellModel::getCellModel(type); + const INTERP_KERNEL::CellModel& cellMod=INTERP_KERNEL::CellModel::GetCellModel(type); if(!cellMod.isDynamic()) return buildMEDSubConnectivityOfOneTypeStaticTypes(conn,connIndex,families,type,conn4MEDFile,fam4MEDFile,renumber); else @@ -2422,7 +2422,7 @@ void MEDLoaderNS::appendFieldDirectly(const char *fileName, const ParaMEDMEM::ME prepareCellFieldDoubleForWriting(f,0,split); for(std::list::const_iterator iter=split.begin();iter!=split.end();iter++) { - int nbPtPerCell=(int)INTERP_KERNEL::CellModel::getCellModel((*iter).getType()).getNumberOfNodes(); + int nbPtPerCell=(int)INTERP_KERNEL::CellModel::GetCellModel((*iter).getType()).getNumberOfNodes(); int nbOfEntity=f->getMesh()->getNumberOfCellsWithType((*iter).getType()); int nbOfValues=nbPtPerCell*nbOfEntity; MEDfieldValueWithProfileWr(fid,f->getName(),numdt,numo,dt,MED_NODE_ELEMENT,typmai3[(int)(*iter).getType()],MED_COMPACT_PFLMODE, -- 2.39.2