From 14d92b1a84fb185e24d1414cd10d31a144a4f50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kl=C3=B6fkorn?= <robertk@dune-project.org>
Date: Mon, 3 Oct 2005 10:58:32 +0000
Subject: [PATCH] removed deprecated use of globalIndex and changed to new
geometry tpyes.
[[Imported from SVN: r3008]]
---
grid/alu3dgrid/entity_imp.cc | 2 +-
grid/alu3dgrid/geometry_imp.cc | 95 ++++++++++++++++++----------------
2 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/grid/alu3dgrid/entity_imp.cc b/grid/alu3dgrid/entity_imp.cc
index 7315ccea6..9b9b87201 100644
--- a/grid/alu3dgrid/entity_imp.cc
+++ b/grid/alu3dgrid/entity_imp.cc
@@ -642,7 +642,7 @@ namespace Dune {
{
if(! item_->up() )
{
- std::cerr << "ALU3dGridEntity<0," << dim << "," << dimworld << "> :: father() : no father of entity globalid = " << globalIndex() << "\n";
+ std::cerr << "ALU3dGridEntity<0," << dim << "," << dimworld << "> :: father() : no father of entity globalid = " << getIndex() << "\n";
return ALU3dGridEntityPointer<0,GridImp> (grid_, static_cast<ALU3DSPACE HElementType &> (*item_));
}
return ALU3dGridEntityPointer<0,GridImp> (grid_, static_cast<ALU3DSPACE HElementType &> (*(item_->up())));
diff --git a/grid/alu3dgrid/geometry_imp.cc b/grid/alu3dgrid/geometry_imp.cc
index 8530c7cb2..1c6eea20c 100644
--- a/grid/alu3dgrid/geometry_imp.cc
+++ b/grid/alu3dgrid/geometry_imp.cc
@@ -241,43 +241,45 @@ namespace Dune {
return true;
}
+ /*
+ template <GeometryType eltype , int dim> struct ALU3dGridElType {
+ static inline GeometryType type () { return unknown; }
+ };
+ template <> struct ALU3dGridElType<tetrahedron,3> {
+ static inline GeometryType type () { return tetrahedron; }
+ };
+ template <> struct ALU3dGridElType<tetrahedron,2> {
+ static inline GeometryType type () { return triangle; }
+ };
+ template <GeometryType eltype> struct ALU3dGridElType<eltype,1> {
+ static inline GeometryType type () { return line; }
+ };
+ template <GeometryType eltype> struct ALU3dGridElType<eltype,0> {
+ static inline GeometryType type () { return vertex; }
+ };
+ template <> struct ALU3dGridElType<hexahedron,3> {
+ static inline GeometryType type () { return hexahedron; }
+ };
+ template <> struct ALU3dGridElType<hexahedron,2> {
+ static inline GeometryType type () { return quadrilateral; }
+ };
+ */
- template <GeometryType eltype , int dim> struct ALU3dGridElType {
- static inline GeometryType type () { return unknown; }
- };
- template <> struct ALU3dGridElType<tetrahedron,3> {
- static inline GeometryType type () { return tetrahedron; }
- };
- template <> struct ALU3dGridElType<tetrahedron,2> {
- static inline GeometryType type () { return triangle; }
- };
- template <GeometryType eltype> struct ALU3dGridElType<eltype,1> {
- static inline GeometryType type () { return line; }
- };
- template <GeometryType eltype> struct ALU3dGridElType<eltype,0> {
- static inline GeometryType type () { return vertex; }
- };
- template <> struct ALU3dGridElType<hexahedron,3> {
- static inline GeometryType type () { return hexahedron; }
- };
- template <> struct ALU3dGridElType<hexahedron,2> {
- static inline GeometryType type () { return quadrilateral; }
- };
-
-
- /* Comment in for adaptation to new GeometryType
- template <int mydim, int cdim>
- inline GeometryType
- ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const {
- return simplex;
- }
- template <int mydim, int cdim>
- inline GeometryType
- ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, hexa> > ::type () const {
- return cube;
- }
+ /* Comment in for adaptation to new GeometryType */
+ template <int mydim, int cdim>
+ inline GeometryType
+ ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const {
+ return simplex;
+ }
+
+ template <int mydim, int cdim>
+ inline GeometryType
+ ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, hexa> > ::type () const {
+ return cube;
+ }
+ /*
template <>
inline GeometryType
ALU3dGridGeometry<0, 3, const ALU3dGrid<3, 3, tetra> > ::type () const {
@@ -291,11 +293,13 @@ namespace Dune {
}
*/
- template<int mydim, int cdim>
- inline GeometryType ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const
- {
- return ALU3dGridElType<tetrahedron,mydim>::type();
- }
+ /*
+ template<int mydim, int cdim>
+ inline GeometryType ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const
+ {
+ return ALU3dGridElType<tetrahedron,mydim>::type();
+ }
+ */
template<int mydim, int cdim>
@@ -459,12 +463,13 @@ namespace Dune {
delete biMap_;
}
-
- template<int mydim, int cdim>
- inline GeometryType
- ALU3dGridGeometry<mydim, cdim, const ALU3dGrid<3, 3, hexa> >::type() const {
- return ALU3dGridElType<hexahedron, mydim>::type();
- }
+ /*
+ template<int mydim, int cdim>
+ inline GeometryType
+ ALU3dGridGeometry<mydim, cdim, const ALU3dGrid<3, 3, hexa> >::type() const {
+ return ALU3dGridElType<hexahedron, mydim>::type();
+ }
+ */
template <int mydim, int cdim>
--
GitLab