Feature 2405 match tables2wrapper (#2416)

Co-authored-by: George McCabe <[email protected]>
dtcenter · Nov 10, 2023 · 5818aa4 · 5818aa4
1 parent 9c4572a
commit 5818aa4
Show file tree

Hide file tree

Showing 12 changed files with 820 additions and 666 deletions.
diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
diff --git a/parm/met_config/EnsembleStatConfig_wrapped b/parm/met_config/EnsembleStatConfig_wrapped
@@ -1,4 +1,4 @@
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 //
 // Ensemble-Stat configuration file.
 //
@@ -86,9 +86,10 @@ obs = {
 // May be set separately in each "obs.field" entry
 //
 
+//message_type =
 ${METPLUS_MESSAGE_TYPE}
 sid_exc        = [];
-//obs_thresh     = [ NA ];
+//obs_thresh     =
 ${METPLUS_OBS_THRESH}
 
 //obs_quality_inc =
@@ -97,9 +98,11 @@ ${METPLUS_OBS_QUALITY_INC}
 //obs_quality_exc =
 ${METPLUS_OBS_QUALITY_EXC}
 
+//duplicate_flag =
 ${METPLUS_DUPLICATE_FLAG}
 obs_summary    = NONE;
 obs_perc_value = 50;
+//skip_const =
 ${METPLUS_SKIP_CONST}
 
 //
@@ -108,6 +111,7 @@ ${METPLUS_SKIP_CONST}
 // May be set separately in each "obs.field" entry
 //
 obs_error = {
+   //flag =
    ${METPLUS_OBS_ERROR_FLAG}
    dist_type        = NONE;
    dist_parm        = [];
@@ -131,7 +135,9 @@ message_type_group_map = [
 // Ensemble bin sizes
 // May be set separately in each "obs.field" entry
 //
+//ens_ssvar_bin_size =
 ${METPLUS_ENS_SSVAR_BIN_SIZE}
+//ens_phist_bin_size =
 ${METPLUS_ENS_PHIST_BIN_SIZE}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -151,13 +157,15 @@ ${METPLUS_CLIMO_STDEV_DICT}
 //
 // May be set separately in each "obs.field" entry
 //
+//climo_cdf = {
 ${METPLUS_CLIMO_CDF_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // Point observation time window
 //
+//obs_window = {
 ${METPLUS_OBS_WINDOW_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -166,7 +174,9 @@ ${METPLUS_OBS_WINDOW_DICT}
 // Verification masking regions
 //
 mask = {
+   //grid =
    ${METPLUS_MASK_GRID}
+   //poly =
    ${METPLUS_MASK_POLY}
    sid   = [];
    llpnt = [];
@@ -177,20 +187,23 @@ mask = {
 //
 // Confidence interval settings
 //
+//ci_alpha =
 ${METPLUS_CI_ALPHA}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // Interpolation methods
 //
+//interp = {
 ${METPLUS_INTERP_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // Statistical output types
 //
+//output_flag = {
 ${METPLUS_OUTPUT_FLAG_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -199,6 +212,7 @@ ${METPLUS_OUTPUT_FLAG_DICT}
 // Gridded verification output types
 // May be set separately in each "obs.field" entry
 //
+//nc_orank_flag = {
 ${METPLUS_NC_ORANK_FLAG_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -215,7 +229,7 @@ rng = {
 
 //grid_weight_flag =
 ${METPLUS_GRID_WEIGHT_FLAG}
-
+//output_prefix =
 ${METPLUS_OUTPUT_PREFIX}
 //version          = "V9.0";
 

diff --git a/parm/met_config/GridDiagConfig_wrapped b/parm/met_config/GridDiagConfig_wrapped
@@ -9,28 +9,34 @@
 //
 // Description
 //
+//desc =
 ${METPLUS_DESC}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // Output grid
 //
+//regrid = {
 ${METPLUS_REGRID_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // May be set separately in each "field" entry
 //
+//censor_thresh =
 ${METPLUS_CENSOR_THRESH}
+//censor_val =
 ${METPLUS_CENSOR_VAL}
 
 //
 // Data fields
 //
+//data = {
 ${METPLUS_DATA_DICT}
 
+//mask = {
 ${METPLUS_MASK_DICT}
 
 tmp_dir = "${MET_TMP_DIR}";

diff --git a/parm/met_config/MODEConfig_wrapped b/parm/met_config/MODEConfig_wrapped
@@ -61,34 +61,56 @@ ${METPLUS_MULTIVAR_INTENSITY_FLAG}
 // Forecast and observation fields to be verified
 //
 fcst = {
+   //field = {
    ${METPLUS_FCST_FIELD}
 
+   //censor_thresh      = [
    ${METPLUS_FCST_CENSOR_THRESH}
+   //censor_val         = [
    ${METPLUS_FCST_CENSOR_VAL}
+   //conv_radius        =
    ${METPLUS_FCST_CONV_RADIUS}
+   //conv_thresh        =
    ${METPLUS_FCST_CONV_THRESH}
+   //vld_thresh         =
    ${METPLUS_FCST_VLD_THRESH}
+   //filter_attr_name   = [
    ${METPLUS_FCST_FILTER_ATTR_NAME}
+   //filter_attr_thresh = [
    ${METPLUS_FCST_FILTER_ATTR_THRESH}
+   //merge_thresh       =
    ${METPLUS_FCST_MERGE_THRESH}
+   //merge_flag         =
    ${METPLUS_FCST_MERGE_FLAG}
+
    ${METPLUS_FCST_FILE_TYPE}
    ${METPLUS_FCST_MULTIVAR_NAME}
    ${METPLUS_FCST_MULTIVAR_LEVEL}
 }
 
 obs = {
+   //field = {
    ${METPLUS_OBS_FIELD}
 
+   //censor_thresh      = [
    ${METPLUS_OBS_CENSOR_THRESH}
+   //censor_val         = [
    ${METPLUS_OBS_CENSOR_VAL}
+   //conv_radius        =
    ${METPLUS_OBS_CONV_RADIUS}
+   //conv_thresh        =
    ${METPLUS_OBS_CONV_THRESH}
+   //vld_thresh         =
    ${METPLUS_OBS_VLD_THRESH}
+   //filter_attr_name   = [
    ${METPLUS_OBS_FILTER_ATTR_NAME}
+   //filter_attr_thresh = [
    ${METPLUS_OBS_FILTER_ATTR_THRESH}
+   //merge_thresh       =
    ${METPLUS_OBS_MERGE_THRESH}
+   //merge_flag         =
    ${METPLUS_OBS_MERGE_FLAG}
+
    ${METPLUS_OBS_FILE_TYPE}
    ${METPLUS_OBS_MULTIVAR_NAME}
    ${METPLUS_OBS_MULTIVAR_LEVEL}
@@ -137,10 +159,13 @@ ${METPLUS_WEIGHT_DICT}
 //
 interest_function = {
 
+   //centroid_dist = (
    ${METPLUS_INTEREST_FUNCTION_CENTROID_DIST}
 
+   //boundary_dist = (
    ${METPLUS_INTEREST_FUNCTION_BOUNDARY_DIST}
 
+   //convex_hull_dist = (
    ${METPLUS_INTEREST_FUNCTION_CONVEX_HULL_DIST}
 
    angle_diff = (

diff --git a/parm/met_config/MTDConfig_wrapped b/parm/met_config/MTDConfig_wrapped
@@ -10,18 +10,21 @@
    // Output model name to be written
    //
 
+//model =
 ${METPLUS_MODEL}
 
    //
    // Output description to be written
    //
 
+//desc =
 ${METPLUS_DESC}
 
    //
    // Output observation type to be written
    //
 
+//obtype =
 ${METPLUS_OBTYPE}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -30,6 +33,8 @@ ${METPLUS_OBTYPE}
    //  Verification grid
    //  May be set separately in each "field" entry
    //
+
+//regrid = {
 ${METPLUS_REGRID_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -50,12 +55,15 @@ fcst = {
 
    ${METPLUS_FCST_FILE_TYPE}
 
+   //field = {
    ${METPLUS_FCST_FIELD}
 
    censor_thresh     = [];
    censor_val        = [];
    conv_time_window  = { beg = -1; end = 1; };
+   //conv_radius       =
    ${METPLUS_FCST_CONV_RADIUS}
+   //conv_thresh       =
    ${METPLUS_FCST_CONV_THRESH}
 
 }
@@ -64,12 +72,15 @@ obs = {
 
    ${METPLUS_OBS_FILE_TYPE}
 
+   //field = {
    ${METPLUS_OBS_FIELD}
 
    censor_thresh     = [];
    censor_val        = [];
    conv_time_window  = { beg = -1; end = 1; };
+   //conv_radius       =
    ${METPLUS_OBS_CONV_RADIUS}
+   //conv_thresh       =
    ${METPLUS_OBS_CONV_THRESH}
 }
 
@@ -86,6 +97,8 @@ inten_perc_value = 99;
    //
    //  Throw away 3D objects with volumes smaller than this
    //
+
+//min_volume =
 ${METPLUS_MIN_VOLUME}
 
 
@@ -236,6 +249,7 @@ txt_output = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+//output_prefix =
 ${METPLUS_OUTPUT_PREFIX}
 //version        = "V9.0";
 

diff --git a/parm/met_config/PB2NCConfig_wrapped b/parm/met_config/PB2NCConfig_wrapped
@@ -9,6 +9,7 @@
 //
 // PrepBufr message type
 //
+//message_type = [
 ${METPLUS_MESSAGE_TYPE}
 
 //
@@ -30,6 +31,7 @@ message_type_map = [];
 //
 // PrepBufr station ID
 //
+//station_id = [
 ${METPLUS_STATION_ID}
 
 
@@ -38,13 +40,15 @@ ${METPLUS_STATION_ID}
 //
 // Observation time window
 //
+//obs_window = {
 ${METPLUS_OBS_WINDOW_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // Observation retention regions
 //
+//mask = {
 ${METPLUS_MASK_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -86,6 +90,7 @@ ${METPLUS_LEVEL_CATEGORY}
 // BUFR variable names to retain or derive.
 // If emtpy, process all available variables.
 //
+//obs_bufr_var = [
 ${METPLUS_OBS_BUFR_VAR}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -113,6 +118,7 @@ event_stack_flag    = TOP;
 //
 // Time periods for the summarization
 //
+//time_summary = {
 ${METPLUS_TIME_SUMMARY_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/parm/met_config/PointStatConfig_wrapped b/parm/met_config/PointStatConfig_wrapped
@@ -49,11 +49,13 @@ rank_corr_flag = FALSE;
 //
 fcst = {
   ${METPLUS_FCST_FILE_TYPE}
+  //field = [
   ${METPLUS_FCST_FIELD}
 }
 
 obs = {
   ${METPLUS_OBS_FILE_TYPE}
+  //field = [
   ${METPLUS_OBS_FIELD}
 }
 ////////////////////////////////////////////////////////////////////////////////