-
Notifications
You must be signed in to change notification settings - Fork 405
Changes to filename_template checks #1464
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
base: develop
Are you sure you want to change the base?
Changes from all commits
30b74f7
42399bc
74af38b
8eb3e56
64e5856
3bf5404
5c7a075
97c6d25
741c495
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -563,10 +563,96 @@ subroutine MPAS_stream_mgr_validate_streams(manager, streamID, ierr)!{{{ | |
| #endif | ||
|
|
||
| end do | ||
|
|
||
| ! Only check filename_template uniqueness when validating all streams | ||
| if (.not. present(streamID)) then | ||
| call MPAS_stream_mgr_check_filename_template(manager, ierr=err_local) | ||
| if (present(ierr)) ierr = err_local | ||
| end if | ||
|
|
||
| end subroutine MPAS_stream_mgr_validate_streams!}}} | ||
|
|
||
|
|
||
| !----------------------------------------------------------------------- | ||
| ! routine MPAS_stream_mgr_check_filename_template | ||
| ! | ||
| !> \brief Check for identical filename templates in active output streams. | ||
| !> \author Abishek Gopal | ||
| !> \date June 3 2026 | ||
| !> \details | ||
| !> Checks that there are no identical filename templates among active output | ||
| !> streams in the stream manager, which may lead to file conflicts. This | ||
| !> routine can be called from within MPAS_stream_mgr_validate_streams or | ||
| !> separately as needed. | ||
| ! | ||
| !----------------------------------------------------------------------- | ||
| subroutine MPAS_stream_mgr_check_filename_template(manager, ierr)!{{{ | ||
|
|
||
| implicit none | ||
|
|
||
| type (MPAS_streamManager_type), intent(inout) :: manager | ||
| integer, intent(out), optional :: ierr | ||
|
mgduda marked this conversation as resolved.
|
||
|
|
||
| integer :: threadNum | ||
| character (len=StrKIND) :: message, streamID | ||
| type (MPAS_stream_list_type), pointer :: stream1_cursor, stream2_cursor | ||
| logical :: stream1_pkg_active, stream2_pkg_active | ||
| logical :: stream1_output, stream2_output | ||
|
|
||
| STREAM_DEBUG_WRITE('-- Called MPAS_stream_mgr_check_filename_template() for all streams') | ||
|
|
||
| if (present(ierr)) ierr = MPAS_STREAM_MGR_NOERR | ||
|
|
||
| threadNum = mpas_threading_get_thread_num() | ||
|
|
||
| if ( threadNum == 0 ) then | ||
|
|
||
| streamID = '.*' ! query all streams | ||
|
|
||
| nullify(stream1_cursor) | ||
| do while (MPAS_stream_list_query(manager % streams, streamID, stream1_cursor)) | ||
|
mgduda marked this conversation as resolved.
|
||
|
|
||
| stream1_pkg_active = stream_active_pkg_check(stream1_cursor) | ||
| stream1_output = (stream1_cursor % direction == MPAS_STREAM_OUTPUT) .or. & | ||
| (stream1_cursor % direction == MPAS_STREAM_INPUT_OUTPUT) | ||
|
|
||
| if (.not. stream1_cursor % active_stream .or. .not. stream1_output .or. .not. stream1_pkg_active) then | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thinking about it a bit more, perhaps we could also skip (for the purpose of finding duplicate |
||
| cycle | ||
| end if | ||
|
|
||
| nullify(stream2_cursor) | ||
| do while (MPAS_stream_list_query(manager % streams, streamID, stream2_cursor)) | ||
|
|
||
| stream2_pkg_active = stream_active_pkg_check(stream2_cursor) | ||
| stream2_output = (stream2_cursor % direction == MPAS_STREAM_OUTPUT) .or. & | ||
| (stream2_cursor % direction == MPAS_STREAM_INPUT_OUTPUT) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I may be misreading the logic, but it looks like we will only catch cases where two output (or input-output) streams share a |
||
|
|
||
| ! uniqueness_check has already checked that two different streams do not have the same name | ||
| if (trim(stream1_cursor % name) == trim(stream2_cursor % name) & | ||
| .or. .not. stream2_cursor % active_stream & | ||
| .or. .not. stream2_output & | ||
| .or. .not. stream2_pkg_active) then | ||
| cycle | ||
| end if | ||
|
|
||
| if (trim(stream1_cursor % filename_template) == trim(stream2_cursor % filename_template)) then | ||
| message = 'Found identical values of the filename_template attribute for multiple active output streams, ' & | ||
| // trim(stream1_cursor % name) // ' and ' // trim(stream2_cursor % name) // & | ||
| ', in streams.<CORE>. This may result in file conflicts.' | ||
| call mpas_log_write(message, messageType=MPAS_LOG_ERR) | ||
| if (present(ierr)) ierr = MPAS_STREAM_MGR_ERROR | ||
| return | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rather than returning on the first pair of matching |
||
| end if | ||
|
|
||
| end do | ||
|
|
||
| end do | ||
|
|
||
| end if | ||
|
|
||
| end subroutine MPAS_stream_mgr_check_filename_template!}}} | ||
|
|
||
|
|
||
| !----------------------------------------------------------------------- | ||
| ! routine MPAS_stream_mgr_destroy_stream | ||
| ! | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.