Merge pull request #2372 from dtcenter/bugfix_2370_aeronetv3

Bugfix 2370 aeronetv3
dtcenter · Dec 9, 2022 · 7bfbc1e · 7bfbc1e
2 parents e81cf04 + b0141b0
commit 7bfbc1e
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 84 deletions.
diff --git a/internal/test_unit/xml/unit_aeronet.xml b/internal/test_unit/xml/unit_aeronet.xml
@@ -51,6 +51,18 @@
     </output>
   </test>
 
+  <test name="ascii2nc_AERONET_v3_concat">
+    <exec>&MET_BIN;/ascii2nc</exec>
+    <param> \
+      &DATA_DIR_OBS;/aeronet/20221202.v3.lev15.txt \
+      &OUTPUT_DIR;/aeronet/20221202.v3.lev15.nc \
+      -v 1 -format aeronetv3
+    </param>
+    <output>
+      <point_nc>&OUTPUT_DIR;/aeronet/20221202.v3.lev15.nc</point_nc>
+    </output>
+  </test>
+
   <test name="ascii2nc_AERONET_vld_thresh">
     <exec>&MET_BIN;/ascii2nc</exec>
     <env>

diff --git a/src/basic/vx_cal/unix_to_mdyhms.cc b/src/basic/vx_cal/unix_to_mdyhms.cc
@@ -16,6 +16,7 @@ using namespace std;
 
 #include <iostream>
 #include <unistd.h>
+#include <string.h>
 #include <stdlib.h>
 #include <cmath>
 
@@ -94,6 +95,35 @@ const char * short_month_name[] = {
 };
 
 
+////////////////////////////////////////////////////////////////////////
+// Converts a month string to month (1 to 12).
+
+int month_name_to_m (const char *month_str)
+
+{
+
+int month = -1;
+int str_len = strlen(month_str);
+char t_month_str[str_len + 1];
+
+for (int idx=0; idx<str_len; idx++) {
+   t_month_str[idx] = (idx==0) ? toupper(month_str[idx]) : tolower(month_str[idx]);
+}
+t_month_str[str_len] = 0;
+
+for (int idx=1; idx<=12; idx++) {
+   if (0 == strcmp(short_month_name[idx], t_month_str)
+       || 0 == strcmp(month_name[idx], t_month_str)) {
+      month = idx;
+      break;
+   }
+}
+
+return month;
+
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 
 

diff --git a/src/basic/vx_cal/vx_cal.h b/src/basic/vx_cal/vx_cal.h
@@ -54,6 +54,7 @@ extern  unixtime  doyhms_to_unix  (int doy, int year, int hour, int minute, int
 extern  unixtime  mdyhms_to_unix  (int month, int day, int year, int hour, int minute, int second);
 
 extern  void      unix_to_mdyhms  (unixtime u, int & month, int & day, int & year, int & hour, int & minute, int & second);
+extern  int       month_name_to_m (const char *month_str);
 
 
 extern  int       date_to_mjd     (int m, int d, int y);