Skip to content
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.

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

fix: reenable floating point exceptions #3300

Merged
merged 23 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c91b10f
reintroduce GEOS_ENABLE_FPE to GeosxOptions.cmake
rrsettgast Aug 22, 2024
8c8f25e
give CompositionalMultiphaseBase::m_maxRelativeCompDensChange a usabl…
rrsettgast Aug 23, 2024
a44164a
some modifications for fpe on testFlowStatistics
rrsettgast Aug 26, 2024
76e5fec
remove cmake debugging
rrsettgast Aug 26, 2024
18df975
update TPL paths. more fixes for CO2SolubilityDuanSun.cpp
rrsettgast Aug 26, 2024
5c756a2
Merge branch 'develop' into bugfix/reenableFPE
rrsettgast Aug 26, 2024
6d77b5c
uncrustify
rrsettgast Aug 27, 2024
3d47509
update submodule for LC paths update
rrsettgast Aug 27, 2024
1616395
Merge branch 'develop' into bugfix/reenableFPE
rrsettgast Aug 27, 2024
ccaed5f
Merge branch 'bugfix/reenableFPE' of github.com:GEOS-DEV/GEOS into bu…
rrsettgast Aug 27, 2024
6edb9ba
error in fpe workaround
rrsettgast Aug 27, 2024
6f9a746
update tpl tag
rrsettgast Aug 27, 2024
18da630
change clang15 build to streak....because it passes on streak, and I …
rrsettgast Aug 27, 2024
737da60
change clang15 build to streak....because it passes on streak, and I …
rrsettgast Aug 27, 2024
ac54e0d
just disable FPE for testVTKImport
rrsettgast Aug 28, 2024
efe1119
put the disableFPE in the correct place
rrsettgast Aug 28, 2024
11a861f
Merge branch 'develop' into bugfix/reenableFPE
rrsettgast Aug 28, 2024
7ba53b3
uncrustify
rrsettgast Aug 28, 2024
0560c23
Merge branch 'bugfix/reenableFPE' of github.com:GEOS-DEV/GEOS into bu…
rrsettgast Aug 28, 2024
1277f18
avoid another FPE
rrsettgast Aug 28, 2024
6ec4dcd
update integratedTest baselines
rrsettgast Aug 28, 2024
a76c249
Apply suggestions from code review
rrsettgast Aug 28, 2024
f5ec4c4
allow failure of SeismicityRate_poromechanics_1d_smoke_01,SeismicityR…
rrsettgast Aug 28, 2024
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
3 changes: 2 additions & 1 deletion src/cmake/GeosxOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ message( "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}" )
message( "CMAKE_HOST_APPLE = ${CMAKE_HOST_APPLE}" )

### OPTIONS ###
option( GEOS_ENABLE_TESTS "" ON )
option( GEOS_ENABLE_FPE "Enables floating point exceptions" ON )
option( GEOS_ENABLE_TESTS "Enables unit tests" ON )
option( ENABLE_CALIPER "Enables Caliper instrumentation" OFF )

option( ENABLE_MATHPRESSO "" ON )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ namespace geos

void HypreInterface::initialize()
{
#ifdef GEOS_USE_OPENMP
GEOS_LOG_RANK_0_IF( omp_get_max_threads()>1,
"OMP_NUM_THREADS > 1 may not be optimal for certain hypre preconditioning options. " );
#endif

HYPRE_Init();
#if GEOS_USE_HYPRE_DEVICE == GEOS_USE_HYPRE_CUDA || GEOS_USE_HYPRE_DEVICE == GEOS_USE_HYPRE_HIP
HYPRE_SetExecutionPolicy( HYPRE_EXEC_DEVICE );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ CompositionalMultiphaseBase::CompositionalMultiphaseBase( const string & name,
this->registerWrapper( viewKeyStruct::maxRelativeCompDensChangeString(), &m_maxRelativeCompDensChange ).
setSizedFromParent( 0 ).
setInputFlag( InputFlags::OPTIONAL ).
setApplyDefaultValue( LvArray::NumericLimits< real64 >::max ). // disabled by default
setApplyDefaultValue( LvArray::NumericLimits< real64 >::max/1.0e100 ). // disabled by default
setDescription( "Maximum (relative) change in a component density in a Newton iteration" );

this->registerWrapper( viewKeyStruct::allowLocalCompDensChoppingString(), &m_allowCompDensChopping ).
Expand Down
Loading