From 3ffde678ce81de782eccc557de249323534de100 Mon Sep 17 00:00:00 2001
From: Tony Craig <apcraig@users.noreply.github.com>
Date: Thu, 29 Feb 2024 20:33:22 -0800
Subject: [PATCH] Update pull request template, Update conda_macos debug flag
 (#484)

Update pull request template to ask for additional information about the PR. This information can and will be used during the squash merge process to produce more useful commit logs.

Update Macros.conda_macos to remove ffpe-trap=invalid from debug flags.
This flag causes nf90_create to fail with the latest version of
the conda environment. This happens when debug flags are on
and a test with netcdf is turned on. I believe this is a compiler error.
---
 .github/PULL_REQUEST_TEMPLATE.md                  | 2 +-
 configuration/scripts/machines/Macros.conda_macos | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4ab4ecadf..8b0fa3a24 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,4 +26,4 @@ please refer to: <https://github.com/CICE-Consortium/About-Us/wiki/Resource-Inde
     - [ ] No, does the documentation need to be updated at a later time?
         - [ ] Yes
         - [ ] No 
-- [ ] Please provide any additional information or relevant details below:
+- [ ] Please document the changes in detail, including _why_ the changes are made.  This will become part of the PR commit log.
diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos
index a9381791f..915ebc22c 100644
--- a/configuration/scripts/machines/Macros.conda_macos
+++ b/configuration/scripts/machines/Macros.conda_macos
@@ -14,7 +14,9 @@ FFLAGS     := -fconvert=big-endian -fbacktrace -ffree-line-length-none
 
 # Additional flags for the Fortran compiler when compiling in debug mode
 ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS   += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow
+# new version of conda gnu compiler has a bug in ffpe-trap=invalid with nf90_create
+#  FFLAGS   += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow
+  FFLAGS   += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=zero,overflow
 else
   FFLAGS   += -O2
 endif