Skip to content

Commit

Permalink
Merge branch 'develop' into feature/wjiang/no_done
Browse files Browse the repository at this point in the history
  • Loading branch information
tclune authored May 20, 2024
2 parents 9e519f7 + 8cc8dbd commit a47cd28
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- If file path length exceeds ESMF_MAXSTR, add _FAIL in subroutine fglob
- Add GNU UFS-like CI test

### Changed
Expand Down Expand Up @@ -39,8 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Update `FindESMF.cmake` to match that in ESMF 8.6.1
- Add timer to the sampler code
### Changed

- Set required version of ESMF to 8.6.1
- Update `components.yaml`
- ESMA_cmake v3.45.0
Expand Down
7 changes: 6 additions & 1 deletion base/MAPL_ObsUtil.F90
Original file line number Diff line number Diff line change
Expand Up @@ -941,11 +941,16 @@ subroutine fglob(search_name, filename, rc) ! give the last name

character(kind=C_CHAR, len=:), allocatable :: c_search_name
character(kind=C_CHAR, len=512) :: c_filename
integer slen
integer :: slen, lenmax

c_search_name = trim(search_name)//C_NULL_CHAR
rc = f_call_c_glob(c_search_name, c_filename, slen)
filename=""
lenmax = len(filename)
if (lenmax < slen) then
if (MAPL_AM_I_ROOT()) write(6,*) 'pathlen vs filename_max_char_len: ', slen, lenmax
_FAIL ('PATHLEN is greater than filename_max_char_len')
end if
if (slen>0) filename(1:slen)=c_filename(1:slen)

return
Expand Down

0 comments on commit a47cd28

Please sign in to comment.