From 5670d05166a58627222836f8336d646748bfee9c Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Mon, 25 Mar 2024 16:58:35 -0400 Subject: [PATCH 1/2] fixes #2675 --- Apps/time_ave_util.F90 | 14 +++++++------- CHANGELOG.md | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Apps/time_ave_util.F90 b/Apps/time_ave_util.F90 index 7f0190788d30..756c3250e70d 100644 --- a/Apps/time_ave_util.F90 +++ b/Apps/time_ave_util.F90 @@ -1187,7 +1187,7 @@ function has_level(grid,rc) result(grid_has_level) integer, intent(out), optional :: rc integer :: status, global_dims(3) call MAPL_GridGet(grid,globalCellCountPerDim=global_dims,_RC) - grid_has_level = (global_dims(3)>1) + grid_has_level = (global_dims(3)>0) if (present(rc)) then RC=_SUCCESS end if @@ -1720,14 +1720,14 @@ subroutine generate_report() reporter = ProfileReporter(empty) call reporter%add_column(NameColumn(20)) - call reporter%add_column(FormattedTextColumn('Inclusive','(f9.6)', 9, InclusiveColumn('MEAN'))) + call reporter%add_column(FormattedTextColumn('Inclusive','(f12.2)', 12, InclusiveColumn('MEAN'))) call reporter%add_column(FormattedTextColumn('% Incl','(f6.2)', 6, PercentageColumn(InclusiveColumn('MEAN'),'MAX'))) - call reporter%add_column(FormattedTextColumn('Exclusive','(f9.6)', 9, ExclusiveColumn('MEAN'))) + call reporter%add_column(FormattedTextColumn('Exclusive','(f12.2)', 12, ExclusiveColumn('MEAN'))) call reporter%add_column(FormattedTextColumn('% Excl','(f6.2)', 6, PercentageColumn(ExclusiveColumn('MEAN')))) - call reporter%add_column(FormattedTextColumn(' Max Excl)','(f9.6)', 9, ExclusiveColumn('MAX'))) - call reporter%add_column(FormattedTextColumn(' Min Excl)','(f9.6)', 9, ExclusiveColumn('MIN'))) - call reporter%add_column(FormattedTextColumn('Max PE)','(1x,i4.4,1x)', 6, ExclusiveColumn('MAX_PE'))) - call reporter%add_column(FormattedTextColumn('Min PE)','(1x,i4.4,1x)', 6, ExclusiveColumn('MIN_PE'))) + call reporter%add_column(FormattedTextColumn(' Max Excl)','(f12.2)', 12, ExclusiveColumn('MAX'))) + call reporter%add_column(FormattedTextColumn(' Min Excl)','(f12.2)', 12, ExclusiveColumn('MIN'))) + call reporter%add_column(FormattedTextColumn('Max PE)','(1x,i5.5,1x)', 7, ExclusiveColumn('MAX_PE'))) + call reporter%add_column(FormattedTextColumn('Min PE)','(1x,i5.5,1x)', 7, ExclusiveColumn('MIN_PE'))) report_lines = reporter%generate_report(t_prof) if (mapl_am_I_root()) then write(*,'(a)')'Final profile' diff --git a/CHANGELOG.md b/CHANGELOG.md index b2938757f332..b92faf63cde5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Fixed bug in time_ave_util.x when the input files have a level size of 1 + ### Removed ### Deprecated From befc849aa0bde2165867704ddec5808c0b17e7e2 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 26 Mar 2024 09:31:12 -0400 Subject: [PATCH 2/2] Prepare for 2.44.2 Release --- CHANGELOG.md | 8 ++++++-- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b92faf63cde5..14325c71d711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Fixed bug in time_ave_util.x when the input files have a level size of 1 - ### Removed ### Deprecated +## [2.44.2] - 2024-03-26 + +### Fixed + +- Fixed bug in `time_ave_util.x` when the input files have a level size of 1 + ## [2.44.1] - 2024-03-19 ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index b88a43b45e27..d0cbe7caa523 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ endif () project ( MAPL - VERSION 2.44.1 + VERSION 2.44.2 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF # Set the possible values of build type for cmake-gui