From 08c68bff908c932250ff8cea0dc727165b0511e6 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 17 Dec 2008 13:38:06 +0000 Subject: [PATCH] MEDMEM Industrialization 2008 fix indentation --- src/INTERP_KERNEL/Interpolation3D.txx | 20 ++++- src/INTERP_KERNEL/InterpolationPlanar.txx | 90 ++++++++++++++--------- 2 files changed, 73 insertions(+), 37 deletions(-) diff --git a/src/INTERP_KERNEL/Interpolation3D.txx b/src/INTERP_KERNEL/Interpolation3D.txx index 1d124cf89..6da782c58 100644 --- a/src/INTERP_KERNEL/Interpolation3D.txx +++ b/src/INTERP_KERNEL/Interpolation3D.txx @@ -1,3 +1,21 @@ +// Copyright (C) 2007-2008 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef __INTERPOLATION3D_TXX__ #define __INTERPOLATION3D_TXX__ @@ -165,7 +183,7 @@ namespace INTERP_KERNEL case 8: - intersector = new IntersectorHexa(srcMesh, targetMesh, targetIdx,getSplittingPolicy()); + intersector = new IntersectorHexa(srcMesh, targetMesh, targetIdx,getSplittingPolicy()); break; default: diff --git a/src/INTERP_KERNEL/InterpolationPlanar.txx b/src/INTERP_KERNEL/InterpolationPlanar.txx index bae20b1d4..08bd1fdf2 100644 --- a/src/INTERP_KERNEL/InterpolationPlanar.txx +++ b/src/INTERP_KERNEL/InterpolationPlanar.txx @@ -1,3 +1,21 @@ +// Copyright (C) 2007-2008 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef __INTERPOLATIONPLANAR_TXX__ #define __INTERPOLATIONPLANAR_TXX__ @@ -114,49 +132,49 @@ namespace INTERP_KERNEL _dimCaracteristic=std::min(DimCaracteristic_S, DimCaracteristic_P); if (InterpolationOptions::getPrintLevel()>=1) - { - std::cout << " - Characteristic size of the source mesh : " << DimCaracteristic_S << std::endl; - std::cout << " - Characteristic size of the target mesh: " << DimCaracteristic_P << std::endl; - std::cout << "InterpolationPlanar::computation of the intersections" << std::endl; - } - + { + std::cout << " - Characteristic size of the source mesh : " << DimCaracteristic_S << std::endl; + std::cout << " - Characteristic size of the target mesh: " << DimCaracteristic_P << std::endl; + std::cout << "InterpolationPlanar::computation of the intersections" << std::endl; + } + PlanarIntersector* intersector; - + switch (InterpolationOptions::getIntersectionType()) - { - case Triangulation: - intersector=new TriangulationIntersector( - myMesh_P, - myMesh_S, - _dimCaracteristic, - InterpolationOptions::getPrecision(), - InterpolationOptions::getMedianPlane(), - InterpolationOptions::getPrintLevel()); - break; - case Convex: - intersector=new ConvexIntersector( - myMesh_P, - myMesh_S, - _dimCaracteristic, - InterpolationOptions::getPrecision(), - InterpolationOptions::getDoRotate(), - InterpolationOptions::getMedianPlane(), - InterpolationOptions::getPrintLevel()); - break; - case Geometric2D: - intersector=new Geometric2DIntersector(myMesh_P, myMesh_S, _dimCaracteristic, InterpolationOptions::getPrecision()); - break; - // case MEDMEM::Generic: - //intersector=new GenericIntersector(myMesh_P,myMesh_S, _DimCaracteristic,_Precision, - // 0, 0, _PrintLevel); - //break; - } + { + case Triangulation: + intersector=new TriangulationIntersector( + myMesh_P, + myMesh_S, + _dimCaracteristic, + InterpolationOptions::getPrecision(), + InterpolationOptions::getMedianPlane(), + InterpolationOptions::getPrintLevel()); + break; + case Convex: + intersector=new ConvexIntersector( + myMesh_P, + myMesh_S, + _dimCaracteristic, + InterpolationOptions::getPrecision(), + InterpolationOptions::getDoRotate(), + InterpolationOptions::getMedianPlane(), + InterpolationOptions::getPrintLevel()); + break; + case Geometric2D: + intersector=new Geometric2DIntersector(myMesh_P, myMesh_S, _dimCaracteristic, InterpolationOptions::getPrecision()); + break; + // case MEDMEM::Generic: + //intersector=new GenericIntersector(myMesh_P,myMesh_S, _DimCaracteristic,_Precision, + // 0, 0, _PrintLevel); + //break; + } /****************************************************************/ /* Create a search tree based on the bounding boxes */ /* Instanciate the intersector and initialise the result vector */ /****************************************************************/ - + long start_filtering=clock(); std::vector bbox; -- 2.39.2