From a442739dfe35d761d11fe9dd42fb01d019a6990b Mon Sep 17 00:00:00 2001
From: Weiqun Zhang <weiqunzhang@lbl.gov>
Date: Mon, 31 Oct 2022 08:07:48 -0700
Subject: [PATCH] Fix compilation for PETSc

We cannot include PETSc headers too early because it might redefine MPI
routines as macros
(https://github.com/petsc/petsc/blob/main/include/petsclog.h#L441).  They
break MPI calls like below,

    MPI_Allreduce(&tmp, &vi, 1,
                  ParallelDescriptor::Mpi_typemap<T>::type(),
                  ParallelDescriptor::Mpi_op<T,amrex::Greater<T>>(), comm);

because of the `,` in `<T,amrex::Greater<T>>`.
---
 Src/Extern/PETSc/AMReX_PETSc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Src/Extern/PETSc/AMReX_PETSc.cpp b/Src/Extern/PETSc/AMReX_PETSc.cpp
index bf0bf68a99c..7d8cd79b582 100644
--- a/Src/Extern/PETSc/AMReX_PETSc.cpp
+++ b/Src/Extern/PETSc/AMReX_PETSc.cpp
@@ -1,7 +1,4 @@
 
-#include <petscksp.h>
-#include <AMReX_PETSc.H>
-
 #ifdef AMREX_USE_EB
 #include <AMReX_MultiCutFab.H>
 #include <AMReX_EBFabFactory.H>
@@ -9,6 +6,9 @@
 
 #include <AMReX_Habec_K.H>
 
+#include <petscksp.h>
+#include <AMReX_PETSc.H>
+
 #include <cmath>
 #include <numeric>
 #include <limits>