From 80b4fea2ce20700bb40a1f2e2a1087584045f71e Mon Sep 17 00:00:00 2001
From: Masoud <m1459n@gmail.com>
Date: Wed, 25 Dec 2024 11:59:24 +0330
Subject: [PATCH 1/4] Update mesh.cpp

M_PI is undeclared in Intel and MSVC compilers. To make it declared in these compilers '#define _USE_MATH_DEFINES' must be added before '#include <cmath>'.
---
 src/mesh.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesh.cpp b/src/mesh.cpp
index 2ee616f28dc..6d8d0b733b6 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -1,5 +1,6 @@
 #include "openmc/mesh.h"
 #include <algorithm> // for copy, equal, min, min_element
+#define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
 #include <cmath>     // for ceil
 #include <cstddef>   // for size_t
 #include <gsl/gsl-lite.hpp>

From 9b588844a25b2b363f581bd16c583cbffcc12a6b Mon Sep 17 00:00:00 2001
From: Masoud <m1459n@gmail.com>
Date: Wed, 25 Dec 2024 12:00:40 +0330
Subject: [PATCH 2/4] Update plot.cpp

M_PI is undeclared in Intel and MSVC compilers. To make it declared in these compilers '#define _USE_MATH_DEFINES' must be added before '#include <cmath>'.
---
 src/plot.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plot.cpp b/src/plot.cpp
index 348138570c1..3a75460a35d 100644
--- a/src/plot.cpp
+++ b/src/plot.cpp
@@ -1,3 +1,5 @@
+#define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
+
 #include "openmc/plot.h"
 
 #include <algorithm>

From cdaadc955798afa2fff36ef7aa4b37ad20bf0d48 Mon Sep 17 00:00:00 2001
From: Masoud <m1459n@gmail.com>
Date: Wed, 25 Dec 2024 12:02:18 +0330
Subject: [PATCH 3/4] Update quartic_solver.cpp

M_PI is undeclared in Intel and MSVC compilers. To make it declared in these compilers '#define _USE_MATH_DEFINES' must be added before '#include <cmath>'.
---
 src/external/quartic_solver.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/external/quartic_solver.cpp b/src/external/quartic_solver.cpp
index 0b280e83c29..71bdb25c3e3 100644
--- a/src/external/quartic_solver.cpp
+++ b/src/external/quartic_solver.cpp
@@ -1,3 +1,4 @@
+#define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
 #include <algorithm>
 #include <cmath>
 #include <complex>

From da944edc8c755e65d4c9e4d9554299b33da7d9f2 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Mon, 6 Jan 2025 06:45:29 -0600
Subject: [PATCH 4/4] Reorder includes

---
 src/external/quartic_solver.cpp | 2 +-
 src/mesh.cpp                    | 6 +++---
 src/plot.cpp                    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/external/quartic_solver.cpp b/src/external/quartic_solver.cpp
index 71bdb25c3e3..915020ffaa3 100644
--- a/src/external/quartic_solver.cpp
+++ b/src/external/quartic_solver.cpp
@@ -1,5 +1,5 @@
-#define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
 #include <algorithm>
+#define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
 #include <cmath>
 #include <complex>
 #include <cstdlib>
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 6d8d0b733b6..4b1878c5a2c 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -1,8 +1,8 @@
 #include "openmc/mesh.h"
-#include <algorithm> // for copy, equal, min, min_element
+#include <algorithm>      // for copy, equal, min, min_element
 #define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
-#include <cmath>     // for ceil
-#include <cstddef>   // for size_t
+#include <cmath>          // for ceil
+#include <cstddef>        // for size_t
 #include <gsl/gsl-lite.hpp>
 #include <string>
 
diff --git a/src/plot.cpp b/src/plot.cpp
index 3a75460a35d..de7d475e1c5 100644
--- a/src/plot.cpp
+++ b/src/plot.cpp
@@ -1,8 +1,8 @@
-#define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
-
 #include "openmc/plot.h"
 
 #include <algorithm>
+#define _USE_MATH_DEFINES // to make M_PI declared in Intel and MSVC compilers
+#include <cmath>
 #include <cstdio>
 #include <fstream>
 #include <sstream>