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

Incomplete reduction method time average #1307

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
424e7ec
Updates reduction method min/max
ganganoaa Jul 18, 2023
e2b58e0
Updates Makefile.am, fms_diag_axis_object.F90, and fms_diag_reduction…
ganganoaa Jul 18, 2023
dd496af
Removed a data assignment statement before variable declarations in t…
ganganoaa Jul 18, 2023
a314839
Updates fms_diag_file_object_mod and fms_diag_object_mod
ganganoaa Jul 18, 2023
b3b0e3c
Updates fms_diag_bbox_mod and fms_diag_object_mod
ganganoaa Jul 18, 2023
773aca2
Updates Makefile.am and fms_diag_object_mod
ganganoaa Jul 18, 2023
0207a98
Updates Makefile.am
ganganoaa Jul 18, 2023
ffec2be
Updates fms_diag_reduction_methods_mod
ganganoaa Jul 18, 2023
0f79a5b
Updates fms_diag_object_mod and fms_diag_reduction_methods_mod
ganganoaa Jul 18, 2023
a996ce2
Updates fms_diag_reduction_methods_mod
ganganoaa Jul 18, 2023
24d664a
Updates fms_diag_object.F90
ganganoaa Jul 18, 2023
8cbab45
Update fms_diag_object.F90 and fms_diag_reduction_methods.F90
ganganoaa Jul 18, 2023
ab9c56f
Updates fms_diag_update_extremum_mod
ganganoaa Jul 19, 2023
24c6251
Updates fms_diag_update_extremum_mod
ganganoaa Jul 19, 2023
d74666c
Updates fms_diag_update_extremum_mod
ganganoaa Jul 19, 2023
158055e
Updates fms_diag_update_extremum_mod
ganganoaa Jul 19, 2023
345f2f9
Updates Makefile.am in diag_manager
ganganoaa Jul 19, 2023
aeb95fe
Updates CMakeLists.txt, diag_manager/Makefile.am, fms_diag_object.F90…
ganganoaa Jul 19, 2023
2be3a65
Updates error strings in fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
6f89cf1
Update fms_diag_object.F90 and fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
2721805
Updates fms_diag_object.F90
ganganoaa Jul 19, 2023
a115651
Updates fms_diag_object.F90 and fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
da59105
Updates fms_diag_object.F90 and fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
8c14131
Updates fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
823a25c
Updates fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
a473284
Updates fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
5e029ab
Updates fms_diag_reduction_methods.F90
ganganoaa Jul 19, 2023
4fe328f
Fixes mismatch argument type(weight) in routine fms_diag_do_reduction
ganganoaa Jul 19, 2023
9c024f8
Updates fms_diag_object_mod
ganganoaa Jul 19, 2023
d6f242d
Updates fms_diag_object_mod
ganganoaa Jul 19, 2023
0e55996
Updates fms_diag_reduction_methods_mod
ganganoaa Jul 20, 2023
4e69ad7
Fixes mismatch rank of an argument passed to routine fms_diag_update_…
ganganoaa Jul 20, 2023
7a63654
Declares oor_mask as contiguous target in routine fms_diag_do_reduction
ganganoaa Jul 20, 2023
2b47d80
Updates fms_diag_object.F90 and fms_diag_reduction_methods.F90
ganganoaa Jul 20, 2023
b5454c4
Comments out allocate_diag_field_output_buffers and fms_diag_do_reduc…
ganganoaa Jul 20, 2023
77a66c5
Update fms_diag_reduction_methods.F90
ganganoaa Jul 21, 2023
693c529
refactor: `monin_obukhov_stable_mix` calls from `stable_mix_1d` (#1268)
J-Lentz Jul 13, 2023
009be59
fix: out-of-bounds memory access in axis_utils2 (#1157)
J-Lentz Jul 13, 2023
a2f3097
fix: maximize system stacksize limit in fms_init (#1233)
J-Lentz Jul 13, 2023
e13e83f
test: remove stack limit checks in test scripts (#1280)
rem1776 Jul 13, 2023
340fce3
fix: mpp global arrays test fixes (#1174)
rem1776 Jul 13, 2023
59df93a
feat: update mpp_do_update_ad.fh to resolve JEDI requirement (#1225)
jkbk2004 Jul 13, 2023
78671e5
chore: add prefixed aliases for libfms routines (#1262)
rem1776 Jul 13, 2023
4a5ad15
Update fms_diag_reduction_methods.F90
ganganoaa Jul 24, 2023
731486b
Update fms_diag_bbox.F90
ganganoaa Jul 24, 2023
151c992
Update fms_diag_reduction_methods.F90
ganganoaa Jul 24, 2023
2a7e54c
Update fms_diag_reduction_methods.F90
ganganoaa Jul 24, 2023
96287fd
Update fms_diag_reduction_methods.F90
ganganoaa Jul 25, 2023
d200e1c
Update fms_diag_reduction_methods.F90
ganganoaa Jul 25, 2023
de75dad
Update fms_diag_object.F90
ganganoaa Jul 25, 2023
2a55ad9
Update fms_diag_object.F90
ganganoaa Jul 25, 2023
7361947
Update fms_diag_reduction_methods.F90
ganganoaa Jul 25, 2023
cd7beeb
Update fms_diag_object.F90
ganganoaa Jul 25, 2023
10f0891
Update fms_diag_reduction_methods.F90
ganganoaa Jul 25, 2023
840c3c3
Update fms_diag_object.F90
ganganoaa Jul 25, 2023
4cdff6d
Update fms_diag_reduction_methods.F90
ganganoaa Jul 25, 2023
ddaec5f
Update fms_diag_object.F90
ganganoaa Jul 25, 2023
f7f4a40
Update fms_diag_object.F90
ganganoaa Jul 25, 2023
fd3b88f
Update fms_diag_reduction_methods.F90
ganganoaa Jul 25, 2023
0825006
Update fms_diag_reduction_methods.F90
ganganoaa Jul 25, 2023
5d8a4ce
Incomplete time average reduction for future updates
ganganoaa Jul 27, 2023
7470f06
Merge remote-tracking branch 'upstream/dmUpdate' into reduction_avera…
Aug 14, 2023
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
50 changes: 46 additions & 4 deletions diag_manager/fms_diag_bbox.F90
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ MODULE fms_diag_bbox_mod
procedure :: get_jmax
procedure :: get_kmin
procedure :: get_kmax
procedure :: set_ibounds
procedure :: set_jbounds
procedure :: set_kbounds
END TYPE fmsDiagIbounds_type

!> @brief Data structure holding starting and ending indices in the I, J, and
Expand All @@ -79,6 +82,7 @@ MODULE fms_diag_bbox_mod
procedure :: get_fie
procedure :: get_fjs
procedure :: get_fje
procedure :: get_bounds3D
end type fmsDiagBoundsHalos_type

public :: recondition_indices
Expand Down Expand Up @@ -128,6 +132,36 @@ pure integer function get_kmax (this) result(rslt)
rslt = this%kmax
end function get_kmax

!> @brief Sets bounds in the I dimensions
subroutine set_ibounds(this, lower, upper)
class(fmsDiagIbounds_type), intent(inout) :: this !< The calling object
integer, intent(in) :: lower !< The lower bound
integer, intent(in) :: upper !< The upper bound

this%imin = lower
this%imax = upper
end subroutine set_ibounds

!> @brief Sets bounds in the J dimensions
subroutine set_jbounds(this, lower, upper)
class(fmsDiagIbounds_type), intent(inout) :: this !< The calling object
integer, intent(in) :: lower !< The lower bound
integer, intent(in) :: upper !< The upper bound

this%jmin = lower
this%jmax = upper
end subroutine set_jbounds

!> @brief Sets bounds in the K dimensions
subroutine set_kbounds(this, lower, upper)
class(fmsDiagIbounds_type), intent(inout) :: this !< The calling object
integer, intent(in) :: lower !< The lower bound
integer, intent(in) :: upper !< The upper bound

this%kmin = lower
this%kmax = upper
end subroutine set_kbounds

!> @brief Gets the halo size of fmsDiagBoundsHalos_type in the I dimension
!! @return copy of integer member hi
pure integer function get_hi (this) result(rslt)
Expand All @@ -142,34 +176,42 @@ pure integer function get_hj (this) result(rslt)
rslt = this%hj
end function get_hj

!> @brief Gets the updated index `fis' of fmsDiagBoundsHalos_type in the I dimension
!> @brief Gets the updated starting index `fis' of fmsDiagBoundsHalos_type in the I dimension
!! @return copy of integer member `fis'
pure integer function get_fis (this) result(rslt)
class (fmsDiagBoundsHalos_type), intent(in) :: this !< Calling object
rslt = this%fis
end function get_fis

!> @brief Gets the updated index `fie' of fmsDiagBoundsHalos_type in the I dimension
!> @brief Gets the updated ending index `fie' of fmsDiagBoundsHalos_type in the I dimension
!! @return copy of integer member `fie'
pure integer function get_fie (this) result(rslt)
class (fmsDiagBoundsHalos_type), intent(in) :: this !< Calling object
rslt = this%fie
end function get_fie

!> @brief Gets the updated index `fjs' of fmsDiagBoundsHalos_type in the I dimension
!> @brief Gets the updated starting index `fjs' of fmsDiagBoundsHalos_type in the J dimension
!! @return copy of integer member `fjs'
pure integer function get_fjs (this) result(rslt)
class (fmsDiagBoundsHalos_type), intent(in) :: this !< Calling object
rslt = this%fjs
end function get_fjs

!> @brief Gets the updated index `fje' of fmsDiagBoundsHalos_type in the I dimension
!> @brief Gets the updated ending index `fje' of fmsDiagBoundsHalos_type in the J dimension
!! @return copy of integer member `fje'
pure integer function get_fje (this) result(rslt)
class (fmsDiagBoundsHalos_type), intent(in) :: this !< Calling object
rslt = this%fje
end function get_fje

!> @brief Gets a member of fmsDiagIbounds_type, `bounds3D`, of calling fmsDiagBoundsHalos_type object.
!! @return Returns a copy of fmsDiagIbounds_type member `bounds3D`
pure function get_bounds3D(this) result(bounds_obj)
class(fmsDiagBoundsHalos_type), intent(in) :: this !< Calling object
type(fmsDiagIbounds_type) :: bounds_obj !< Object copy to return
bounds_obj = this%bounds3D
end function

!> @brief Reset the instance bounding lower and upper bounds to lower_val and upper_val, respectively.
SUBROUTINE reset_bounds (this, lower_val, upper_val)
class (fmsDiagIbounds_type), target, intent(inout) :: this !< ibounds instance
Expand Down
36 changes: 36 additions & 0 deletions diag_manager/fms_diag_file_object.F90
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ module fms_diag_file_object_mod
procedure, public :: get_file_duration_units
procedure, public :: get_file_varlist
procedure, public :: get_file_global_meta
procedure, public :: get_last_output
procedure, public :: get_next_output
procedure, public :: get_next_next_output
procedure, public :: get_no_more_data
procedure, public :: has_file_fname
procedure, public :: has_file_frequnit
procedure, public :: has_file_freq
Expand Down Expand Up @@ -559,6 +563,38 @@ pure function get_file_global_meta (this) result(res)
res = this%diag_yaml_file%get_file_global_meta()
end function get_file_global_meta

!> \brief Gets last_output time
!! \return Copy of last_output time
pure function get_last_output (this) result(res)
class(fmsDiagFile_type), intent(in) :: this !< The file object
type(time_type) :: res
res = this%last_output
end function get_last_output

!> \brief Gets next_output time
!! \return Copy of next_output time
pure function get_next_output (this) result(res)
class(fmsDiagFile_type), intent(in) :: this !< The file object
type(time_type) :: res
res = this%next_output
end function get_next_output

!> \brief Gets next_next_output time
!! \return Copy of next_next_output time
pure function get_next_next_output (this) result(res)
class(fmsDiagFile_type), intent(in) :: this !< The file object
type(time_type) :: res
res = this%next_next_output
end function get_next_next_output

!> \brief Gets no_more_data time
!! \return Copy of no_more_data time
pure function get_no_more_data (this) result(res)
class(fmsDiagFile_type), intent(in) :: this !< The file object
type(time_type) :: res
res = this%no_more_data
end function get_no_more_data

!> \brief Checks if file_fname is allocated in the yaml object
!! \return true if file_fname is allocated
pure function has_file_fname (this) result(res)
Expand Down
Loading
Loading