From 77cb14981c34d35f1a39ebeb33921da9da566c56 Mon Sep 17 00:00:00 2001
From: guj <jgu@lbl.gov>
Date: Wed, 13 Dec 2023 23:01:19 -0800
Subject: [PATCH] ordered include file orders (amrex then openpmd then cpp)

---
 Src/Base/AMReX_PlotFileUtil.H                        |  8 ++++----
 Src/Extern/openPMD-api/AMReX_ParticlesOPENPMD.H      |  2 --
 Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD.cpp     |  2 +-
 Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD_PTL.cpp | 10 ++++++----
 Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H   |  6 +++---
 Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.cpp |  6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Src/Base/AMReX_PlotFileUtil.H b/Src/Base/AMReX_PlotFileUtil.H
index d1e416c8071..dd79bb9089e 100644
--- a/Src/Base/AMReX_PlotFileUtil.H
+++ b/Src/Base/AMReX_PlotFileUtil.H
@@ -12,14 +12,14 @@
 #include <AMReX_PlotFileUtilHDF5.H>
 #endif
 
-#include <ostream>
-#include <string>
-#include <memory>
-
 #ifdef AMREX_USE_OPENPMD_API
 #include <AMReX_PlotFileUtilOPENPMD.H>
 #endif
 
+#include <ostream>
+#include <string>
+#include <memory>
+
 namespace amrex
 {
     //!  return the name of the level directory,  e.g., Level_5
diff --git a/Src/Extern/openPMD-api/AMReX_ParticlesOPENPMD.H b/Src/Extern/openPMD-api/AMReX_ParticlesOPENPMD.H
index 37d28e32ce1..d2accb491fe 100644
--- a/Src/Extern/openPMD-api/AMReX_ParticlesOPENPMD.H
+++ b/Src/Extern/openPMD-api/AMReX_ParticlesOPENPMD.H
@@ -1,8 +1,6 @@
 #ifndef AMREX_PTL_OPENPMD_API_H
 #define AMREX_PTL_OPENPMD_API_H
 
-//#include <openPMD/openpmd.hpp>
-
 
 struct AMReX_PtlCounter
 {
diff --git a/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD.cpp b/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD.cpp
index 276d09165c0..f387d447c71 100644
--- a/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD.cpp
+++ b/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD.cpp
@@ -12,8 +12,8 @@
 #include <AMReX_EBFabFactory.H>
 #endif
 
-#include <openPMD/openPMD.hpp>
 #include <AMReX_PlotFileUtilOPENPMD.H>
+#include <openPMD/openPMD.hpp>
 #include <regex>
 
 namespace amrex {
diff --git a/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD_PTL.cpp b/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD_PTL.cpp
index 5f8f8ebfc21..051626aae3d 100644
--- a/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD_PTL.cpp
+++ b/Src/Extern/openPMD-api/AMReX_PlotFileOPENPMD_PTL.cpp
@@ -5,16 +5,18 @@
 #include <AMReX_FabArrayUtility.H>
 #include <AMReX_ParmParse.H>
 
-#include <fstream>
-#include <iomanip>
-
 #ifdef AMREX_USE_EB
 #include <AMReX_EBFabFactory.H>
 #endif
 
-#include <openPMD/openPMD.hpp>
 #include <AMReX_PlotFileUtilOPENPMD.H>
+#include <openPMD/openPMD.hpp>
+
 #include <regex>
+#include <fstream>
+#include <iomanip>
+
+
 namespace amrex {
   namespace openpmd_api {
 
diff --git a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H
index ecab3011521..dbd3d949f0c 100644
--- a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H
+++ b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H
@@ -10,13 +10,13 @@
 #include <AMReX_ParIter.H>
 #include <AMReX_Particles.H>
 
-#include <string>
-#include <memory>
-
 #ifdef AMREX_USE_OPENPMD_API
 #include <openPMD/openPMD.hpp>
 #endif
 
+#include <string>
+#include <memory>
+
 namespace amrex
 {
   namespace openpmd_api
diff --git a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.cpp b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.cpp
index 869f7a44678..31c543eda2c 100644
--- a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.cpp
+++ b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.cpp
@@ -5,15 +5,15 @@
 #include <AMReX_FabArrayUtility.H>
 #include <AMReX_ParmParse.H>
 
-#include <fstream>
-#include <iomanip>
-
 #ifdef AMREX_USE_EB
 #include <AMReX_EBFabFactory.H>
 #endif
 
 #include <AMReX_PlotFileUtilOPENPMD.H>
 
+#include <fstream>
+#include <iomanip>
+
 namespace amrex
 {
   namespace openpmd_api