Feature 2842 ugrid config

data/config/GridStatConfig_default

@@ -264,12 +264,6 @@ nc_pairs_flag = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-ugrid_dataset = "";
-ugrid_max_distance_km = 30;
-ugrid_coordinates_file = "";
-
-////////////////////////////////////////////////////////////////////////////////
-
 grid_weight_flag = NONE;
 tmp_dir          = "/tmp";
 output_prefix    = "";

data/config/PointStatConfig_default

@@ -299,12 +299,6 @@ output_flag = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-ugrid_dataset = "";
-ugrid_max_distance_km = 30;
-ugrid_coordinates_file = "";
-
-////////////////////////////////////////////////////////////////////////////////
-
 tmp_dir        = "/tmp";
 output_prefix  = "";
 version        = "V12.0.0";

data/config/UGridConfig_lfric

@@ -2,7 +2,7 @@
 //
 // Unstructured grid configuration file.
 //
-// UGridConfig_lfric at the current working directory overrides the settings here.
+// UGridConfig_lfric at the current working directory replaces the settings here.
 // For additional or updated information, please see the MET User's Guide.
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ -12,23 +12,14 @@
 //
 ugrid_metadata_map = [
    { key = "dim_face";  val = "nMesh2d_face"; },
-   { key = "dim_node";  val = "nMesh2d_node"; },
-   { key = "dim_edge";  val = "nMesh2d_edge"; },
    { key = "dim_time";  val = "time_counter"; },
-   { key = "dim_vert";  val = "nVertLevels"; },
-   { key = "cell_id";   val = "indexToCellID"; },
+   { key = "dim_vert";  val = ""; },            // optional
    { key = "lat_face";  val = "Mesh2d_face_y"; },
    { key = "lon_face";  val = "Mesh2d_face_x"; },
-   { key = "vert_face"; val = "zCell"; },
-   { key = "lat_edge";  val = "Mesh2d_edge_y"; },
-   { key = "lon_edge";  val = "Mesh2d_edge_x"; },
-   { key = "lat_node";  val = "Mesh2d_node_y"; },
-   { key = "lon_node";  val = "Mesh2d_node_x"; },
-   { key = "time";      val = "time_centered"; }
+   { key = "vert_face"; val = ""; },            // optional
+   { key = "time";      val = "time_instant"; }
 ];
 
-ugrid_max_distance_km = 30;
-
 ////////////////////////////////////////////////////////////////////////////////
 
 version = "V12.0.0";

data/config/UGridConfig_mpas

@@ -2,7 +2,7 @@
 //
 // Unstructured grid configuration file.
 //
-// UGridConfig_mpas at the current working directory overrides the settings here.
+// UGridConfig_mpas at the current working directory replaces the settings here.
 // For additional or updated information, please see the MET User's Guide.
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ -12,23 +12,14 @@
 //
 ugrid_metadata_map = [
    { key = "dim_face";  val = "nCells"; },
-   { key = "dim_node";  val = "nVertices"; },
-   { key = "dim_edge";  val = "nEdges"; },
    { key = "dim_time";  val = "Time"; },
-   { key = "dim_vert";  val = "nVertLevels"; },
-   { key = "cell_id";   val = "indexToCellID"; },
+   { key = "dim_vert";  val = "nVertLevels"; }, // optional
    { key = "lat_face";  val = "latCell"; },
    { key = "lon_face";  val = "lonCell"; },
-   { key = "vert_face"; val = "zCell"; },
-   { key = "lat_edge";  val = "latEdge"; },
-   { key = "lon_edge";  val = "lonEdge"; },
-   { key = "lat_node";  val = "latVertex"; },
-   { key = "lon_node";  val = "lonVertex"; },
+   { key = "vert_face"; val = "zCell"; },       // optional
    { key = "time";      val = "xtime"; }
 ];
 
-ugrid_max_distance_km = 30;
-
 ////////////////////////////////////////////////////////////////////////////////
 
 version = "V12.0.0";

internal/test_unit/config/PointStatConfig_ugrid_no_dataset

@@ -0,0 +1,167 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Point-Stat configuration file.
+//
+// For additional information, please see the MET User's Guide.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+model = "WRF";
+
+//
+// Output description to be written
+// May be set separately in each "obs.field" entry
+//
+desc = "NA";
+
+////////////////////////////////////////////////////////////////////////////////
+
+regrid = {
+   to_grid = NONE;
+   method  = NEAREST;
+   width   = 1;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+obs_window = {
+   beg = ${BEG_DS};
+   end = ${END_DS};
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+mpr_column  = [];
+mpr_thresh  = [];
+cnt_thresh  = [ NA ];
+cnt_logic   = UNION;
+wind_thresh = [ NA ];
+wind_logic  = UNION;
+eclv_points = 0.05;
+
+
+fcst = {
+   sid_inc = [];
+   sid_exc = [];
+   obs_quality_inc  = [];
+   obs_quality_exc  = [];
+
+   field = [
+      { name = "theta";  level = "L2";  message_type = "ADPSFC"; }
+   ];
+
+}
+
+obs = {
+   sid_inc = [];
+   sid_exc = [];
+   obs_quality_inc  = [];
+   obs_quality_exc  = [];
+
+   field = [
+      { name = "TMP";  level = "P1000-500";  message_type = "ADPSFC"; }
+   ];
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+climo_mean = obs;
+climo_mean = {
+   file_name = [];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+mask = {
+   grid  = [];
+   poly  = [];
+   sid   = [];
+   llpnt = [{ name = "ALLLATLON"; lat_thresh = NA;   lon_thresh = NA; }];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+ci_alpha  = [ 0.05 ];
+
+boot = {
+   interval = PCTILE;
+   rep_prop = 1.0;
+   n_rep    = 200;
+   rng      = "mt19937";
+   seed     = "1";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+interp = {
+   vld_thresh = 1.0;
+
+   type = [
+      {
+         method = NEAREST;
+         width  = 1;
+      }
+   ];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+hira = {
+   flag            = FALSE;
+   width           = [ 2, 3, 4, 5 ];
+   vld_thresh      = 1.0;
+   cov_thresh      = [ ==0.25 ];
+   shape           = SQUARE;
+   prob_cat_thresh = [];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+output_flag = {
+   fho    = BOTH;
+   ctc    = BOTH;
+   cts    = BOTH;
+   mctc   = NONE;
+   mcts   = NONE;
+   cnt    = BOTH;
+   sl1l2  = NONE;
+   sal1l2 = NONE;
+   vl1l2  = NONE;
+   val1l2 = NONE;
+   vcnt   = BOTH;
+   pct    = NONE;
+   pstd   = NONE;
+   pjc    = NONE;
+   prc    = NONE;
+   ecnt   = NONE;
+   orank  = NONE;
+   rps    = NONE;
+   eclv   = BOTH;
+   mpr    = BOTH;
+   seeps  = NONE;
+   seeps_mpr = NONE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Threshold for SEEPS p1 (Probability of being dry)
+
+seeps_p1_thresh = NA;
+
+////////////////////////////////////////////////////////////////////////////////
+// Unstructured Grid (optional ecept ugrid_dataset)
+
+//ugrid_dataset = "mpas";
+ugrid_max_distance_km = 35;
+//ugrid_map_config = "";
+ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc";
+
+////////////////////////////////////////////////////////////////////////////////
+
+duplicate_flag = NONE;
+rank_corr_flag = TRUE;
+tmp_dir        = "/tmp";
+output_prefix  = "${OUTPUT_PREFIX}";
+version        = "V12.0.0";
+
+////////////////////////////////////////////////////////////////////////////////

internal/test_unit/xml/unit_ugrid.xml

@@ -111,4 +111,30 @@
     </output>
   </test>
 
+  <test name="point_stat_ugrid_mpas_config">
+    <exec>&MET_BIN;/point_stat</exec>
+    <env>
+      <pair><name>BEG_DS</name>         <value>-1800</value></pair>
+      <pair><name>END_DS</name>         <value>1800</value></pair>
+      <pair><name>OUTPUT_PREFIX</name>  <value>UGRID_MPAS_CFG_OUT_TEMP</value></pair>
+      <pair><name>CONFIG_DIR</name>     <value>&CONFIG_DIR;</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_UGRID;/mpas/mpasout.2012-04-09_12.00.00_reduced.nc \
+      &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \
+      &CONFIG_DIR;/PointStatConfig_ugrid_no_dataset \
+      -ugrid_config ${MET_BASE}/config/UGridConfig_mpas \
+      -outdir &OUTPUT_DIR;/point_stat_ugrid -v 1 
+    </param>
+    <output>
+      <stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V_fho.txt</stat>
+      <stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V_ctc.txt</stat>
+      <stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V_cts.txt</stat>
+      <stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V_cnt.txt</stat>
+      <stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V_eclv.txt</stat>
+      <stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V_mpr.txt</stat>
+    </output>
+  </test>
+
 </met_test>

src/libcode/vx_data2d_ugrid/data2d_ugrid.cc

@@ -322,27 +322,6 @@ int MetUGridDataFile::data_plane_array(VarInfo &vinfo,
       mlog << Error << "\n" << method_name
            << "LevelType_Time for unstructured grid is not enabled\n\n";
       exit(1);
-      /* Not enabled
-      const int debug_level = 7;
-      LongArray time_offsets = collect_time_offsets(vinfo);
-      if (0 < time_offsets.n_elements()) {
-         for (int idx=0; idx<time_offsets.n_elements(); idx++) {
-            _cur_time_index = time_offsets[idx];
-            if (data_plane(vinfo, plane)) {
-               plane_array.add(plane, lvl_lower, lvl_upper);
-               n_rec++;
-            }
-         }
-
-         if (mlog.verbosity_level() >= debug_level) {
-            for (int idx=0; idx< time_offsets.n_elements(); idx++ ) {
-               mlog << Debug(debug_level) << method_name << "time: "
-                    << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_offsets[idx]])
-                    << " from index " << time_offsets[idx] << "\n";
-            }
-         }
-      }
-      */
    }
    else if (level.type() == LevelType_Pres) {
       if (nullptr == data_vinfo) {
@@ -353,7 +332,7 @@ int MetUGridDataFile::data_plane_array(VarInfo &vinfo,
                if (vlevel >= lvl_lower && vlevel <= lvl_upper) {
                   vinfo.set_req_name(vinfo_list[idx]->name.c_str());
                   if (data_plane(vinfo, plane, vinfo_list[idx])) {
-                     plane_array.add(plane, lvl_lower, lvl_upper);
+                     plane_array.add(plane, vlevel, vlevel);
                      n_rec++;
                   }
                   mlog << Debug(5) << method_name

src/libcode/vx_data2d_ugrid/ugrid_file.cc

@@ -940,6 +940,9 @@ void UGridFile::read_netcdf_grid()
     }
   }
 
+  // Convert longitude from degrees east to west
+  for (int idx=0; idx<face_count; idx++) _lon[idx] = -1.0*rescale_deg(_lon[idx], -180, 180);
+
   grid_data.set_points(face_count, _lon, _lat);
   grid_data.max_distance_km = max_distance_km;
 
@@ -958,33 +961,39 @@ void UGridFile::read_netcdf_grid()
 
 void UGridFile::set_dataset(ConcatString _dataset_name) {
 
-  const char *ugrid_config_name = nullptr;
+  ConcatString ugrid_config_name;
+  const string method_name = "UGridFile::set_dataset() ";
 
   if (0 == _dataset_name.length()) {
-    mlog << Error << "\nUGridFile::set_dataset()"
-         << " The \"" << conf_key_ugrid_dataset
+    mlog << Error << "\n" << method_name
+         << "The \"" << conf_key_ugrid_dataset
          << "\" is not defined at the configuration file.\n\n";
     exit(1);
   }
   dataset_name = _dataset_name;
-  ConcatString dataset_config(def_config_prefix);
-  dataset_config.add(dataset_name);
-  if (!file_exists(dataset_config.c_str())) {
-    dataset_config = def_config_prefix2;
+  if (file_exists(dataset_name.c_str())) {
+    /* UGridConfig file was passed as the ugrid_dataset */
+    ugrid_config_name = dataset_name;
+  }
+  else {
+    ConcatString dataset_config(def_config_prefix);
     dataset_config.add(dataset_name);
-    dataset_config = replace_path(dataset_config.c_str());
+    if (!file_exists(dataset_config.c_str())) {
+      dataset_config = def_config_prefix2;
+      dataset_config.add(dataset_name);
+      dataset_config = replace_path(dataset_config.c_str());
+    }
+    ugrid_config_name = dataset_config;
   }
-  ugrid_config_name = dataset_config.c_str();
-  if (file_exists(ugrid_config_name)) {
-    read_config(ugrid_config_name);
+  if (file_exists(ugrid_config_name.c_str())) {
+    read_config(ugrid_config_name.c_str());
   }
   else {
-    mlog << Error << "\nUGridFile::set_dataset()"
-         << " The UGrid dataset \"" << dataset_name << "\" is not supported. Please add \""
+    mlog << Error << "\n" << method_name
+         << "The UGrid dataset \"" << dataset_name << "\" is not supported. Please add \""
          << ugrid_config_name << "\".\n\n";
     exit(1);
   }
-
 }
 
 ////////////////////////////////////////////////////////////////////////