Skip to content

Add floating point exception flags for BOPT=g. #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
theurich wants to merge 5 commits into
base: develop
Choose a base branch
from
+177 −65
Draft

Add floating point exception flags for BOPT=g. #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78f50ac
Add floating point exception flags for BOPT=g.
theurich Jun 13, 2023
7c27a5d
Fix fpe in infrastructure array tests
danrosen25 Sep 14, 2023
0d97195
Fix fpe in infrastructure field tests
danrosen25 Sep 15, 2023
0919061
Fix fpe in infrastructure localarray route util
danrosen25 Sep 15, 2023
323125b
Fix fpe in infrastructure vm tests
danrosen25 Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_config/Cygwin.gfortran.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -v --version
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer -ffpe-trap=zero,overflow
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused

############################################################
Expand Down
2 changes: 1 addition & 1 deletion build_config/Darwin.gfortran.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ endif
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer -ffpe-trap=zero,overflow
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused

############################################################
Expand Down
2 changes: 1 addition & 1 deletion build_config/Darwin.gfortranclang.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -v --version
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fimplicit-none -fcheck=all,no-pointer
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fimplicit-none -fcheck=all,no-pointer -ffpe-trap=zero,overflow
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused

############################################################
Expand Down
4 changes: 2 additions & 2 deletions build_config/Darwin.intel.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ ESMF_CXXMAJORVERSION = $(shell $(ESMF_DIR)/scripts/version.intel 1 ${ESMF_C
############################################################
# Special debug flags
#
ESMF_CXXOPTFLAG_G += -Wcheck
ESMF_F90OPTFLAG_G += -traceback -check bounds
ESMF_F90OPTFLAG_G += -traceback -check bounds -fpe0
ESMF_CXXOPTFLAG_G += -Wcheck -fp-trap=common

############################################################
# Enable TR15581/F2003 Allocatable array resizing
Expand Down
2 changes: 1 addition & 1 deletion build_config/Darwin.intelclang.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -v --version
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -traceback -check bounds
ESMF_F90OPTFLAG_G += -traceback -check bounds -fpe0

############################################################
# Enable TR15581/F2003 Allocatable array resizing
Expand Down
2 changes: 1 addition & 1 deletion build_config/Darwin.intelgcc.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ ESMF_F90MAJORVERSION = $(shell $(ESMF_DIR)/scripts/version.intel 1 ${ESMF_F
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -traceback -check bounds -fpe0
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused
ESMF_F90OPTFLAG_G += -traceback -check bounds

############################################################
# Enable TR15581/F2003 Allocatable array resizing
Expand Down
5 changes: 5 additions & 0 deletions build_config/Darwin.nag.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ ESMF_F90COMPILER_VERSION = ${ESMF_F90COMPILER} -v -V -dryrun
ESMF_CXXCOMPILER_VERSION = ${ESMF_CXXCOMPILER} -v --version
ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -v --version

############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -C=array -ieee=stop

############################################################
# See if g++ is really clang
#
Expand Down
2 changes: 1 addition & 1 deletion build_config/Linux.absoftintel.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -V -v
############################################################
# Special debug flags
#
ESMF_CXXOPTFLAG_G += -traceback
ESMF_CXXOPTFLAG_G += -traceback -fp-trap=common

############################################################
# How to specify module directories
Expand Down
2 changes: 1 addition & 1 deletion build_config/Linux.gfortran.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} --version
# Also set environment variable UBSAN_OPTIONS="print_stacktrace=1"
# for stacktrace at runtime.
#
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer -ffpe-trap=zero,overflow
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused $(ESMF_LINKOPTFLAG_G)

############################################################
Expand Down
2 changes: 1 addition & 1 deletion build_config/Linux.gfortranclang.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -v --version
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer -ffpe-trap=zero,overflow

############################################################
# Fortran symbol convention
Expand Down
4 changes: 2 additions & 2 deletions build_config/Linux.intel.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ ESMF_CXXMAJORVERSION = $(shell $(ESMF_DIR)/scripts/version.intel 1 ${ESMF_C
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -traceback -check arg_temp_created,bounds,format,output_conversion,stack,uninit
ESMF_CXXOPTFLAG_G += -traceback -Wcheck
ESMF_F90OPTFLAG_G += -traceback -check arg_temp_created,bounds,format,output_conversion,stack,uninit -fpe0
ESMF_CXXOPTFLAG_G += -traceback -Wcheck -fp-trap=common

############################################################
# Enable TR15581/F2003 Allocatable array resizing
Expand Down
2 changes: 1 addition & 1 deletion build_config/Linux.intelgcc.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ ESMF_F90MAJORVERSION = $(shell $(ESMF_DIR)/scripts/version.intel 1 ${ESMF
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -traceback -check bounds
ESMF_F90OPTFLAG_G += -traceback -check bounds -fpe0
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused

############################################################
Expand Down
2 changes: 1 addition & 1 deletion build_config/Linux.nag.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} --version
# Also set environment variable UBSAN_OPTIONS="print_stacktrace=1"
# for stacktrace at runtime.
#
ESMF_F90OPTFLAG_G += -C=array
ESMF_F90OPTFLAG_G += -C=array -ieee=stop
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused $(ESMF_LINKOPTFLAG_G)

############################################################
Expand Down
3 changes: 2 additions & 1 deletion build_config/Linux.nagintel.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ ESMF_CXXMAJORVERSION = $(shell $(ESMF_DIR)/scripts/version.intel 1 ${ESMF
############################################################
# Special debug flags
#
ESMF_CXXOPTFLAG_G += -traceback
ESMF_F90OPTFLAG_G += -C=array -ieee=stop
ESMF_CXXOPTFLAG_G += -traceback -fp-trap=common

############################################################
# Set NAG unix modules when certain non-Standard system calls
Expand Down
6 changes: 6 additions & 0 deletions build_config/Linux.nvhpc.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ ESMF_F90COMPILER_VERSION = ${ESMF_F90COMPILER} --version -c
ESMF_CXXCOMPILER_VERSION = ${ESMF_CXXCOMPILER} --version -c
ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} --version -c

############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Ktrap=fp
ESMF_CXXOPTFLAG_G += -Ktrap=fp

############################################################
# Currently no support the Fortran2018 assumed type feature
#
Expand Down
2 changes: 1 addition & 1 deletion build_config/MinGW.gfortran.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -v --version
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer -ffpe-trap=zero,overflow
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused

############################################################
Expand Down
4 changes: 2 additions & 2 deletions build_config/MinGW.intel.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ ESMF_F90COMPILEFIXCPP = -fpp
###########################################################
# Special debugging flags
#
ESMF_F90OPTFLAG_G = -Od -debug -traceback
ESMF_CXXOPTFLAG_G = -Od -debug -traceback
ESMF_F90OPTFLAG_G = -Od -debug -traceback -fpe0
ESMF_CXXOPTFLAG_G = -Od -debug -traceback -fp-trap=common

###########################################################
# Default optlevel
Expand Down
2 changes: 1 addition & 1 deletion build_config/MinGW.intelcl.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ ESMF_F90COMPILEFIXCPP = -fpp
###########################################################
# Special debugging flags
#
ESMF_F90OPTFLAG_G = -Od -debug -traceback
ESMF_F90OPTFLAG_G = -Od -debug -traceback -fpe0
ESMF_CXXOPTFLAG_G = -Od -Zi

###########################################################
Expand Down
2 changes: 1 addition & 1 deletion build_config/Unicos.gfortran.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} --version
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer
ESMF_F90OPTFLAG_G += -Wall -Wextra -Wconversion -Wno-unused -Wno-unused-dummy-argument -fbacktrace -fimplicit-none -fcheck=all,no-pointer -ffpe-trap=zero,overflow
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused

############################################################
Expand Down
4 changes: 2 additions & 2 deletions build_config/Unicos.intel.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} -V
############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -traceback -check arg_temp_created,bounds,format,output_conversion,stack,uninit
ESMF_CXXOPTFLAG_G += -traceback -Wcheck
ESMF_F90OPTFLAG_G += -traceback -check arg_temp_created,bounds,format,output_conversion,stack,uninit -fpe0
ESMF_CXXOPTFLAG_G += -traceback -Wcheck -fp-trap=common

############################################################
# Enable TR15581/F2003 Allocatable array resizing
Expand Down
6 changes: 6 additions & 0 deletions build_config/Unicos.nvhpc.default/build_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ ESMF_F90COMPILER_VERSION = ${ESMF_F90COMPILER} --version -c
ESMF_CXXCOMPILER_VERSION = ${ESMF_CXXCOMPILER} --version -c
ESMF_CCOMPILER_VERSION = ${ESMF_CCOMPILER} --version -c

############################################################
# Special debug flags
#
ESMF_F90OPTFLAG_G += -Ktrap=fp
ESMF_CXXOPTFLAG_G += -Ktrap=fp

############################################################
# Currently no support the Fortran2018 assumed type feature
#
Expand Down
5 changes: 5 additions & 0 deletions src/Infrastructure/Array/tests/ESMF_ArrayCreateGetUTest.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ program ESMF_ArrayCreateGetUTest
! !USES:
use ESMF_TestMod ! test methods
use ESMF
use, intrinsic :: ieee_arithmetic

implicit none

Expand Down Expand Up @@ -375,6 +376,9 @@ program ESMF_ArrayCreateGetUTest
dataCorrect = .true.
do j=lbound(farrayPtr2D,2), ubound(farrayPtr2D,2)
do i=lbound(farrayPtr2D,1), ubound(farrayPtr2D,1)
if (ieee_is_nan(farrayPtr2DCpy(i,j))) then
farrayPtr2DCpy(i,j) = 0
endif
write (msg,*) "farrayPtr2D(",i,",",j,")=", farrayPtr2D(i,j), &
" farrayPtr2DCpy(",i,",",j,")=", farrayPtr2DCpy(i,j)
call ESMF_LogWrite(msg, ESMF_LOGMSG_INFO, rc=rc)
Expand Down Expand Up @@ -628,6 +632,7 @@ program ESMF_ArrayCreateGetUTest
write(name, *) "ArrayCreate from Ptr with 3D farray on 2D DistGrid Test as Ptr"
write(failMsg, *) "Did not return ESMF_SUCCESS"
allocate(farrayPtr3D(-2:6,12,3:10))
farrayPtr3D = 0
array = ESMF_ArrayCreate(farrayPtr=farrayPtr3D, distgrid=distgrid, &
name="MyArray", rc=rc)
call ESMF_Test((rc.eq.ESMF_SUCCESS), name, failMsg, result, ESMF_SRCLINE)
Expand Down
6 changes: 3 additions & 3 deletions src/Infrastructure/Array/tests/ESMF_ArrayRedistUTest.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2943,11 +2943,11 @@ program ESMF_ArrayRedistUTest
! 5 0 5 220, 213, 212, 211, 210, 201, 200
!------------------------------------------------------------------------

write(msgString,*) "dstArray7(j=1): ", farrayPtr2D(1,:)
write(msgString,*) "dstArray7(j=1): ", (farrayPtr2D(1,i), i=lbound(farrayPtr2D, 2), ubound(farrayPtr2D, 2))
call ESMF_LogWrite(msgString, ESMF_LOGMSG_INFO, rc=rc)
write(msgString,*) "dstArray7(j=2): ", farrayPtr2D(2,:)
write(msgString,*) "dstArray7(j=2): ", (farrayPtr2D(2,i), i=lbound(farrayPtr2D, 2), ubound(farrayPtr2D, 2))
call ESMF_LogWrite(msgString, ESMF_LOGMSG_INFO, rc=rc)
write(msgString,*) "dstArray7(j=3): ", farrayPtr2D(3,:)
write(msgString,*) "dstArray7(j=3): ", (farrayPtr2D(3,i), i=lbound(farrayPtr2D, 2), ubound(farrayPtr2D, 2))
call ESMF_LogWrite(msgString, ESMF_LOGMSG_INFO, rc=rc)

!------------------------------------------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions src/Infrastructure/Field/tests/ESMF_FieldRegridCsrv2ndUTest.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6284,6 +6284,11 @@ subroutine test_PerLocStatus(rc)
rc=ESMF_FAILURE
return
endif
call ESMF_FieldFill(srcField, dataFillScheme="one", rc=localrc)
if (localrc /=ESMF_SUCCESS) then
rc=ESMF_FAILURE
return
endif


! deallocate node data
Expand Down
20 changes: 20 additions & 0 deletions src/Infrastructure/Field/tests/ESMF_FieldRegridCsrvUTest.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6338,6 +6338,11 @@ subroutine test_ignoreDegenerate(rc)
rc=ESMF_FAILURE
return
endif
call ESMF_FieldFill(srcField, dataFillScheme="one", rc=localrc)
if (localrc /=ESMF_SUCCESS) then
rc=ESMF_FAILURE
return
endif


! deallocate node data
Expand Down Expand Up @@ -15259,6 +15264,11 @@ subroutine test_regridPerLocStatus(rc)
rc=ESMF_FAILURE
return
endif
call ESMF_FieldFill(srcField, dataFillScheme="one", rc=localrc)
if (localrc /=ESMF_SUCCESS) then
rc=ESMF_FAILURE
return
endif


! deallocate node data
Expand Down Expand Up @@ -18554,6 +18564,11 @@ subroutine test_regridDisjoint(rc)
rc=ESMF_FAILURE
return
endif
call ESMF_FieldFill(srcField, dataFillScheme="one", rc=localrc)
if (localrc /=ESMF_SUCCESS) then
rc=ESMF_FAILURE
return
endif

! Create source frac field
srcFracField = ESMF_FieldCreate(srcMesh, arrayspec, meshloc=ESMF_MESHLOC_ELEMENT, &
Expand Down Expand Up @@ -19389,6 +19404,11 @@ subroutine test_overlap_error(rc)
rc=ESMF_FAILURE
return
endif
call ESMF_FieldFill(srcField, dataFillScheme="one", rc=localrc)
if (localrc /=ESMF_SUCCESS) then
rc=ESMF_FAILURE
return
endif

! Create source frac field
srcFracField = ESMF_FieldCreate(srcMesh, arrayspec, meshloc=ESMF_MESHLOC_ELEMENT, &
Expand Down
Loading