From cae3aae9012de34672d75be9626baefd0a0e2198 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Wed, 9 Mar 2022 12:38:10 -0700 Subject: [PATCH] Per #1184, correct the MODE config files to replace multivar_field_logic with multivar_logic since that's what the code is looking for. --- met/data/config/MODEMultivarConfig_default | 2 +- met/src/libcode/vx_shapedata/mode_conf_info.h | 3 --- test/config/MODEConfig_multivar_fake_data | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/met/data/config/MODEMultivarConfig_default b/met/data/config/MODEMultivarConfig_default index 650f5f3c08..dde6e5ca3b 100644 --- a/met/data/config/MODEMultivarConfig_default +++ b/met/data/config/MODEMultivarConfig_default @@ -51,7 +51,7 @@ quilt = FALSE; // // MODE Multivar boolean combination logic // -multivar_field_logic = "#1 && #2 && #3"; +multivar_logic = "#1 && #2 && #3"; // // Forecast and observation fields to be verified diff --git a/met/src/libcode/vx_shapedata/mode_conf_info.h b/met/src/libcode/vx_shapedata/mode_conf_info.h index fdb8d5a6ee..5e6c436f62 100644 --- a/met/src/libcode/vx_shapedata/mode_conf_info.h +++ b/met/src/libcode/vx_shapedata/mode_conf_info.h @@ -87,7 +87,6 @@ class ModeConfInfo { bool is_multivar(); - ConcatString fcst_multivar_logic; ConcatString obs_multivar_logic; @@ -191,8 +190,6 @@ class ModeConfInfo { ConcatString desc; // Description ConcatString obtype; // Observation type - ConcatString multivar_field_logic; // Multvi-variate booleanlogic - ConcatString mask_grid_name; // Path for masking grid area ConcatString mask_poly_name; // Path for masking poly area diff --git a/test/config/MODEConfig_multivar_fake_data b/test/config/MODEConfig_multivar_fake_data index a8798a2946..282d7e7ec7 100644 --- a/test/config/MODEConfig_multivar_fake_data +++ b/test/config/MODEConfig_multivar_fake_data @@ -51,7 +51,7 @@ quilt = FALSE; // // MODE Multivar boolean combination logic // -multivar_field_logic = "#1 && #2 && #3"; +multivar_logic = "#1 && #2 && #3"; // // Forecast and observation fields to be verified