dmUpdate: add time_average reduction method and test #1421
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…a has not been recived for that time
uramirez8707
approved these changes
Dec 14, 2023
thomas-robinson
requested changes
Dec 21, 2023
Comment on lines
1714
to
1716
| class(fmsDiagField_type), intent(in) :: this | ||
| class(*), allocatable, intent(out) :: missing_val | ||
| real(r8_kind) :: res |
| !! this just indicates whether the mask array itself has been alloc'd | ||
| !! this is different from @ref has_mask_variant, which is set earlier for whether a mask is being used at all | ||
| pure logical function has_mask_allocated(this) | ||
| class(fmsDiagField_type),intent(in) :: this |
| !> \brief Gets the buffer_id list from the file object | ||
| pure function get_buffer_ids (this) | ||
| class(fmsDiagFile_type), intent(in) :: this !< The file object | ||
| integer, allocatable :: get_buffer_ids(:) |
|
|
||
| pure function get_number_of_buffers(this) | ||
| class(fmsDiagFile_type), intent(in) :: this !< file object | ||
| integer :: get_number_of_buffers |
| @@ -654,7 +663,7 @@ subroutine fms_diag_send_complete(this, time_step) | |||
| character(len=128) :: error_string | |||
| type(fmsDiagIbounds_type) :: bounds | |||
| integer, dimension(:), allocatable :: file_ids !< Array of file IDs for a field | |||
| logical, parameter :: DEBUG_SC = .true. !< turn on output for debugging | |||
| logical, parameter :: DEBUG_SC = .false. !< turn on output for debugging | |||
There was a problem hiding this comment.
You can't turn this on if it's a parameter
There was a problem hiding this comment.
For the debug output they are just local parameters for if your working on the code so I figured they would be changed manually.
If we want to make them more accessible we could do a CPP macro or namelist option instead but I think this should be a parameter either way since it's value shouldn't change over the course of this routine.
There was a problem hiding this comment.
If it's a parameter, then it can't be a namelist option. It would be good to make it a namelist option. This can be a TODO
diag_manager/fms_diag_object.F90
Outdated
| TYPE (time_type), pointer :: model_time!< The current model time | ||
|
|
||
| integer, allocatable :: buff_ids(:) !< ids for output buffers to loop through | ||
| integer :: ibuff, mask_zbounds(2), mask_shape(4) |
There was a problem hiding this comment.
needs documentation. Should probably all be on separate lines for documentation purposes
diag_manager/fms_diag_object.F90
Outdated
Comment on lines
728
to
732
| logical :: force_write, is_writing, has_mask | ||
| logical, parameter :: DEBUG_REDUCT = .false. | ||
| class(*), allocatable :: missing_val | ||
| real(r8_kind) :: mval | ||
| character(len=128) :: error_string |
Comment on lines
638
to
643
| !logical, intent(in) :: is_subregional !< if subregional output | ||
| !logical, intent(in) :: has_halo !< true if halo region is being used | ||
| !logical, optional, intent(in) :: mask(:,:,:,:) !< whether a mask variant reduction | ||
| !logical, allocatable :: mask_tmp(:,:,:,:) | ||
| !integer :: is, ie, js, je, ks, ke, zs, ze | ||
| !integer :: i, halo_size(4) |
There was a problem hiding this comment.
Can this all be removed?
thomas-robinson
approved these changes
Dec 21, 2023
|
The PR failed the CI |
8 tasks
rem1776
added a commit
to rem1776/FMS
that referenced
this pull request
May 1, 2024
* add tests and routines from other branch * move weight check to output buffer, more comments + cleanup * simplify reduction done * update avg test for send_data_r4 * Add time to the buffer object so the counter is only increased if data has not been recived for that time --------- Co-authored-by: rem1776 <[email protected]> Co-authored-by: Uriel Ramirez <[email protected]>
rem1776
added a commit
to rem1776/FMS
that referenced
this pull request
May 1, 2024
rem1776
added a commit
to rem1776/FMS
that referenced
this pull request
May 1, 2024
* add tests and routines from other branch * move weight check to output buffer, more comments + cleanup * simplify reduction done * update avg test for send_data_r4 * Add time to the buffer object so the counter is only increased if data has not been recived for that time --------- Co-authored-by: rem1776 <[email protected]> Co-authored-by: Uriel Ramirez <[email protected]>
rem1776
added a commit
to rem1776/FMS
that referenced
this pull request
May 1, 2024
rem1776
added a commit
to rem1776/FMS
that referenced
this pull request
May 1, 2024
rem1776
added a commit
to rem1776/FMS
that referenced
this pull request
May 1, 2024
rem1776
added a commit
to rem1776/FMS
that referenced
this pull request
May 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
adds the time average reduction method and some other (basically getters/setters) routines that were needed for it to work properly along with a unit test for it.
Just getting an error with the modern end to end test, but that might be related to the reductions we haven't added yet.
draft for now, still some TODO's to clean up after some discussion
How Has This Been Tested?
amd box with the latest oneapi. Also compiled with all the runtime checks while working on this so that one test might still pass in the ci.
Checklist:
make distcheckpasses