Merge pull request #4110 from GEOS-ESM/bugfix/nvhpc-ieee

Author: mathomp4

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed `mapl_acg.cmake` to allow for more than one StateSpecs file per target
+- Fix NVHPC issue with IEEE halting code
 
 ### Added
 

gridcomps/Cap/MAPL_Cap.F90

@@ -478,11 +478,7 @@ subroutine initialize_mpi(this, unusable, rc)
       integer :: npes_world
       logical :: halting_mode(5)
 
-      logical :: set_halting_allowed = ieee_support_halting(ieee_invalid) .and. &
-         ieee_support_halting(ieee_overflow) .and. &
-         ieee_support_halting(ieee_divide_by_zero) .and. &
-         ieee_support_halting(ieee_underflow) .and. &
-         ieee_support_halting(ieee_inexact)
+      logical :: set_halting_allowed
 
       _UNUSED_DUMMY(unusable)
 
@@ -492,6 +488,12 @@ subroutine initialize_mpi(this, unusable, rc)
       if (.not. this%mpi_already_initialized) then
          call ESMF_InitializePreMPI(_RC)
 
+         set_halting_allowed = ieee_support_halting(ieee_invalid) .and. &
+            ieee_support_halting(ieee_overflow) .and. &
+            ieee_support_halting(ieee_divide_by_zero) .and. &
+            ieee_support_halting(ieee_underflow) .and. &
+            ieee_support_halting(ieee_inexact)
+
          ! Testing with GCC 14 + MVAPICH 4 found that it was failing with
          ! a SIGFPE in MPI_Init_thread(). Turning off ieee halting
          ! around the call seems to "fix" it.