Merge branch 'develop' into feature/bump-params

scripts/exgdas_global_marine_analysis_prep.py

@@ -236,13 +236,13 @@ def gen_bkg_list(bkg_path, out_path, window_begin=' ', file_type='gdas.t*.ocnf00
 # 2d bump yaml (all 2d vars at once)
 bumpdir = 'bump'
 ufsda.disk_utils.mkdir(os.path.join(anl_dir, bumpdir))
-bumpC_yaml = os.path.join(anl_dir, 'soca_bump_C_2d.yaml')
-bumpC_yaml_template = os.path.join(gdas_home,
-                                   'parm',
-                                   'soca',
-                                   'berror',
-                                   'soca_bump_C_2d.yaml')
-config = YAMLFile(path=bumpC_yaml_template)
+bump_yaml = os.path.join(anl_dir, 'soca_bump2d.yaml')
+bump_yaml_template = os.path.join(gdas_home,
+                                  'parm',
+                                  'soca',
+                                  'berror',
+                                  'soca_bump2d.yaml')
+config = YAMLFile(path=bump_yaml_template)
 config = Template.substitute_structure(config, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig.get)
 config = Template.substitute_structure(config, TemplateConstants.DOLLAR_PARENTHESES, envconfig.get)
 config.save(bump_yaml)