Skip to content

Commit a8d6341

Browse files
authored
v3: Fix NVHPC build failure in OpenMP_Support (#4950)
1 parent 7c6d194 commit a8d6341

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Fixed
1313

14+
- Fix NVHPC compiler build failure in `superstructure/generic/OpenMP_Support.F90`:
15+
replace `ESMF_UserCompGetInternalState` and `ESMF_UserCompSetInternalState` with
16+
their MAPL wrapper equivalents (`MAPL_UserCompGetInternalState` /
17+
`MAPL_UserCompSetInternalState`).
1418
- Relaxed the comparison standard for grid_is_ok in case a grid is r4
1519
- Fix `mapl/MAPL.F90` to use `mapl_ErrorHandling` directly instead of the thin
1620
`mapl_ErrorHandlingMod` wrapper, resolving an `ifx` linker issue with bare

superstructure/generic/OpenMP_Support.F90

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module mapl_OpenMP_Support
88
use mapl_Subgrid, only: Interval, make_subgrids, find_bounds
99
use mapl_StateAddMethodImpl, only: CallbackMap, CallbackMapIterator, CallbackMethodWrapper, get_callbacks
1010
use mapl_StateAddMethodImpl, only: operator(/=)
11+
use mapl_ESMF_Interfaces, only: MAPL_UserCompGetInternalState, MAPL_UserCompSetInternalState
1112
!$ use omp_lib
1213

1314
implicit none(type,external)
@@ -390,12 +391,12 @@ function make_subgridcomps(GridComp, run_entry_points, num_grids, unusable, rc)
390391
end do
391392

392393
do ilabel = 1, size(labels)
393-
call ESMF_UserCompGetInternalState(GridComp, trim(labels(ilabel)), wrap, status)
394+
call MAPL_UserCompGetInternalState(GridComp, trim(labels(ilabel)), wrap, status)
394395
has_private_state = (status == ESMF_SUCCESS)
395396
do i = 1, num_grids
396397
associate (gc => subgridcomps(i) )
397398
if (has_private_state) then
398-
call ESMF_UserCompSetInternalState(gc, trim(labels(ilabel)), wrap, status)
399+
call MAPL_UserCompSetInternalState(gc, trim(labels(ilabel)), wrap, status)
399400
_VERIFY(status)
400401
end if
401402
end associate

0 commit comments

Comments
 (0)