diff --git a/dune/uggrid/domain/std_domain.cc b/dune/uggrid/domain/std_domain.cc
index 1ff481de092685a694c244973b7da6e22da5ea80..f113195f5a77524bce01102f0155c31ec2520ef8 100644
--- a/dune/uggrid/domain/std_domain.cc
+++ b/dune/uggrid/domain/std_domain.cc
@@ -946,8 +946,8 @@ BVP_Init (const char *name, HEAP * Heap, MESH * Mesh, INT MarkKey)
}
PARAM_PATCH_BS (thePatch) = theSegment->BndSegFunc;
PARAM_PATCH_BSD (thePatch) = theSegment->data;
- maxSubDomains = MAX (maxSubDomains, theSegment->left);
- maxSubDomains = MAX (maxSubDomains, theSegment->right);
+ maxSubDomains = std::max(maxSubDomains, theSegment->left);
+ maxSubDomains = std::max(maxSubDomains, theSegment->right);
sides[theSegment->id] = thePatch;
PRINTDEBUG (dom, 1, ("sides id %d type %d left %d right %d\n",
PATCH_ID (thePatch), PATCH_TYPE (thePatch),
@@ -978,8 +978,8 @@ BVP_Init (const char *name, HEAP * Heap, MESH * Mesh, INT MarkKey)
for (i = 0; i < DIM; i++)
LINEAR_PATCH_POS (thePatch, j)[i] = theLinSegment->x[j][i];
}
- maxSubDomains = MAX (maxSubDomains, theLinSegment->left);
- maxSubDomains = MAX (maxSubDomains, theLinSegment->right);
+ maxSubDomains = std::max(maxSubDomains, theLinSegment->left);
+ maxSubDomains = std::max(maxSubDomains, theLinSegment->right);
sides[theLinSegment->id] = thePatch;
PRINTDEBUG (dom, 1, ("sides id %d type %d left %d right %d\n",
PATCH_ID (thePatch), PATCH_TYPE (thePatch),
diff --git a/dune/uggrid/gm/algebra.cc b/dune/uggrid/gm/algebra.cc
index 1e4c2b15cb6d39fd97d027675c3f392dbb2edac8..de6cc7eee2fe224302fe67255cae68ab9fbf4e9b 100644
--- a/dune/uggrid/gm/algebra.cc
+++ b/dune/uggrid/gm/algebra.cc
@@ -948,7 +948,7 @@ static int Scatter_VectorVNew (DDD::DDDContext&, DDD_OBJ obj, void *data)
{
VECTOR *theVector = (VECTOR *)obj;
- SETVNEW(theVector,MAX(VNEW(theVector),((INT *)data)[0]));
+ SETVNEW(theVector,std::max((INT)VNEW(theVector),((INT *)data)[0]));
return(0);
}
@@ -1692,7 +1692,7 @@ static int Scatter_VectorVClass (DDD::DDDContext&, DDD_OBJ obj, void *data)
{
VECTOR *theVector = (VECTOR *)obj;
- SETVCLASS(theVector,MAX(VCLASS(theVector),((INT *)data)[0]));
+ SETVCLASS(theVector,std::max((INT)VCLASS(theVector),((INT *)data)[0]));
PRINTDEBUG(gm,2,("Scatter_VectorVClass(): v=" VINDEX_FMTX " vclass=%d\n",
VINDEX_PRTX(theVector),VCLASS(theVector)))
@@ -1848,7 +1848,7 @@ static int Scatter_VectorVNClass (DDD::DDDContext&, DDD_OBJ obj, void *data)
{
VECTOR *theVector = (VECTOR *)obj;
- SETVNCLASS(theVector,MAX(VNCLASS(theVector),((INT *)data)[0]));
+ SETVNCLASS(theVector,std::max((INT)VNCLASS(theVector),((INT *)data)[0]));
PRINTDEBUG(gm,2,("Scatter_VectorVNClass(): v=" VINDEX_FMTX " vnclass=%d\n",
VINDEX_PRTX(theVector),VNCLASS(theVector)))
diff --git a/dune/uggrid/gm/er.cc b/dune/uggrid/gm/er.cc
index c01ac30ce39cb8eed20d7e635b0e046d4496f1fe..2df3b700e5be036d6c8134745d10d3cf74f3bed3 100644
--- a/dune/uggrid/gm/er.cc
+++ b/dune/uggrid/gm/er.cc
@@ -1187,7 +1187,7 @@ static INT ExtractRules (MULTIGRID *mg)
list_len++;
n++;
}
- max_list_len = MAX(max_list_len,list_len);
+ max_list_len = std::max(max_list_len,list_len);
}
ASSERT(maxrules==n);
diff --git a/dune/uggrid/gm/refine.cc b/dune/uggrid/gm/refine.cc
index 4a1968de926b5e3fdc28a507ebfadf248f5f94e9..ee69445b6f19f3aa20e3fd57b182d6eba82afc3f 100644
--- a/dune/uggrid/gm/refine.cc
+++ b/dune/uggrid/gm/refine.cc
@@ -963,7 +963,7 @@ static int Scatter_EdgeClosureInfo (DDD::DDDContext&, DDD_OBJ obj, void *data)
INT pattern;
EDGE *theEdge = (EDGE *)obj;
- pattern = MAX(PATTERN(theEdge),((INT *)data)[0]);
+ pattern = std::max((INT)PATTERN(theEdge),((INT *)data)[0]);
PRINTDEBUG(gm,1,("Gather_EdgeClosureInfo(): e=" ID_FMTX "pattern=%d \n",
ID_PRTX(theEdge),pattern))
@@ -1641,7 +1641,7 @@ static int Scatter_AddEdgePattern (DDD::DDDContext&, DDD_OBJ obj, void *data)
INT addpattern;
EDGE *theEdge = (EDGE *)obj;
- addpattern = MIN(ADDPATTERN(theEdge),((INT *)data)[0]);
+ addpattern = std::min((INT)ADDPATTERN(theEdge),((INT *)data)[0]);
PRINTDEBUG(gm,4,("Gather_AddEdgePattern(): edge=" ID_FMTX "pat=%08x\n",
ID_PRTX(theEdge),addpattern));
diff --git a/dune/uggrid/gm/shapes.cc b/dune/uggrid/gm/shapes.cc
index a0aaf7d4c3595d69c2678b00f8614fca6d36797e..eb048b716eba70092d14114a3153c5231b65bf08 100644
--- a/dune/uggrid/gm/shapes.cc
+++ b/dune/uggrid/gm/shapes.cc
@@ -31,6 +31,8 @@
#include <cassert>
#include <cstddef>
+#include <algorithm>
+
#include <dune/uggrid/low/architecture.h>
#include <dune/uggrid/low/misc.h>
#include <dune/uggrid/low/ugtypes.h>
@@ -256,9 +258,9 @@ INT NS_DIM_PREFIX TetMaxSideAngle (ELEMENT *theElement, const DOUBLE **theCorner
for (i=0; i<EDGES_OF_ELEM(theElement); i++)
{
V3_SCALAR_PRODUCT(theNormal[SIDE_WITH_EDGE(theElement,i,0)],theNormal[SIDE_WITH_EDGE(theElement,i,1)],help)
- max = MAX(help,max);
+ max = std::max(help,max);
}
- max = MIN(max,1.0);
+ max = std::min(max,1.0);
*MaxAngle = 180.0/PI*acos(-max);
return (0);
@@ -308,8 +310,7 @@ INT NS_DIM_PREFIX TetAngleAndLength (ELEMENT *theElement, const DOUBLE **theCorn
for (j=0; j<EDGES_OF_ELEM(theElement); j++)
{
V3_SCALAR_PRODUCT(theNormals[SIDE_WITH_EDGE(theElement,j,0)],theNormals[SIDE_WITH_EDGE(theElement,j,1)],Angle[j])
- Angle[j] = MAX(Angle[j],-1.0);
- Angle[j] = MIN(Angle[j], 1.0);
+ Angle[j] = std::clamp(Angle[j], -1.0, 1.0);
Angle[j] = (DOUBLE)acos((double)Angle[j]);
}
diff --git a/dune/uggrid/gm/ugio.cc b/dune/uggrid/gm/ugio.cc
index 73f9b1fba70b632a7154633b6ad76a5ee7274f3e..767901fe6469126591b07c74977e65b9f4348652 100644
--- a/dune/uggrid/gm/ugio.cc
+++ b/dune/uggrid/gm/ugio.cc
@@ -112,7 +112,7 @@ USING_UGDIM_NAMESPACE
/* n_edge = 12*30 (12 max_edges_of_elem) (30 probably 30 elements per edge) */
/* n_node = 100*8 (8 max_node_of_elem) 100 probably elements per node) */
/*#define PROCLISTSIZE (ELEMPROCLISTSIZE*MAX_SONS * 2) size not enough and change to static variable; Christian Wrobel 980128 */
-#define PROCLISTSIZE_VALUE (ELEMPROCLISTSIZE*MAX_SONS * MAX(13,(int)(2.0+log((double)procs))))
+#define PROCLISTSIZE_VALUE (ELEMPROCLISTSIZE*MAX_SONS * std::max(13,(int)(2.0+log((double)procs))))
#define PROCLISTSIZE proc_list_size
/* orphan condition for elements */
@@ -202,7 +202,7 @@ static INT RenumberNodes (MULTIGRID *theMG, INT *foid, INT *non)
for (theNode=FIRSTNODE(GRID_ON_LEVEL(theMG,0)); theNode!=NULL; theNode=SUCCN(theNode))
{
ID(theNode) = ID(MYVERTEX(theNode));
- nid = MAX(nid,ID(theNode));
+ nid = std::max(nid,ID(theNode));
}
nid++;
non[0] = nid;
@@ -1532,7 +1532,7 @@ static INT SaveMultiGrid_SPF (MULTIGRID *theMG, const char *name, const char *ty
cge->ge = TAG(theElement);
nref=0;
if (nRefinements (theElement,&nref)) REP_ERR_RETURN(1);
- hr_max = MAX(hr_max,nref);
+ hr_max = std::max(hr_max,nref);
cge->nref = nref;
for (j=0; j<CORNERS_OF_ELEM(theElement); j++)
cge->cornerid[j] = ID(CORNER(theElement,j));
@@ -3070,8 +3070,8 @@ nparfiles = UG_GlobalMinINT(*ppifContext, nparfiles);
{
cge = MGIO_CG_ELEMENT_PS(cg_element,i);
Element_corner_uniq_subdom[i] = ge_element[cge->ge].nCorner;
- max = MAX(max,ge_element[cge->ge].nCorner);
- max = MAX(max,ge_element[cge->ge].nSide);
+ max = std::max(max,ge_element[cge->ge].nCorner);
+ max = std::max(max,ge_element[cge->ge].nSide);
if (MGIO_PARFILE) theMesh.ElementLevel[1][i] = cge->level;
else theMesh.ElementLevel[1][i] = 0;
Element_SideOnBnd_uniq_subdom[i] = cge->se_on_bnd;
diff --git a/dune/uggrid/gm/ugm.cc b/dune/uggrid/gm/ugm.cc
index a62291cbbc4ba18e76235d20f0a6b89228d29982..253f5c82fbb4747488359debee7d01fdb2afebb6 100644
--- a/dune/uggrid/gm/ugm.cc
+++ b/dune/uggrid/gm/ugm.cc
@@ -4646,14 +4646,14 @@ INT NS_DIM_PREFIX InsertMesh (MULTIGRID *theMG, MESH *theMesh)
return(GM_OK);
SETMOVE(VList[i],move);
V_BNDP(VList[i]) = theMesh->theBndPs[i];
- maxlevel = MAX(maxlevel,theMesh->VertexLevel[i]);
+ maxlevel = std::max(maxlevel,(INT)theMesh->VertexLevel[i]);
}
for (i=theMesh->nBndP; i<nv; i++)
{
theGrid = GRID_ON_LEVEL(theMG,theMesh->VertexLevel[i]);
VList[i] = CreateInnerVertex(theGrid);
V_DIM_COPY(theMesh->Position[i-theMesh->nBndP],CVECT(VList[i]));
- maxlevel = MAX(maxlevel,theMesh->VertexLevel[i]);
+ maxlevel = std::max(maxlevel,(INT)theMesh->VertexLevel[i]);
}
}
else
@@ -5581,8 +5581,8 @@ void NS_DIM_PREFIX ListGrids (const MULTIGRID *theMG)
{
nbVertex = MYVERTEX(NBNODE(theLink));
V_DIM_EUKLIDNORM_OF_DIFF(CVECT(myVertex),CVECT(nbVertex),h);
- hmin = MIN(hmin,h);
- hmax = MAX(hmax,h);
+ hmin = std::min(hmin,h);
+ hmax = std::max(hmax,h);
}
}
ns = 0;
@@ -5628,7 +5628,7 @@ void NS_DIM_PREFIX ListGrids (const MULTIGRID *theMG)
{
nt++;
- minl = MIN(minl,l);
+ minl = std::min(minl,l);
coe = CORNERS_OF_ELEM(theElement);
for (i=0; i<coe; i++)
@@ -5679,8 +5679,8 @@ void NS_DIM_PREFIX ListGrids (const MULTIGRID *theMG)
ne++;
V_DIM_EUKLIDNORM_OF_DIFF(CVECT(v0),CVECT(v1),h);
- hmin = MIN(hmin,h);
- hmax = MAX(hmax,h);
+ hmin = std::min(hmin,h);
+ hmax = std::max(hmax,h);
}
}
}
@@ -5720,7 +5720,7 @@ void NS_DIM_PREFIX ListGrids (const MULTIGRID *theMG)
{
nt++;
- minl = MIN(minl,l);
+ minl = std::min(minl,l);
coe = CORNERS_OF_ELEM(theElement);
for (i=0; i<coe; i++)
@@ -5754,8 +5754,8 @@ void NS_DIM_PREFIX ListGrids (const MULTIGRID *theMG)
n1 = CORNER(theElement,CORNER_OF_EDGE(theElement,e,1));
v1 = MYVERTEX(n1);
V_DIM_EUKLIDNORM_OF_DIFF(CVECT(v0),CVECT(v1),h);
- hmin = MIN(hmin,h);
- hmax = MAX(hmax,h);
+ hmin = std::min(hmin,h);
+ hmax = std::max(hmax,h);
}
}
}
@@ -6087,7 +6087,7 @@ static INT MaxNodeClass (const ELEMENT *theElement)
for (i=0; i<CORNERS_OF_ELEM(theElement); i++) {
INT c = NCLASS(CORNER(theElement,i));
- m = MAX(m,c);
+ m = std::max(m,c);
}
return (m);
@@ -6115,7 +6115,7 @@ INT NS_DIM_PREFIX MaxNextNodeClass (const ELEMENT *theElement)
for (i=0; i<CORNERS_OF_ELEM(theElement); i++) {
INT c = NNCLASS(CORNER(theElement,i));
- m = MAX(m,c);
+ m = std::max(m,c);
}
return (m);
@@ -6143,7 +6143,7 @@ INT NS_DIM_PREFIX MinNodeClass (const ELEMENT *theElement)
for (i=0; i<CORNERS_OF_ELEM(theElement); i++) {
INT c = NCLASS(CORNER(theElement,i));
- m = MIN(m,c);
+ m = std::min(m,c);
}
return (m);
@@ -6171,7 +6171,7 @@ INT NS_DIM_PREFIX MinNextNodeClass (const ELEMENT *theElement)
for (i=0; i<CORNERS_OF_ELEM(theElement); i++) {
INT c = NNCLASS(CORNER(theElement,i));
- m = MIN(m,c);
+ m = std::min(m,c);
}
return (m);
@@ -6239,7 +6239,7 @@ static int Scatter_NodeClass (DDD::DDDContext&, DDD_OBJ obj, void *data)
{
NODE *theNode = (NODE *)obj;
- SETNCLASS(theNode,MAX(NCLASS(theNode),((INT *)data)[0]));
+ SETNCLASS(theNode,std::max((INT)NCLASS(theNode),((INT *)data)[0]));
return(0);
}
@@ -6414,7 +6414,7 @@ static int Scatter_NextNodeClass (DDD::DDDContext&, DDD_OBJ obj, void *data)
{
NODE *theNode = (NODE *)obj;
- SETNNCLASS(theNode,MAX(NNCLASS(theNode),((INT *)data)[0]));
+ SETNNCLASS(theNode,std::max((INT)NNCLASS(theNode),((INT *)data)[0]));
return(GM_OK);
}
diff --git a/dune/uggrid/low/misc.h b/dune/uggrid/low/misc.h
index 702eb284f202246d819956562e8d54cdbc4b2962..d3f87ca813b51b85f96f4c04727140236c3445ee 100644
--- a/dune/uggrid/low/misc.h
+++ b/dune/uggrid/low/misc.h
@@ -59,15 +59,6 @@ START_UG_NAMESPACE
/* cleanup old definitions of macros */
-#ifdef MIN
-#undef MIN
-#endif
-#ifdef MAX
-#undef MAX
-#endif
-
-#define MIN(x,y) (((x)<(y)) ? (x) : (y))
-#define MAX(x,y) (((x)>(y)) ? (x) : (y))
#define POW2(i) (1<<(i))
#define SET_FLAG(flag,bitpattern) (flag |= (bitpattern))
diff --git a/dune/uggrid/parallel/dddif/lb.cc b/dune/uggrid/parallel/dddif/lb.cc
index 78da8d977cbc7fa82d5c98948cc43815aa67a05d..5e289c778aa3e531d74b07ea45857b8121c86501 100644
--- a/dune/uggrid/parallel/dddif/lb.cc
+++ b/dune/uggrid/parallel/dddif/lb.cc
@@ -232,8 +232,8 @@ static int PartitionElementsForDD(GRID *theGrid, int hor_boxes, int vert_boxes )
for( i=0; i<nrcorners; i++ )
{
coord = CVECT(MYVERTEX(CORNER(theElement,i)));
- xmax = MAX(xmax,coord[0]);
- ymax = MAX(ymax,coord[1]);
+ xmax = std::max(xmax,coord[0]);
+ ymax = std::max(ymax,coord[1]);
}
ASSERT(xmax>0.0 && xmax<1.00001); /* this function works only for the unit square! */
ASSERT(ymax>0.0 && ymax<1.00001);
diff --git a/dune/uggrid/parallel/dddif/partition.cc b/dune/uggrid/parallel/dddif/partition.cc
index fa255857aab1705a6f4a6aa59e524eb01a02da8a..cbd1301aca9de4f75b6cdef49f3f694806abf8aa 100644
--- a/dune/uggrid/parallel/dddif/partition.cc
+++ b/dune/uggrid/parallel/dddif/partition.cc
@@ -251,7 +251,7 @@ static int Scatter_ElementRestriction (DDD::DDDContext&, DDD_OBJ obj, void *data
{
PRINTDEBUG(gm,4,(PFMT "Scatter_ElementRestriction(): restricting sons of e=" EID_FMTX "\n",
me,EID_PRTX(theElement)))
- used = MAX(USED(theElement),((int *)data)[0]);
+ used = std::max((INT)USED(theElement),((int *)data)[0]);
SETUSED(theElement,used);
}