Per #1954, ci-run-unit fix failure from unit_point2grid.xml. Had to a…

…dd Grid::is_set() function to prevent checking the GridInfo class info prior to the grid being defined.
dtcenter · Sep 16, 2022 · fe6b03d · fe6b03d
1 parent c164c34
commit fe6b03d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/libcode/vx_data2d_nc_met/met_file.cc b/src/libcode/vx_data2d_nc_met/met_file.cc
@@ -175,7 +175,7 @@ string x_dim_name, y_dim_name;
    //  semilatlon dimension names
    //
 
-if ( grid.info().sl ) {
+if ( grid.is_set() && grid.info().sl ) {
 
         if ( gDimNames.has("latlon") )  x_dim_name = "latlon";
    else if ( gDimNames.has("lon")    )  x_dim_name = "lon";

diff --git a/src/libcode/vx_grid/grid_base.h b/src/libcode/vx_grid/grid_base.h
@@ -217,6 +217,8 @@ class Grid : public GridInterface {
 
       void dump(ostream &, int = 0) const;
 
+      bool is_set() const;
+
       void set (const char *);   //  lookup by name
       void set (const LambertData       &);
       void set (const StereographicData &);
@@ -269,6 +271,12 @@ class Grid : public GridInterface {
 ////////////////////////////////////////////////////////////////////////
 
 
+inline bool Grid::is_set() const { return ( rep != 0 ); }
+
+
+////////////////////////////////////////////////////////////////////////
+
+
 extern bool operator==(const Grid &, const Grid &);
 extern bool operator!=(const Grid &, const Grid &);
 extern bool operator==(const GridInfo &, const GridInfo &);

diff --git a/src/tools/other/point2grid/point2grid.cc b/src/tools/other/point2grid/point2grid.cc
@@ -604,7 +604,8 @@ int get_obs_type(NcFile *nc) {
       input_type = "OBS_MET";
    }
 
-   mlog << Debug(5) << method_name << "input type: \"" << input_type << "\".\n";
+   mlog << Debug(5) << method_name << "input type: \"" << input_type << "\"\n";
+
    return obs_type;
 }