From c6731b9694f8a2132d759f07883a0fca145add6a Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sat, 11 Jun 2022 12:42:49 +0200
Subject: [PATCH] Make the FMT_S_VEC_TP macro not depend on the vector type
Because nowadays there are only sidevectors anyway, and hence
the dependence was purely formal.
---
dune/uggrid/gm/algebra.cc | 16 +++++-----------
dune/uggrid/gm/gm.h | 4 ++--
dune/uggrid/parallel/dddif/handler.cc | 12 ++++--------
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/dune/uggrid/gm/algebra.cc b/dune/uggrid/gm/algebra.cc
index 3ed52d112..1cff6942d 100644
--- a/dune/uggrid/gm/algebra.cc
+++ b/dune/uggrid/gm/algebra.cc
@@ -173,7 +173,7 @@ static INT CreateVectorInPart (GRID *theGrid, VectorType VectorObjType,
{
MULTIGRID *theMG;
VECTOR *pv;
- INT ds, Size, vtype;
+ INT Size, vtype;
*vHandle = NULL;
@@ -183,7 +183,7 @@ static INT CreateVectorInPart (GRID *theGrid, VectorType VectorObjType,
#else
vtype = NOVTYPE;
#endif
- ds = FMT_S_VEC_TP(MGFORMAT(theMG),vtype);
+ INT ds = FMT_S_VEC_TP;
if (ds == 0)
return (0); /* HRR: this is ok now, no XXXXVEC in part of the domain */
@@ -288,8 +288,7 @@ INT NS_DIM_PREFIX DisposeVector (GRID *theGrid, VECTOR *theVector)
/* delete the vector itself */
- Size = sizeof(VECTOR)-sizeof(DOUBLE)
- + FMT_S_VEC_TP(MGFORMAT(MYMG(theGrid)),VTYPE(theVector));
+ Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
if (PutFreeObject(theGrid->mg,theVector,Size,VEOBJ))
RETURN(1);
@@ -1252,12 +1251,7 @@ static INT CheckVector (GEOM_OBJECT *theObject, const char *ObjectString,
if (theVector == NULL)
{
/* check if size is really 0 */
-#ifdef UG_DIM_3
- VectorType vtype = SIDEVEC;
-#else
- VectorType vtype = NOVTYPE;
-#endif
- INT ds = FMT_S_VEC_TP(nullptr,vtype);
+ INT ds = FMT_S_VEC_TP;
if (ds>0)
{
errors++;
@@ -1268,7 +1262,7 @@ static INT CheckVector (GEOM_OBJECT *theObject, const char *ObjectString,
}
else
{
- INT ds = FMT_S_VEC_TP(fmt,VTYPE(theVector));
+ INT ds = FMT_S_VEC_TP;
if (ds==0)
{
errors++;
diff --git a/dune/uggrid/gm/gm.h b/dune/uggrid/gm/gm.h
index fca9ad425..ac68855ef 100644
--- a/dune/uggrid/gm/gm.h
+++ b/dune/uggrid/gm/gm.h
@@ -2782,9 +2782,9 @@ grid::dddContext()
/****************************************************************************/
#ifdef UG_DIM_3
-#define FMT_S_VEC_TP(f,t) (sizeof(double))
+#define FMT_S_VEC_TP (sizeof(double))
#else
-#define FMT_S_VEC_TP(f,t) (0)
+#define FMT_S_VEC_TP (0)
#endif
/** \brief Constants for USED flags of objects */
diff --git a/dune/uggrid/parallel/dddif/handler.cc b/dune/uggrid/parallel/dddif/handler.cc
index b2c4cd3a6..6fafdd00d 100644
--- a/dune/uggrid/parallel/dddif/handler.cc
+++ b/dune/uggrid/parallel/dddif/handler.cc
@@ -678,8 +678,7 @@ static void NodeXferCopy (DDD::DDDContext& context, DDD_OBJ obj, DDD_PROC proc,
{
vec = NVECTOR(theNode);
if (vec != NULL) {
- INT Size = sizeof(VECTOR)-sizeof(DOUBLE)
- +FMT_S_VEC_TP(MGFORMAT(ddd_ctrl(context).currMG),VTYPE(vec));
+ INT Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
PRINTDEBUG(dddif,2,(PFMT " NodeXferCopy(): n=" ID_FMTX
" Xfer NODEVEC=" VINDEX_FMTX " size=%d\n",
@@ -950,8 +949,7 @@ static void ElementXferCopy (DDD::DDDContext& context, DDD_OBJ obj, DDD_PROC pro
VECTOR *vec = EDVECTOR(edge);
if (vec != NULL) {
- int Size = sizeof(VECTOR)-sizeof(DOUBLE)
- +FMT_S_VEC_TP(MGFORMAT(dddctrl.currMG),VTYPE(vec));
+ int Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
PRINTDEBUG(dddif,3,(PFMT " ElementXferCopy(): e=" EID_FMTX
" EDGEVEC=" VINDEX_FMTX " size=%d\n",
me,EID_PRTX(pe),VINDEX_PRTX(vec),Size))
@@ -968,8 +966,7 @@ static void ElementXferCopy (DDD::DDDContext& context, DDD_OBJ obj, DDD_PROC pro
vec = EVECTOR(pe);
if (vec != NULL) {
- Size = sizeof(VECTOR)-sizeof(DOUBLE)
- +FMT_S_VEC_TP(MGFORMAT(dddctrl.currMG),VTYPE(vec));
+ Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
PRINTDEBUG(dddif,2,(PFMT " ElementXferCopy(): e=" EID_FMTX
" ELEMVEC=" VINDEX_FMTX " size=%d\n",
@@ -987,8 +984,7 @@ static void ElementXferCopy (DDD::DDDContext& context, DDD_OBJ obj, DDD_PROC pro
vec = SVECTOR(pe,i);
if (vec != NULL) {
- Size = sizeof(VECTOR)-sizeof(DOUBLE)
- +FMT_S_VEC_TP(MGFORMAT(dddctrl.currMG),VTYPE(vec));
+ Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
PRINTDEBUG(dddif,2,(PFMT " ElementXferCopy(): e=" EID_FMTX
" SIDEVEC=" VINDEX_FMTX " size=%d\n",
--
GitLab