Feature 1291 develop gaussian to goes (#1314)

* #1291 Enabled gaussian to GOES. Added attributes for gaussian congig * #1291 Added point2grid_GOES_16_AOD_TO_G212_GAUSSIAN * #1291 -prob_cat_thresh requiers an equality or inequality symbol * #1291 Changed datatype of prob_cat_thresh to SingleThresh * #1291 Changed command line argument of -prob_cat_thresh * #1291 Changed usage messages for the consistency * Update met/src/tools/other/point2grid/point2grid.cc * Update met/src/tools/other/point2grid/point2grid.cc * Update met/src/tools/other/point2grid/point2grid.cc * Per #1271, include the prob_cat_thresh in the output variable names. * Per #1271, redirect the output from the unit_point2grid.xml tests from the regrid output directory to the point2grid directory to make it easier to find. Co-authored-by: hsoh-u <hsoh@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@kiowa.rap.ucar.edu>
dtcenter · Apr 24, 2020 · 38a443f · 38a443f
1 parent 2747852
commit 38a443f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 26 deletions.
diff --git a/met/src/tools/other/point2grid/point2grid.cc b/met/src/tools/other/point2grid/point2grid.cc
@@ -904,7 +904,7 @@ void process_point_file(NcFile *nc_in, MetConfig &config, VarInfo *vinfo,
 
       if (has_prob_thresh || do_gaussian_filter) {
          ConcatString vname_prob = vname;
-         vname_prob << "_prob";
+         vname_prob << "_prob_" << prob_cat_thresh.get_abbr_str();
          ConcatString vname_prob_mask = vname_prob;
          vname_prob_mask << "_mask";
 
@@ -1242,7 +1242,7 @@ void process_goes_file(NcFile *nc_in, MetConfig &config, VarInfo *vinfo,
       if (has_prob_thresh || do_gaussian_filter) {
          DataPlane prob_dp, prob_mask_dp;
          ConcatString vname_prob = vname;
-         vname_prob << "_prob";
+         vname_prob << "_prob_" << prob_cat_thresh.get_abbr_str();
          int nx = to_dp.nx();
          int ny = to_dp.ny();
          prob_dp.set_size(nx, ny);

diff --git a/test/xml/unit_point2grid.xml b/test/xml/unit_point2grid.xml
@@ -20,13 +20,13 @@
     <param> \
       &OUTPUT_DIR;/ascii2nc/surfrad.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/surfrad_to_G212.nc \
+      &OUTPUT_DIR;/point2grid/surfrad_to_G212.nc \
       -field 'name="204"; level="*";' \
       -name DW_PSP \
       -v 1
     </param>
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/surfrad_to_G212.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/surfrad_to_G212.nc</grid_nc>
     </output>
   </test>
 
@@ -35,14 +35,14 @@
     <param> \
       &OUTPUT_DIR;/pb2nc/ndas.20120409.t12z.prepbufr.tm00.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/pb2nc_TMP.nc \
+      &OUTPUT_DIR;/point2grid/pb2nc_TMP.nc \
       -field 'name="TMP"; level="*"; valid_time="20120409_120000"; censor_thresh=[ &lt;0 ]; censor_val=[0];' \
       -name TEMP \
       -v 1
     </param>
     <!--  -->
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/pb2nc_TMP.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/pb2nc_TMP.nc</grid_nc>
     </output>
   </test>
 
@@ -51,14 +51,14 @@
     <param> \
       &OUTPUT_DIR;/pb2nc/ndas.20120409.t12z.prepbufr.tm00.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/pb2nc_TMP_prob.nc \
+      &OUTPUT_DIR;/point2grid/pb2nc_TMP_prob.nc \
       -field 'name="TMP"; level="*"; valid_time="20120409_120000"; censor_thresh=[ &lt;0 ]; censor_val=[0];' \
       -name TEMP -prob_cat_thresh ">=280.0" \
       -v 1
     </param>
     <!--  -->
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/pb2nc_TMP_prob.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/pb2nc_TMP_prob.nc</grid_nc>
     </output>
   </test>
 
@@ -67,14 +67,14 @@
     <param> \
       &OUTPUT_DIR;/pb2nc/ndas.20120409.t12z.prepbufr.tm00.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/pb2nc_TMP_prob_gaussian.nc \
+      &OUTPUT_DIR;/point2grid/pb2nc_TMP_prob_gaussian.nc \
       -field 'name="TMP"; level="*"; valid_time="20120409_120000"; censor_thresh=[ &lt;0 ]; censor_val=[0];' \
       -name TEMP -prob_cat_thresh ">=280.0" -method GAUSSIAN \
       -v 1
     </param>
     <!--  -->
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/pb2nc_TMP_prob_gaussian.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/pb2nc_TMP_prob_gaussian.nc</grid_nc>
     </output>
   </test>
 
@@ -101,13 +101,31 @@
     <param> \
       &DATA_DIR_MODEL;/goes_16/OR_ABI-L2-AODC-M3_G16_s20181341702215_e20181341704588_c20181341711418.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/point2grid_GOES_16_AOD_TO_G212_compute.nc \
+      &OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_compute.nc \
       -field 'name="AOD";  level="(*,*)";' \
       -qc 1,2,3 -method MAX \
       -v 1
     </param>
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/point2grid_GOES_16_AOD_TO_G212_compute.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_compute.nc</grid_nc>
+    </output>
+  </test>
+
+  <test name="point2grid_GOES_16_AOD_TO_G212_GAUSSIAN">
+    <exec>&MET_BIN;/point2grid</exec>
+    <env>
+      <pair><name>MET_TMP_DIR</name>  <value>&OUTPUT_DIR;</value></pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/goes_16/OR_ABI-L2-AODC-M3_G16_s20181341702215_e20181341704588_c20181341711418.nc \
+      G212 \
+      &OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_gaussian.nc \
+      -field 'name="AOD";  level="(*,*)";' \
+      -method MAX -prob_cat_thresh ">=1.0" -method GAUSSIAN \
+      -v 1
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_gaussian.nc</grid_nc>
     </output>
   </test>
 
@@ -137,14 +155,14 @@
     <param> \
       &DATA_DIR_MODEL;/goes_16/OR_ABI-L2-AODC-M6_G16_s20192662141196_e20192662143569_c20192662145547.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/point2grid_GOES_16_ADP.nc \
+      &OUTPUT_DIR;/point2grid/point2grid_GOES_16_ADP.nc \
       -field 'name="AOD_Smoke";  level="(*,*)";' \
       -adp &DATA_DIR_MODEL;/goes_16/OR_ABI-L2-ADPC-M6_G16_s20192662141196_e20192662143569_c20192662144526.nc \
       -qc 1,2 -method MAX \
       -v 5:warning
     </param>
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/point2grid_GOES_16_ADP.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/point2grid_GOES_16_ADP.nc</grid_nc>
     </output>
   </test>
 
@@ -156,39 +174,33 @@
     <param> \
       &DATA_DIR_MODEL;/goes_16/OR_ABI-L2-AODC-M3_G16_s20181341702215_e20181341704588_c20181341711418.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/point2grid_GOES_16_AOD_TO_G212_grid_map.nc \
+      &OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_grid_map.nc \
       -field 'name="AOD";  level="(*,*)";' \
       -qc 1,2,3 -method MAX \
       -v 1
     </param>
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/point2grid_GOES_16_AOD_TO_G212_grid_map.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_grid_map.nc</grid_nc>
     </output>
   </test>
 
-  <test name="point2grid_REMOVE_GRID_MAP">
-    <exec>rm</exec>
-    <param> &OUTPUT_DIR;/CONUS_2500_1500_*
-    </param>
-    <output></output>
-  </test>  
-
   <test name="point2grid_GOES_16_AOD_TO_G212_COORD">
-    <exec>&MET_BIN;/point2grid</exec>
+    <exec>rm -f &OUTPUT_DIR;/CONUS_2500_1500_*;
+          &MET_BIN;/point2grid</exec>
     <env>
       <pair><name>MET_GEOSTATIONARY_DATA</name><value>&DATA_DIR_MODEL;/goes_16/g16_conus_latlon_2km_20180620.dat</value></pair>
       <pair><name>MET_TMP_DIR</name>  <value>&OUTPUT_DIR;</value></pair>
     </env>
     <param> \
       &DATA_DIR_MODEL;/goes_16/OR_ABI-L2-AODC-M3_G16_s20181341702215_e20181341704588_c20181341711418.nc \
       G212 \
-      &OUTPUT_DIR;/regrid/point2grid_GOES_16_AOD_TO_G212.nc \
+      &OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212.nc \
       -field 'name="AOD";  level="(*,*)";' \
       -qc 1,2,3 -method MAX \
       -v 1
     </param>
     <output>
-      <grid_nc>&OUTPUT_DIR;/regrid/point2grid_GOES_16_AOD_TO_G212.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212.nc</grid_nc>
     </output>
   </test>
 </met_test>