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

More informative error messages #3161

Merged
merged 44 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
1d1560d
Print file and variable names in case of errors, and pring offending …
AgilentGCMS Nov 6, 2024
5077b9d
Update gridcomps/ExtData2G/ExtDataConfig.F90
tclune Nov 6, 2024
e1a049d
Update gridcomps/ExtData2G/ExtDataConfig.F90
tclune Nov 6, 2024
27fa605
Merge branch 'develop' into feature/sbasu1/verbose_print
mathomp4 Nov 6, 2024
a8d73cf
Merge branch 'develop' into feature/sbasu1/verbose_print
mathomp4 Nov 13, 2024
8356384
Update changelog
mathomp4 Nov 13, 2024
cf60fdb
check tableEnd efficiently
weiyuan-jiang Nov 13, 2024
25c8a5c
Added return to fetch_data
weiyuan-jiang Nov 13, 2024
84c6832
rename cap_import to more generic name
weiyuan-jiang Nov 14, 2024
ce10328
Update gridcomps/Cap/MAPL_CapGridComp.F90
tclune Nov 14, 2024
ad0a569
Merge pull request #3178 from GEOS-ESM/feature/wjiang/tableEnd
mathomp4 Nov 14, 2024
87695c3
updates
bena-nasa Nov 21, 2024
9153589
more updates
bena-nasa Nov 22, 2024
ded9a8f
more updates
bena-nasa Nov 22, 2024
935a4b8
update changelog
bena-nasa Nov 22, 2024
8ce9c6a
comments
bena-nasa Nov 25, 2024
f05d7af
CI changes for GEOSadas
mathomp4 Nov 27, 2024
fc85e4c
Merge pull request #3197 from GEOS-ESM/bugfix/mathomp4/adas-ci-fix
mathomp4 Nov 27, 2024
5cb22db
fixes #3201
bena-nasa Dec 2, 2024
89e5348
Update for f2py-meson support
mathomp4 Dec 2, 2024
a2cedd1
Update changelog and version for 2.50.3 release
mathomp4 Dec 2, 2024
fbe9af8
protect against 0 length string
bena-nasa Dec 2, 2024
398c9b3
Backport ADAS CI Fix
mathomp4 Dec 3, 2024
6efaf44
Merge pull request #3202 from GEOS-ESM/feature/mathomp4/support-meson…
mathomp4 Dec 3, 2024
7eb7786
Merge pull request #3203 from GEOS-ESM/hotfix/bmauer/fixes-#3201
bena-nasa Dec 3, 2024
d4ff7d1
Merge branch 'main' into develop
mathomp4 Dec 3, 2024
d9b2fbf
fixes #3210
bena-nasa Dec 3, 2024
daab7d7
oops
bena-nasa Dec 3, 2024
5ad02a1
update changelog
bena-nasa Dec 3, 2024
d1b0f0d
more updates
bena-nasa Dec 3, 2024
9778fd3
Merge branch 'develop' into feature/fixes-#3175
bena-nasa Dec 3, 2024
baf3109
Merge branch 'develop' into feature/bmauer/fixes-#3210
bena-nasa Dec 3, 2024
58ddb04
Merge pull request #3211 from GEOS-ESM/feature/bmauer/fixes-#3210
mathomp4 Dec 3, 2024
6a3ea1b
Merge branch 'develop' into feature/fixes-#3175
mathomp4 Dec 3, 2024
9de255b
Fix up CI image code
mathomp4 Dec 3, 2024
f26012f
Merge branch 'develop' into feature/sbasu1/verbose_print
mathomp4 Dec 4, 2024
b4be92e
Merge branch 'develop' into feture/wjiang/fetch_data_return
mathomp4 Dec 4, 2024
9a2fee5
Update base/MAPL_LatLonGridFactory.F90
tclune Dec 4, 2024
6f84fdb
Merge pull request #3212 from GEOS-ESM/feature/fixes-#3175
mathomp4 Dec 4, 2024
5176304
Merge branch 'develop' into bugfix/mathomp4/ci-image-fix
mathomp4 Dec 4, 2024
c7a38da
Merge pull request #3214 from GEOS-ESM/bugfix/mathomp4/ci-image-fix
mathomp4 Dec 4, 2024
b539f69
Merge branch 'develop' into feture/wjiang/fetch_data_return
mathomp4 Dec 4, 2024
70b40cd
Merge branch 'develop' into feature/sbasu1/verbose_print
mathomp4 Dec 4, 2024
194323c
Merge branch 'develop' into feature/sbasu1/verbose_print
mathomp4 Dec 5, 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: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Use v7.27.0 Baselibs
- Use GCC 14 for GNU tests
- Add pFUnit-less build test
- Improve some writes to be more informative
- In `base/MAPL_CFIO.F90`, added `Iam` to a print statement so that when a read fails we know which routine failed
- In `gridcomps/ExtData2G/ExtDataConfig.F90`, print out the name of the duplicate collection that causes model to fail

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions base/MAPL_CFIO.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2840,8 +2840,8 @@ subroutine MAPL_CFIOReadBundle ( FILETMPL, TIME, BUNDLE, NOREAD, RC, &
call fill_grads_template ( filename, filetmpl, &
experiment_id=EXPID, nymd=nymd, nhms=nhms, rc=status )
_VERIFY(STATUS)
!call WRITE_PARALLEL("CFIO: Reading " // trim(filename))
if (mapl_am_i_root()) write(*,*)"CFIO: Reading ",trim(filename)," at ",nymd," ",nhms

if (mapl_am_i_root()) write(*,'(a, ": Reading ", a, " at ", i8, " ", i6)') Iam, trim(filename), nymd, nhms


cfioIsCreated = .false.
Expand Down
2 changes: 1 addition & 1 deletion gridcomps/ExtData2G/ExtDataConfig.F90
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_
do while (ESMF_HConfigIterLoop(hconfigIter,hconfigIterBegin,hconfigIterEnd))
hconfig_key = ESMF_HConfigAsStringMapKey(hconfigIter,_RC)
temp_ds => ext_config%file_stream_map%at(hconfig_key)
_ASSERT(.not.associated(temp_ds),"defined duplicate named collection")
_ASSERT(.not.associated(temp_ds),"defined duplicate named collection " // trim(hconfig_key))
single_collection = ESMF_HConfigCreateAtMapVal(hconfigIter,_RC)
ds = ExtDataFileStream(single_collection,current_time,_RC)
call ext_config%file_stream_map%insert(trim(hconfig_key),ds)
Expand Down