From c5ef8acaa898a84f9512e820421a9f7ab094a89d Mon Sep 17 00:00:00 2001 From: "Andrew.Tangborn" Date: Tue, 9 Jul 2024 12:46:09 +0000 Subject: [PATCH] Updated yaml and associated code in response to PR review. --- parm/aero/berror/aero_diagb.yaml.j2 | 4 ++-- utils/chem/chem_diagb.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parm/aero/berror/aero_diagb.yaml.j2 b/parm/aero/berror/aero_diagb.yaml.j2 index d8058566..8499cf90 100644 --- a/parm/aero/berror/aero_diagb.yaml.j2 +++ b/parm/aero/berror/aero_diagb.yaml.j2 @@ -60,8 +60,8 @@ variables: - mass_fraction_of_sea_salt004_in_air rescale: 2.0 # rescales the filtered std. dev. by "rescale" -diagb_weight: 0.5 -rescale_staticb: 2.0 +diagb weight: 0.5 +staticb rescaling factor: 2.0 number of halo points: 4 number of neighbors: 16 simple smoothing: diff --git a/utils/chem/chem_diagb.h b/utils/chem/chem_diagb.h index b7122912..55ecfcc3 100644 --- a/utils/chem/chem_diagb.h +++ b/utils/chem/chem_diagb.h @@ -237,13 +237,13 @@ namespace gdasapp { // Hybrid diagb_weight coefficient // std = diagb_weight*diagb_std + (1-diagb_weight)*Climat_std double diagb_weight; - fullConfig.get("diagb_weight", diagb_weight); + fullConfig.get("diagb weight", diagb_weight); // Initialize and read the climatological background error standard deviation field oops::Log::info() << "====================== read climat bkg error std dev" << std::endl; fv3jedi::Increment ClimBkgErrorStdDev(geom, chemVars, cycleDate); ClimBkgErrorStdDev.zero(); const eckit::LocalConfiguration ClimBkgErrorStdDevConfig(fullConfig, - "Climate background error stddev"); + "climate background error stddev"); ClimBkgErrorStdDev.read(ClimBkgErrorStdDevConfig); atlas::FieldSet ClimBkgErrorStdDevFs; ClimBkgErrorStdDev.toFieldSet(ClimBkgErrorStdDevFs); @@ -260,7 +260,7 @@ namespace gdasapp { // Staticb rescale double rescale_staticb; - fullConfig.get("rescale_staticb", rescale_staticb); + fullConfig.get("staticb rescaling factor", rescale_staticb); // Combine diagb and climatological background errors fv3jedi::Increment stddev_hybrid(geom, chemVars, cycleDate);