From 8eb81154fe7111d9db69a06b2934886c67e82205 Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue, 22 Mar 2016 05:57:50 +0100 Subject: [PATCH] [FileIO] Deleted unused GMSHNoMeshDensity strategy. --- FileIO/GMSHInterface.cpp | 4 -- FileIO/GMSHInterface.h | 1 - FileIO/GmshIO/GMSHMeshDensityStrategy.h | 2 +- FileIO/GmshIO/GMSHNoMeshDensity.h | 49 ------------------------- FileIO/GmshIO/GMSHPolygonTree.cpp | 1 - 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 FileIO/GmshIO/GMSHNoMeshDensity.h diff --git a/FileIO/GMSHInterface.cpp b/FileIO/GMSHInterface.cpp index 52409f073fd..b113896c1c9 100644 --- a/FileIO/GMSHInterface.cpp +++ b/FileIO/GMSHInterface.cpp @@ -28,7 +28,6 @@ #include "FileIO/GMSHInterface.h" #include "FileIO/GmshIO/GMSHAdaptiveMeshDensity.h" #include "FileIO/GmshIO/GMSHFixedMeshDensity.h" -#include "FileIO/GmshIO/GMSHNoMeshDensity.h" #include "GeoLib/AnalyticalGeometry.h" #include "GeoLib/GEOObjects.h" @@ -57,9 +56,6 @@ GMSHInterface::GMSHInterface(GeoLib::GEOObjects & geo_objs, _n_lines(0), _n_plane_sfc(0), _geo_objs(geo_objs), _selected_geometries(selected_geometries) { switch (mesh_density_algorithm) { - case GMSH::MeshDensityAlgorithm::NoMeshDensity: - _mesh_density_strategy = new GMSH::GMSHNoMeshDensity; - break; case GMSH::MeshDensityAlgorithm::FixedMeshDensity: _mesh_density_strategy = new GMSH::GMSHFixedMeshDensity(param1); break; diff --git a/FileIO/GMSHInterface.h b/FileIO/GMSHInterface.h index 64450e738c1..9ac706ff741 100644 --- a/FileIO/GMSHInterface.h +++ b/FileIO/GMSHInterface.h @@ -46,7 +46,6 @@ namespace FileIO namespace GMSH { enum class MeshDensityAlgorithm { - NoMeshDensity = 0, //!< do not set the parameter FixedMeshDensity, //!< set the parameter with a fixed value AdaptiveMeshDensity //!< computing the mesh density employing a QuadTree }; diff --git a/FileIO/GmshIO/GMSHMeshDensityStrategy.h b/FileIO/GmshIO/GMSHMeshDensityStrategy.h index 3fc86593a9d..27c730390f9 100644 --- a/FileIO/GmshIO/GMSHMeshDensityStrategy.h +++ b/FileIO/GmshIO/GMSHMeshDensityStrategy.h @@ -28,7 +28,7 @@ namespace GMSH { /** * virtual base class GMSHMeshDensityStrategy for classes - * GMSHAdaptiveMeshDensity, GMSHFixedMeshDensity and GMSHNoMeshDensity + * GMSHAdaptiveMeshDensity and GMSHFixedMeshDensity. */ class GMSHMeshDensityStrategy { diff --git a/FileIO/GmshIO/GMSHNoMeshDensity.h b/FileIO/GmshIO/GMSHNoMeshDensity.h deleted file mode 100644 index 639efef590c..00000000000 --- a/FileIO/GmshIO/GMSHNoMeshDensity.h +++ /dev/null @@ -1,49 +0,0 @@ -/** - * \file - * \author Thomas Fischer - * \date Mar 5, 2012 - * \brief Definition of the GMSHNoMeshDensity class. - * - * \copyright - * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org) - * Distributed under a Modified BSD License. - * See accompanying file LICENSE.txt or - * http://www.opengeosys.org/project/license - * - */ - -#ifndef GMSHNOMESHDENSITY_H_ -#define GMSHNOMESHDENSITY_H_ - -#include "GMSHMeshDensityStrategy.h" - -namespace FileIO -{ -namespace GMSH { - -class GMSHNoMeshDensity: public FileIO::GMSH::GMSHMeshDensityStrategy { -public: - GMSHNoMeshDensity() {} - virtual ~GMSHNoMeshDensity() {} - void init(std::vector<GeoLib::Point const*> const& vec) - { - // to avoid a warning here: - (void)(vec); - } - - double getMeshDensityAtPoint(GeoLib::Point const*const) const - { - return 0.0; - } - - double getMeshDensityAtStation(GeoLib::Point const*const) const - { - return 0.0; - } - -}; - -} -} - -#endif /* GMSHNOMESHDENSITY_H_ */ diff --git a/FileIO/GmshIO/GMSHPolygonTree.cpp b/FileIO/GmshIO/GMSHPolygonTree.cpp index a766651823a..38b352d5401 100644 --- a/FileIO/GmshIO/GMSHPolygonTree.cpp +++ b/FileIO/GmshIO/GMSHPolygonTree.cpp @@ -14,7 +14,6 @@ #include "GMSHPolygonTree.h" -#include "GMSHNoMeshDensity.h" #include "GMSHFixedMeshDensity.h" #include "GMSHAdaptiveMeshDensity.h" -- GitLab