Feature #1019 USCRN

docs/Users_Guide/reformat_point.rst

@@ -448,7 +448,9 @@ While initial versions of the ASCII2NC tool only supported a simple 11 column AS
 
 • `International Arctic Buoy Programme (IABP) Data format <https://iabp.apl.uw.edu/>`_.
 
-• `AErosol RObotic NEtwork (AERONET) versions 2 and 3 format <http://aeronet.gsfc.nasa.gov/>`_
+• `AErosol RObotic NEtwork (AERONET) versions 2 and 3 format <http://aeronet.gsfc.nasa.gov/>`_.
+
+• `U.S. Climate Reference Network (USCRN) Quality Controlled Datasets <https://www.ncei.noaa.gov/access/crn/qcdatasets.html>`_, where the specific data format is determined by the prefix and suffix of the input file name.
 
 • Python embedding of point observations, as described in :numref:`pyembed-point-obs-data`. See example below in :numref:`ascii2nc-pyembed`.
 
@@ -507,7 +509,7 @@ Once the ASCII point observations have been formatted as expected, the ASCII fil
   Usage: ascii2nc
          ascii_file1 [ascii_file2 ... ascii_filen]
          netcdf_file
-         [-format ASCII_format]
+         [-format type]
          [-config file]
          [-valid_beg time]
          [-valid_end time]
@@ -530,7 +532,7 @@ Required Arguments for ascii2nc
 Optional Arguments for ascii2nc
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-3. The **-format ASCII_format** option may be set to "met_point", "little_r", "surfrad", "wwsis", "airnowhourlyaqobs", "airnowhourly", "airnowdaily_v2", "ndbc_standard", "ismn", "iabp", "aeronet", "aeronetv2", "aeronetv3", or "python". If passing in ISIS data, use the "surfrad" format flag.
+3. The **-format type** option may be set to "met_point", "little_r", "surfrad", "wwsis", "airnowhourlyaqobs", "airnowhourly", "airnowdaily_v2", "ndbc_standard", "ismn", "iabp", "aeronet", "aeronetv2", "aeronetv3", "uscrn", or "python". If passing in ISIS data, use the "surfrad" format flag.
 
 4. The **-config file** option is the configuration file for generating time summaries.
 

internal/test_unit/xml/unit_ascii2nc.xml

@@ -226,7 +226,7 @@
   <test name="ascii2nc_iabp">
     <exec>&MET_BIN;/ascii2nc</exec>
     <param> \
-    -format iabp  \
+    -format iabp \
     -valid_beg 20140101 -valid_end 20140201 \
     &DATA_DIR_OBS;/iabp/090629.dat \
     &DATA_DIR_OBS;/iabp/109320.dat  \
@@ -238,4 +238,23 @@
     </output>
   </test>
 
+  <test name="ascii2nc_uscrn">
+    <exec>&MET_BIN;/ascii2nc</exec>
+    <param> \
+    -format uscrn \
+    -valid_beg 20240801 -valid_end 20240801 \
+    &DATA_DIR_OBS;/uscrn/monthly01/CRNM0102-CO_Boulder_14_W.txt \
+    &DATA_DIR_OBS;/uscrn/daily01/2024/CRND0103-2024-CO_Boulder_14_W.txt \
+    &DATA_DIR_OBS;/uscrn/hourly02/2024/CRNH0203-2024-CO_Boulder_14_W.txt \
+    &DATA_DIR_OBS;/uscrn/subhourly01/2024/CRNS0101-05-2024-CO_Boulder_14_W.txt \
+    &DATA_DIR_OBS;/uscrn/soil/soilanom01/CRNSSM0101-CO_Boulder_14_W.csv \
+    &DATA_DIR_OBS;/uscrn/drought01/CRNDI0101-CO_Boulder_14_W.csv \
+    &DATA_DIR_OBS;/uscrn/heat01/CRNHE0101-CO_Boulder_14_W.csv \
+    &OUTPUT_DIR;/ascii2nc/USCRN_Boulder_20240801.nc
+    </param>
+    <output>
+      <point_nc>&OUTPUT_DIR;/ascii2nc/USCRN_Boulder_20240801.nc</point_nc>
+    </output>
+  </test>
+
 </met_test>

internal/test_util/libcode/vx_nc_util/test_pressure_levels.cc

@@ -31,20 +31,20 @@ int main(int argc, char *argv[]) {
     map<string, vector<string> > variable_levels;
 
     vector<string> u_levels;
-    u_levels.push_back("P1000");
-    u_levels.push_back("P800");
-    u_levels.push_back("P500");
+    u_levels.emplace_back("P1000");
+    u_levels.emplace_back("P800");
+    u_levels.emplace_back("P500");
     variable_levels["U"] = u_levels;
 
     vector<string> v_levels;
-    v_levels.push_back("P1000");
-    v_levels.push_back("P900");
-    v_levels.push_back("P700");
-    v_levels.push_back("P500");
-    v_levels.push_back("P300");
-    v_levels.push_back("P100");
-    v_levels.push_back("P50");
-    v_levels.push_back("P10");
+    v_levels.emplace_back("P1000");
+    v_levels.emplace_back("P900");
+    v_levels.emplace_back("P700");
+    v_levels.emplace_back("P500");
+    v_levels.emplace_back("P300");
+    v_levels.emplace_back("P100");
+    v_levels.emplace_back("P50");
+    v_levels.emplace_back("P10");
     variable_levels["V"] = v_levels;
 
     for (map<string, vector<string> >::iterator i = variable_levels.begin();

src/basic/vx_config/config_util.cc

@@ -816,7 +816,7 @@ vector<MaskLatLon> parse_conf_llpnt_mask(Dictionary *dict) {
       }
 
       // Add current MaskLatLon to the vector
-      v.push_back(m);
+      v.emplace_back(m);
    }
 
    return v;

src/basic/vx_config/threshold.cc

@@ -1317,7 +1317,7 @@ void Simple_Node::get_simple_nodes(vector<Simple_Node> &v) const
 
 {
 
-v.push_back(*this);
+v.emplace_back(*this);
 
 return;
 

src/basic/vx_log/string_array.cc

@@ -255,7 +255,7 @@ void StringArray::add(const std::string text)
 
 {
 
-s.push_back(text);
+s.emplace_back(text);
 
 Sorted = false;
 
@@ -277,7 +277,7 @@ void StringArray::add_uniq(const std::string text)
 
 if(!has(text)) {
 
-   s.push_back(text);
+   s.emplace_back(text);
 
    Sorted = false;
 
@@ -323,7 +323,7 @@ for(int i=0; i<a.n(); i++) {
 
    if(!has(a[i])) {
 
-      s.push_back(a[i]);
+      s.emplace_back(a[i]);
 
       Sorted = false;
 
@@ -378,7 +378,7 @@ void StringArray::set(const std::string text)
 
 s.clear();
 
-s.push_back(text);
+s.emplace_back(text);
 
 // Setting to a single value, by nature it is Sorted
 Sorted = true;
@@ -560,6 +560,31 @@ bool StringArray::has(const std::string text, int & index, bool forward) const
 ////////////////////////////////////////////////////////////////////////
 
 
+bool StringArray::all_empty() const
+
+{
+
+bool all_empty = true;
+
+   //
+   // Search for non-empty string
+   //
+
+for(auto &x : s) {
+   if(!x.size() == 0) {
+      all_empty = false;
+      break;
+   }
+}
+
+return all_empty;
+
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+
 void StringArray::parse_wsss(const std::string text)
 
 {
@@ -600,12 +625,12 @@ void StringArray::parse_delim(const std::string text, const char *delim)
   size_t end = str.find_first_of(delim);
   while (end != string::npos) {
       if (start != end)
-          s.push_back(str.substr(start, end-start).c_str());
+          s.emplace_back(str.substr(start, end-start).c_str());
       start = end + 1;
       end = str.find_first_of(delim, start);
   }
   if (start < str.length())
-      s.push_back(str.substr(start).c_str());
+      s.emplace_back(str.substr(start).c_str());
 
   Sorted = false;
 

src/basic/vx_log/string_array.h

@@ -90,6 +90,8 @@ class StringArray {
 
       bool has(const std::string, int & index, bool forward=true) const;
 
+      bool all_empty() const;
+
          //
          //  parse delimited strings
          //

src/basic/vx_math/pwl.cc

@@ -105,8 +105,8 @@ Name = NAME;
 
 for (int j=0; j<Npoints; ++j)  {
 
-   X.push_back(XX[j]);
-   Y.push_back(YY[j]);
+   X.emplace_back(XX[j]);
+   Y.emplace_back(YY[j]);
 
 }
 
@@ -266,8 +266,8 @@ void PiecewiseLinear::add_point(double xx, double yy)
 
 {
 
-X.push_back(xx);
-Y.push_back(yy);
+X.emplace_back(xx);
+Y.emplace_back(yy);
 
 return;
 

src/basic/vx_util/GridTemplate.cc

@@ -55,7 +55,7 @@ GridTemplate::GridTemplate(const GridTemplate& rhs) {
 
    for (offset_iter = rhs._offsetList.begin();
         offset_iter != rhs._offsetList.end(); ++offset_iter)
-      _offsetList.push_back(new GridOffset(*offset_iter));
+      _offsetList.emplace_back(new GridOffset(*offset_iter));
 
    _pointInGridBase   = rhs._pointInGridBase;
    _pointInGridNumX   = rhs._pointInGridNumX;
@@ -506,7 +506,7 @@ void GridTemplate::printOffsetList(FILE *stream) {
 void GridTemplate::_addOffset(int x_offset, int y_offset) {
    GridOffset *offset = new GridOffset(x_offset, y_offset);
 
-   _offsetList.push_back(offset);
+   _offsetList.emplace_back(offset);
 
    return;
 }
@@ -558,28 +558,28 @@ void GridTemplate::_setEdgeOffsets() {
    for(m_iterator  = min_x_by_y.begin();
        m_iterator != min_x_by_y.end();
        m_iterator++) {
-      _offsetLftEdge.push_back(m_iterator->second);
+      _offsetLftEdge.emplace_back(m_iterator->second);
    }
 
    // Store max_x_by_y map as _offsetRgtEdge vector
    for(m_iterator  = max_x_by_y.begin();
        m_iterator != max_x_by_y.end();
        m_iterator++) {
-      _offsetRgtEdge.push_back(m_iterator->second);
+      _offsetRgtEdge.emplace_back(m_iterator->second);
    }
 
    // Store max_y_by_x map as _offsetTopEdge vector
    for(m_iterator  = max_y_by_x.begin();
        m_iterator != max_y_by_x.end();
        m_iterator++) {
-      _offsetTopEdge.push_back(m_iterator->second);
+      _offsetTopEdge.emplace_back(m_iterator->second);
    }
 
    // Store min_y_by_x map as _offsetBotEdge vector
    for(m_iterator  = min_y_by_x.begin();
        m_iterator != min_y_by_x.end();
        m_iterator++) {
-      _offsetBotEdge.push_back(m_iterator->second);
+      _offsetBotEdge.emplace_back(m_iterator->second);
    }
 
    return;

src/basic/vx_util/GridTemplate.h

@@ -88,12 +88,12 @@ class GridTemplate {
       // Access methods
 
       inline void addOffset(const GridOffset &offset) {
-         _offsetList.push_back(new GridOffset(offset.x_offset,
+         _offsetList.emplace_back(new GridOffset(offset.x_offset,
                                               offset.y_offset));
       }
 
       inline void addOffset(const int x_offset, const int y_offset) {
-         _offsetList.push_back(new GridOffset(x_offset, y_offset));
+         _offsetList.emplace_back(new GridOffset(x_offset, y_offset));
       }
 
       int size(void) const {

src/basic/vx_util/ascii_header.cc

@@ -450,7 +450,7 @@ void AsciiHeader::read(const char *version) {
          header_line.set_col_names(line[3]);
 
          // Store the current line
-         Headers.push_back(header_line);
+         Headers.emplace_back(header_line);
       }
 
       // Store the version we just loaded

src/basic/vx_util/crc_array.h

@@ -470,7 +470,7 @@ void CRC_Array<T>::add(const T & k)
 
 extend(Nelements + 1, false);
 
-e.push_back(k);
+e.emplace_back(k);
 
 Nelements++;
 
@@ -494,7 +494,7 @@ int j;
 
 for (j=0; j<(a.Nelements); ++j)  {
 
-   e.push_back(a.e[j]);
+   e.emplace_back(a.e[j]);
 
    Nelements++;