From 0ea5bc24f2e2d8281316b426169f65893cc2c50c Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sat, 9 Nov 2019 06:48:01 +0100
Subject: [PATCH] Rentroduce Vector::skip as Vector::leafIndex
The 'skip' data member of the Vector class used to be abused for
the leaf index of the vector, if that vector corresponds to an
element facet in 3d. By accident, that 'skip' field got removed
in a recent commit. Let's put it back in, but rename it to
'leafIndex' now. All it is used for nowadays is that leaf index.
---
gm/gm.h | 3 +++
parallel/dddif/initddd.cc | 1 +
2 files changed, 4 insertions(+)
diff --git a/gm/gm.h b/gm/gm.h
index 51f544a7f..ba9a5cd6f 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -499,6 +499,9 @@ struct vector {
/** \brief ordering of unknowns */
UINT index;
+ /** \brief Index if the vector is part of the leaf grid */
+ UINT leafIndex;
+
#ifndef ModelP // Dune uses ddd.gid for ids in parallel
/** \brief A unique and persistent, but not necessarily consecutive index
diff --git a/parallel/dddif/initddd.cc b/parallel/dddif/initddd.cc
index 73d7f5477..1abe20eae 100644
--- a/parallel/dddif/initddd.cc
+++ b/parallel/dddif/initddd.cc
@@ -406,6 +406,7 @@ static void ddd_DefineTypes(DDD::DDDContext& context)
EL_LDATA, ELDEF(v.pred),
EL_LDATA, ELDEF(v.succ),
EL_GDATA, ELDEF(v.index),
+ EL_GDATA, ELDEF(v.leafIndex),
EL_LDATA, ELDEF(v.start),
/* TODO: value wird noch ausgelassen. feld variabler laenge? */
--
GitLab