Per #3006, committing changes since the code is compiling. Added IODA…

…DataConfig_default file to store default settings for reading IODA data.
dtcenter · Dec 3, 2024 · 9ae08da · 9ae08da
1 parent ac43a80
commit 9ae08da
Show file tree

Hide file tree

Showing 9 changed files with 225 additions and 288 deletions.
diff --git a/data/config/IODADataConfig_default b/data/config/IODADataConfig_default
@@ -0,0 +1,38 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// IODA Data configuration file.
+//
+// For additional information, please see the MET User's Guide.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Mapping of input IODA variable names to output variables names.
+// The default IODA map, obs_var_map, is appended to this map.
+//
+obs_name_map = [];
+
+//
+// Default mapping for Metadata.
+//
+metadata_map = [
+   { key = "message_type"; val = "msg_type,station_ob"; },
+   { key = "station_id";   val = "station_id,report_identifier"; },
+   { key = "pressure";     val = "air_pressure,pressure"; },
+   { key = "height";       val = "height,height_above_mean_sea_level"; },
+   { key = "datetime";     val = "datetime,dateTime"; },
+   { key = "elevation";    val = "elevation,station_elevation"; },
+   { key = "nlocs";        val = "Location"; }
+];
+
+//
+// Default mapping for obs to qc.
+//
+obs_to_qc_map = [
+   { key = "wind_from_direction"; val = "eastward_wind,northward_wind"; },
+   { key = "wind_speed";          val = "eastward_wind,northward_wind"; }
+];
+
+missing_thresh = [ <=-1e9, >=1e9, ==-9999 ];
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/data/config/Makefile.am b/data/config/Makefile.am
@@ -27,6 +27,7 @@ config_DATA = \
 	GridStatConfig_default \
 	GridDiagConfig_default \
 	IODA2NCConfig_default \
+	IODADataConfig_default \
 	Madis2NcConfig_default \
 	MODEAnalysisConfig_default \
 	MODEConfig_default \

diff --git a/data/config/Makefile.in b/data/config/Makefile.in
@@ -318,6 +318,7 @@ config_DATA = \
 	GridStatConfig_default \
 	GridDiagConfig_default \
 	IODA2NCConfig_default \
+	IODADataConfig_default \
 	Madis2NcConfig_default \
 	MODEAnalysisConfig_default \
 	MODEConfig_default \

diff --git a/data/config/PairStatConfig_default b/data/config/PairStatConfig_default
@@ -8,33 +8,20 @@
 
 //
 // Output model name to be written
+// Non-empty string overrides input data values
 //
-model = "FCST";
+model = "";
 
 //
 // Output description to be written
-// May be set separately in each "obs.field" entry
+// May be set separately in each "pairs" entry
 //
 desc = "NA";
 
 ////////////////////////////////////////////////////////////////////////////////
 
 //
-// Verification grid
-// May be set separately in each "field" entry
-//
-regrid = {
-   to_grid    = NONE;
-   method     = NEAREST;
-   width      = 1;
-   vld_thresh = 0.5;
-   shape      = SQUARE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-//
-// May be set separately in each "field" entry
+// May be set separately in each "pairs" entry
 //
 censor_thresh  = [];
 censor_val     = [];
@@ -50,43 +37,42 @@ hss_ec_value   = NA;
 rank_corr_flag = FALSE;
 
 //
-// Forecast and observation fields to be verified
+// Forecast and observation pairs to be verified
+// Parse "pairs" like we'd parse "field", supporting things like set_attr_name
 //
+
+pairs = [
+  { fcst_name = , obs_name = , filters },
+  { },
+
+]
+
+
 fcst = {
-   field = [
-      {
-        name       = "SPFH";
-        level      = [ "P500" ];
-        cat_thresh = [ >80.0 ];
-      },
-
-      {
-        name       = "TMP";
-        level      = [ "P500" ];
-        cat_thresh = [ >273.0 ];
-      },
-
-      {
-        name       = "HGT";
-        level      = [ "P500" ];
-        cat_thresh = [ >0.0 ];
-      },
-
-      {
-        name       = "UGRD";
-        level      = [ "P500" ];
-        cat_thresh = [ >5.0 ];
-      },
-
-      {
-        name       = "VGRD";
-        level      = [ "P500" ];
-        cat_thresh = [ >5.0 ];
-      }
-   ];
+  pairs = [
+    {
+      name = "TMP"; level = "P100-1000"... P100, P200, XXX P1100 // IODA forecast variable name or comma-separated list of FCST_VAR names
+      filter_str_inc = [ { name = "FCST_LEVEL"; value = "P100,P200,P300"; } ];
+      filter_str_exc = [ { name = ""; value  = ""; } ];
+      filter_thresh  = [ { name = ""; thresh = NA; } ];
+      cat_thresh = [ >273, >283 ];
+      cnt_thresh = [ NA, >273 ];
+    }
+  ];
+}
 
+obs = {
+  pairs = [
+    {
+      name = "TMP"; // IODA observation variable name or comma-separated list of OBS_VAR names
+      filter_str_inc = [ { name = "OBS_LEVEL"; value  = "Z2"; } ];
+      filter_str_exc = [ { name = ""; value  = ""; } ];
+      filter_thresh  = [ { name = ""; thresh = NA; } ];
+      cat_thresh = [ >273, >283 ];
+      cnt_thresh = [ NA, >273 ];
+    }
+  ];
 }
-obs = fcst;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -103,24 +89,9 @@ duplicate_flag = NONE;
 obs_summary    = NONE;
 obs_perc_value = 50;
 
-//
-// Mapping of message type group name to comma-separated list of values.
-//
-message_type_group_map = [
-   { key = "SURFACE"; val = "ADPSFC,SFCSHP,MSONET";               },
-   { key = "ANYAIR";  val = "AIRCAR,AIRCFT";                      },
-   { key = "ANYSFC";  val = "ADPSFC,SFCSHP,ADPUPA,PROFLR,MSONET"; },
-   { key = "ONLYSF";  val = "ADPSFC,SFCSHP";                      },
-   { key = "LANDSF";  val = "ADPSFC,MSONET";                      },
-   { key = "WATERSF"; val = "SFCSHP";                             }
-];
-
-obtype_as_group_val_flag = FALSE;
-
 ////////////////////////////////////////////////////////////////////////////////
 
 //
-// Climatology mean data
 // May be set separately in the "fcst" and "obs" dictionaries
 //
 climo_mean = {
@@ -236,39 +207,6 @@ boot = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-//
-// Interpolation methods
-// May be set separately in each "obs.field" entry
-//
-interp = {
-   vld_thresh = 1.0;
-   shape      = SQUARE;
-
-   type = [
-      {
-         method = NEAREST;
-         width  = 1;
-      }
-   ];
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-//
-// HiRA verification method
-// May be set separately in each "obs.field" entry
-//
-hira = {
-   flag            = FALSE;
-   width           = [ 2, 3, 4, 5 ];
-   vld_thresh      = 1.0;
-   cov_thresh      = [ ==0.25 ];
-   shape           = SQUARE;
-   prob_cat_thresh = [];
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 //
 // Threshold for SEEPS p1 (Probability of being dry)
 //

diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in
@@ -310,6 +310,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 tablefilesdir = $(pkgdatadir)/table_files
 tablefiles_DATA = \
+	met_header_columns_V12.1.txt \
 	met_header_columns_V12.0.txt \
 	met_header_columns_V11.1.txt \
 	met_header_columns_V11.0.txt \