From 6a91bbb33f2111d527622bb52056672ac910a134 Mon Sep 17 00:00:00 2001 From: Helen Kershaw Date: Wed, 20 Jul 2022 14:16:52 -0600 Subject: [PATCH 1/2] fix: intent(inout) for close_X_dist and close_X_ind Currently giving correct answers, but intent(out) is undefined on entry to the subrouting according to Fortran standard --- .../modules/assimilation/assim_tools_mod.f90 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/assimilation_code/modules/assimilation/assim_tools_mod.f90 b/assimilation_code/modules/assimilation/assim_tools_mod.f90 index 33e41668a4..99b636c753 100644 --- a/assimilation_code/modules/assimilation/assim_tools_mod.f90 +++ b/assimilation_code/modules/assimilation/assim_tools_mod.f90 @@ -2565,8 +2565,9 @@ subroutine get_close_obs_cached(gc_obs, base_obs_loc, base_obs_type, & type(get_close_type), intent(in) :: gc_obs type(location_type), intent(inout) :: base_obs_loc, my_obs_loc(:) integer, intent(in) :: base_obs_type, my_obs_kind(:), my_obs_type(:) -integer, intent(out) :: num_close_obs, close_obs_ind(:) -real(r8), intent(out) :: close_obs_dist(:) +integer, intent(out) :: num_close_obs +integer, intent(inout) :: close_obs_ind(:) +real(r8), intent(inout) :: close_obs_dist(:) type(ensemble_type), intent(in) :: ens_handle type(location_type), intent(inout) :: last_base_obs_loc integer, intent(inout) :: last_num_close_obs @@ -2607,8 +2608,9 @@ subroutine get_close_state_cached(gc_state, base_obs_loc, base_obs_type, & type(location_type), intent(inout) :: base_obs_loc, my_state_loc(:) integer, intent(in) :: base_obs_type, my_state_kind(:) integer(i8), intent(in) :: my_state_indx(:) -integer, intent(out) :: num_close_states, close_state_ind(:) -real(r8), intent(out) :: close_state_dist(:) +integer, intent(out) :: num_close_states +integer, intent(inout) :: close_state_ind(:) +real(r8), intent(inout) :: close_state_dist(:) type(ensemble_type), intent(in) :: ens_handle type(location_type), intent(inout) :: last_base_states_loc integer, intent(inout) :: last_num_close_states From 847f57c817957eba66ae9a2ded64ba78771317c6 Mon Sep 17 00:00:00 2001 From: Helen Kershaw Date: Thu, 21 Jul 2022 13:25:10 -0600 Subject: [PATCH 2/2] changelog for release --- CHANGELOG.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 769b87aa17..b8ede3cf6f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -22,9 +22,11 @@ individual files. The changes are now listed with the most recent at the top. -**July 21 2022 :: Bug-fix for DART_LAB rank histograms. Tag: v10.0.4** +**July 21 2022 :: Bug-fixes for DART_LAB rank histograms and get_close caching. Tag: v10.0.4** - Fixes DART_LAB prior and posterior rank histogram calculation. +- Fix for intent(inout) for get_close_X_caching routines. +- Obsolete GitHub workflow removed. **July 14 2022 :: Performance improvement - removal of redundant caching. Tag: v10.0.3**