From 4ae53ce25a3be10dd5b153b578acf57dcbdb964c Mon Sep 17 00:00:00 2001
From: davidh-ssec <david.hoese@ssec.wisc.edu>
Date: Sat, 15 Jul 2017 11:58:42 -0500
Subject: [PATCH] Fix ascii file location and netcdf generation call

---
 scripts/metobs_config.sh      | 7 ++++---
 scripts/run_tower_level_b1.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/metobs_config.sh b/scripts/metobs_config.sh
index 5a835d7..b2f9ee9 100644
--- a/scripts/metobs_config.sh
+++ b/scripts/metobs_config.sh
@@ -36,7 +36,8 @@ cache_level_00_file() {
     year=${d:0:4}
     month=${d:4:2}
     day=${d:6:2}
-    echo "${TOWER_CACHE_DIR}/level_00/version_00/${year}/${month}/${day}/aoss_tower.${year}-${month}-${day}.ascii"
+#    echo "${TOWER_CACHE_DIR}/level_00/version_00/${year}/${month}/${day}/aoss_tower.${year}-${month}-${day}.ascii"
+    echo "${TOWER_CACHE_DIR}/level_00/version_00/${year}/${month}/${day}/rig_tower.${year}-${month}-${day}.ascii"
 }
 
 cache_level_b1_file() {
@@ -45,7 +46,7 @@ cache_level_b1_file() {
     month=${d:4:2}
     day=${d:6:2}
     # new:
-#    echo "${TOWER_CACHE_DIR}/level_b1/version_00/${year}/${month}/${day}/aoss_tower.${year}-${month}-${day}.nc"
+    echo "${TOWER_CACHE_DIR}/level_b1/version_00/${year}/${month}/${day}/aoss_tower.${year}-${month}-${day}.nc"
     # old:
-    echo "${TOWER_CACHE_DIR}/level_b1/version_00/${year}/${month}/aoss_tower.${year}-${month}-${day}.nc"
+#    echo "${TOWER_CACHE_DIR}/level_b1/version_00/${year}/${month}/aoss_tower.${year}-${month}-${day}.nc"
 }
\ No newline at end of file
diff --git a/scripts/run_tower_level_b1.sh b/scripts/run_tower_level_b1.sh
index fe99113..8588865 100755
--- a/scripts/run_tower_level_b1.sh
+++ b/scripts/run_tower_level_b1.sh
@@ -39,7 +39,7 @@ fi
     out_file=`cache_level_b1_file "$DATE"`
     out_fn=`basename "$out_file"`
     tmp_out="$tmp_dir/$out_fn"
-    $ENV/bin/python -m aosstower.level_b1.nc -vv -z -i "$prev_file" "$curr_file" --date="${DATE}" -o "$tmp_out" >> $logfile
+    $ENV/bin/python -m aosstower.level_b1.nc -vv -z -i "$prev_file" "$curr_file" -s "${DATE}" -o "$tmp_out" >> $logfile
     nc_status=$?
     if [ $nc_status -ne 0 ]; then
         oops "NetCDF generation failed for $DATE"
-- 
GitLab