Merge pull request #399 from NCAR/bug-fix_perturb

Error out when interf_provided = .false. for perturb_single_instance
NCAR · Sep 23, 2022 · 7ee9ed9 · 7ee9ed9
2 parents 65c33a7 + c4db6cf
commit 7ee9ed9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git 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
@@ -22,6 +22,12 @@ individual files.
 
 The changes are now listed with the most recent at the top.
 
+**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).
+  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/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 

diff --git 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 ---------------------------------------------------