From 106624c37dd37e51089a35fee170719b476aa3cc Mon Sep 17 00:00:00 2001 From: Helen Kershaw Date: Tue, 20 Sep 2022 15:37:03 -0600 Subject: [PATCH 1/3] fix: error out when model_mod does not provide a pert_mode_copies interface Updated comment to match what the code does and removed obsolete comment about html fixes #397 --- .../perturb_single_instance.f90 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90 b/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90 index dd512e405e..d0e117ca56 100644 --- a/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90 +++ b/assimilation_code/programs/perturb_single_instance/perturb_single_instance.f90 @@ -2,13 +2,9 @@ ! by UCAR, "as is", without charge, subject to all terms of use at ! http://www.image.ucar.edu/DAReS/DART/DART_download -!>@todo FIXME the html needs to be made consistent with the namelist once the namelist -!> is fleshed out. !> This is a utility program that computes an ensemble of restarts -!> using the models pert_model_copies, if provided, or uses standard -!> gaussian noise with perturbation_amplitude standard deviation if -!> no routine is provided. +!> using the model_mod pert_model_copies program perturb_single_instance @@ -196,6 +192,10 @@ program perturb_single_instance enddo call pert_model_copies(ens_handle, ens_size, perturbation_amplitude, interf_provided) +if (.not. interf_provided) then + call error_handler(E_ERR, 'model_mod::pert_model_copies interface required', source) +endif + !---------------------------------------------------------------------- ! can be ens_size but rather a single file From 5b8b2c34502861134b78e0b1328fdacff9ec0ddd Mon Sep 17 00:00:00 2001 From: Helen Kershaw Date: Thu, 22 Sep 2022 13:31:04 -0600 Subject: [PATCH 2/3] chore: improved pull request template bump version and changelog for release of perturb_from_single_instance --- .github/pull_request_template.md | 7 ++++++- CHANGELOG.rst | 6 ++++++ conf.py | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index be8a4fb953..760932e417 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -24,7 +24,12 @@ Please describe any tests you ran to verify your changes. - [ ] Updated changelog entry - [ ] Documentation updated -- [ ] Version tag +- [ ] Update conf.py + +## Checklist for release +- [ ] Merge into main +- [ ] Create release from the main branch with appropriate tag +- [ ] Delete feature-branch ## Testing Datasets diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1780196b44..de74240df3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -22,6 +22,12 @@ individual files. The changes are now listed with the most recent at the top. +**September 22 2022 :: Bug-fix for pertub_single_instance. Tag v10.5.1** + +- Program perturb_single_instance was running without perturbing when + interf_provided = .false. (silent fail). + Model specific pert_model_copies is now required to run perturb_single_instance + **September 22 2022 :: CAM-SE. Tag: v10.5.0** - CAM-SE interface for Manhattan diff --git a/conf.py b/conf.py index 900526e284..70d29f156a 100644 --- a/conf.py +++ b/conf.py @@ -21,7 +21,7 @@ author = 'Data Assimilation Research Section' # The full version, including alpha/beta/rc tags -release = '10.5.0' +release = '10.5.1' master_doc = 'README' # -- General configuration --------------------------------------------------- From c4db6cf756c0200508876d590657c18fed6712f4 Mon Sep 17 00:00:00 2001 From: Helen Kershaw Date: Fri, 23 Sep 2022 10:17:02 -0600 Subject: [PATCH 3/3] bump date --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index de74240df3..b1020f5531 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -22,7 +22,7 @@ individual files. The changes are now listed with the most recent at the top. -**September 22 2022 :: Bug-fix for pertub_single_instance. Tag v10.5.1** +**September 23 2022 :: Bug-fix for pertub_single_instance. Tag v10.5.1** - Program perturb_single_instance was running without perturbing when interf_provided = .false. (silent fail).