diff --git a/dune/uggrid/gm/algebra.cc b/dune/uggrid/gm/algebra.cc index 3ed52d1124b649991b9df59951b89b08c386f3c2..1cff6942d163107a0ddd93d37c1286dbe3fcca97 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 fca9ad425bd1160ea4f0ea77e9f98ee6a82d9ab7..ac68855efd38c663d8fabfcdde04a5a232a15c22 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 b2c4cd3a661536f79882b826a9396710e4263eab..6fafdd00dabc54fa926cc4443ae721606c14a57a 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",