From 221cc5717d2d1ac6b06b94955307e4957d111ba2 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sat, 11 Jun 2022 11:34:19 +0200
Subject: [PATCH] Remove several unused macros
---
dune/uggrid/gm/gm.doc | 62 +------------------------------------------
dune/uggrid/gm/gm.h | 15 -----------
2 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/dune/uggrid/gm/gm.doc b/dune/uggrid/gm/gm.doc
index 32d22ce22..b6342ca53 100644
--- a/dune/uggrid/gm/gm.doc
+++ b/dune/uggrid/gm/gm.doc
@@ -1551,27 +1551,6 @@ CONNECTION *MMYCON (MATRIX *m);
Returns a pointer to the CONNECTION where m is part of.
-\verbatim
-DOUBLE MVALUE (MATRIX *m,INT n);
-\endverbatim
-
-Returns the nth value of the MATRIX m. The number of entries is
-defined in the FORMAT structure. MVALUE is a macro and can also
-be used for assignment, i.e. MVALUE(m,n)=0.0 is a valid
-statement.
-
-\verbatim
-DOUBLE *MVALUEPTR (MATRIX *m,INT n);
-\endverbatim
-
-Returns a pointer to the nth entry of the MATRIX m.
-
-\verbatim
-MDESTINDEX (MATRIX *m);
-\endverbatim
-
-Returns the index component of the destination VECTOR.
-
CONTROL WORDS:
@@ -1616,7 +1595,6 @@ MTYPE (MATRIX *p); 6 6 Number identifying source and
SETMTYPE (MATRIX *p,INT n); dest position in a compact form
MUSED (MATRIX *p); 12 1 currently not used
-SETMUSED (MATRIX *p,INT n);
MSIZE (MATRIX *p); 13 15 Size of the MATRIX in bytes
SETMSIZE (MATRIX *p,INT n);
@@ -1636,48 +1614,10 @@ SETMUP (MATRIX *p,INT n);
-----------------------------------------------------------------------------
\endverbatim
-\sa VECTOR, CONNECTION.
+\sa VECTOR
*/
-/*D
-CONNECTION - Data type combing one or two MATRIX structures
-
-STRUCTURES:
-
-\verbatim
-typedef struct matrix CONNECTION;
-\endverbatim
-
-DESCRIPTION:
-
-The CONNECTION data type consists of two MATRIX objects stored consecutively
-in memory. If it is a diagonal entry of the stiffness matrix it consists of only
-`one` MATRIX. Since the MATRIX objects size is determined at run-time the
-CONNECTION is defined as a MATRIX.
-
-MACROS:
-
-\verbatim
-MATRIX *CMATRIX0 (CONNECTION *c);
-MATRIX *CMATRIX1 (CONNECTION *c);
-\endverbatim
-
-Pointer to first and second matrix of a CONNECTION.
-
-\verbatim
-void SETCUSED (CONNECTION *c, INT n);
-\endverbatim
-
-Executes MUSED macro for both MATRIX objects of a CONNECTION.
-
-\sa
-
-MATRIX, VECTOR.
-
-D*/
-
-
/*! \struct grid
\brief Data type giving access to all objects on a grid level
diff --git a/dune/uggrid/gm/gm.h b/dune/uggrid/gm/gm.h
index 955d0cbc4..1043e9f10 100644
--- a/dune/uggrid/gm/gm.h
+++ b/dune/uggrid/gm/gm.h
@@ -1975,7 +1975,6 @@ enum LV_ID_TYPES {
#define MTYPE(p) (MDIAG(p) ? (MAXMATRICES+MROOTTYPE(p)) : (MROOTTYPE(p)*MAXVECTORS+MDESTTYPE(p)))
#define MUSED(p) USED(p)
-#define SETMUSED(p,n) SETUSED(p,n)
#ifdef ModelP
#define XFERMATX_SHIFT 25
@@ -1988,20 +1987,6 @@ enum LV_ID_TYPES {
#define MDEST(m) ((m)->vect)
#define MADJ(m) ((MDIAG(m)) ? (m) : ((MOFFSET(m)) ? (MDEC(m)) : (MINC(m))))
#define MROOT(m) MDEST(MADJ(m))
-#define MVALUE(m,n) ((m)->value[n])
-#define MVALUEPTR(m,n) (&((m)->value[n]))
-#define MDESTINDEX(m) ((m)->vect->index)
-#define MSTRONG(p) (MDOWN(p) && MUP(p))
-
-/****************************************************************************/
-/* */
-/* macros for CONNECTIONs */
-/* */
-/****************************************************************************/
-
-#define CMATRIX0(m) (m)
-#define CMATRIX1(m) ((MDIAG(m)) ? (NULL) : (MINC(m)))
-#define SETCUSED(c,n) {SETMUSED(CMATRIX0(c),n); SETMUSED(MADJ(CMATRIX0(c)),n);}
/****************************************************************************/
/* */
--
GitLab