"a bugfix for smoke emission preprocessing task" (NOAA-EMC#443)

EricJames-NOAA · Nov 3, 2022 · 0be7204 · 0be7204
1 parent f1adb57
commit 0be7204
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 15 deletions.
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/CONUS_G2_3km_weight_file.nc b/fix/smoke_dust/RRFS_CONUS_3km/CONUS_G2_3km_weight_file.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/CONUS_G2_3km_weight_file.nc
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/RRFS_CONUS_3km_weight_file.nc b/fix/smoke_dust/RRFS_CONUS_3km/RRFS_CONUS_3km_weight_file.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/RRFS_CONUS_3km_weight_file.nc
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/ds_out_base.nc b/fix/smoke_dust/RRFS_CONUS_3km/ds_out_base.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/ds_out_base.nc
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/dummy_24hr_smoke.nc b/fix/smoke_dust/RRFS_CONUS_3km/dummy_24hr_smoke.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/dummy_24hr_smoke.nc
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/dummy_hr_rave.nc b/fix/smoke_dust/RRFS_CONUS_3km/dummy_hr_rave.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/dummy_hr_rave.nc
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/grid_in.nc b/fix/smoke_dust/RRFS_CONUS_3km/grid_in.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/grid_in.nc
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/grid_in_new_dom.nc b/fix/smoke_dust/RRFS_CONUS_3km/grid_in_new_dom.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/grid_in_new_dom.nc
diff --git a/fix/smoke_dust/RRFS_CONUS_3km/veg_map.nc b/fix/smoke_dust/RRFS_CONUS_3km/veg_map.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/veg_map.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/CONUS_G2_3km_weight_file.nc b/fix/smoke_dust/RRFS_NA_3km/CONUS_G2_3km_weight_file.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/CONUS_G2_3km_weight_file.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/RRFS_CONUS_3km_weight_file.nc b/fix/smoke_dust/RRFS_NA_3km/RRFS_CONUS_3km_weight_file.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/RRFS_CONUS_3km_weight_file.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/ds_out_base.nc b/fix/smoke_dust/RRFS_NA_3km/ds_out_base.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/ds_out_base.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/dummy_24hr_smoke.nc b/fix/smoke_dust/RRFS_NA_3km/dummy_24hr_smoke.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/dummy_24hr_smoke.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/dummy_hr_rave.nc b/fix/smoke_dust/RRFS_NA_3km/dummy_hr_rave.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/dummy_hr_rave.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/grid_in.nc b/fix/smoke_dust/RRFS_NA_3km/grid_in.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/grid_in.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/grid_in_new_dom.nc b/fix/smoke_dust/RRFS_NA_3km/grid_in_new_dom.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/grid_in_new_dom.nc
diff --git a/fix/smoke_dust/RRFS_NA_3km/veg_map.nc b/fix/smoke_dust/RRFS_NA_3km/veg_map.nc
@@ -0,0 +1 @@
+../../.agent/smoke_dust/veg_map.nc
diff --git a/jobs/JREGIONAL_PROCESS_SMOKE b/jobs/JREGIONAL_PROCESS_SMOKE
@@ -62,6 +62,7 @@ preprocess with FV3 for the specified cycle.
 #
 if [ ${CYCLE_TYPE} == "spinup" ]; then
   workdir=${CYCLE_DIR}/process_smoke_spinup
+  exit 0
 else
   workdir=${CYCLE_DIR}/process_smoke
 fi
@@ -91,9 +92,9 @@ mkdir_vrfy -p "${rave_nwges_dir}"
 #
 cd_vrfy ${workdir}
 python -u ${SCRIPTSDIR}/preprocess_smoke.py \
-  "${FIRE_RRFS_ROOT}/${PREDEF_GRID_NAME}/fixed" \
+  "${FIX_SMOKE_DUST}/${PREDEF_GRID_NAME}" \
   "${FIRE_RAVE_DIR}" \
-  "${rave_nwges_dir}" \
+  "${workdir}" \
   "${PREDEF_GRID_NAME}" \
 print_err_msg_exit "\
 Call to pyscript \"${scrfunc_fn}\" failed."
@@ -117,13 +118,10 @@ prev_hh=`${DATE} -d "$current_hh -24 hour" +"%H"`
 previous_day=`${DATE} '+%C%y%m%d' -d "$current_day-1 days"`
 previous_day=${previous_day}${prev_hh}
 output_filename=SMOKE_RRFS_data_${YYYYMMDDHH}00.nc
-#output_filename=SMOKE_RRFS_data_${previous_day}00.nc
 echo ${previous_day}
 echo ${output_filename}
 
-#cd_vrfy /mnt/lfs4/BMC/gsd-fv3-dev/FIRE_RRFS_ROOT/RAVE_INTP2
-cd_vrfy ${rave_nwges_dir}
-echo ${rave_nwges_dir}
+cd ${workdir}
 
 # Convert START_TIME from 'YYYYMMDDHH' format to Unix date format, e.g. "Fri May  6 19:50:23 GMT 2005"
 if [ `${ECHO} "${previous_day}" | ${AWK} '/^[[:digit:]]{10}$/'` ]; then
@@ -145,6 +143,7 @@ files2cat[$i]=${PREDEF_GRID_NAME}_intp_${timestr}00_${timestr}00.nc
 done
 echo ${files2cat[*]}
 ncrcat ${files2cat[*]} ${output_filename} 
+cp ${output_filename}  ${rave_nwges_dir}
 
 #
 #-----------------------------------------------------------------------

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -417,7 +417,7 @@ if [ "${DO_SMOKE_DUST}" = "TRUE" ]; then
  if [ -f ${NWGES_BASEDIR}/RAVE_INTP/SMOKE_RRFS_data_${yyyymmddhh}00.nc ]; then
   ln_vrfy -snf ${NWGES_BASEDIR}/RAVE_INTP/SMOKE_RRFS_data_${yyyymmddhh}00.nc ${run_dir}/INPUT/SMOKE_RRFS_data.nc
  else
-  ln_vrfy -snf ${FIRE_RRFS_ROOT}/${PREDEF_GRID_NAME}/fixed/dummy_24hr_smoke.nc ${run_dir}/INPUT/SMOKE_RRFS_data.nc
+  ln_vrfy -snf ${FIX_SMOKE_DUST}/${PREDEF_GRID_NAME}/dummy_24hr_smoke.nc ${run_dir}/INPUT/SMOKE_RRFS_data.nc
  fi
 fi
 #

diff --git a/scripts/preprocess_smoke.py b/scripts/preprocess_smoke.py
@@ -54,12 +54,8 @@
 print('fcst_YYYYMMDDHH', fcst_YYYYMMDDHH, previous_day, fcst_dates[5])
 
 #Check if interoplated RAVE is available for the previous 24 hours. Create dummy RAVE if given hours are not available
-#RAVE='/mnt/lfs4/BMC/gsd-fv3-dev/Johana.R/FIRE_RRFS_ROOT/RAVE_INTP/test_new_wf'
-#RAVE='/lfs4/BMC/public/data/grids/nesdis/3km_fire_emissions'
 RAVE=ravedir
 intp_dir=newges_dir
-#intp_dir= os.path.join(newges_dir,"RAVE_INTP")
-#intp_dir= os.path.join(FIRE_RRFS_ROOT,"RAVE_INTP")
 
 os.chdir(intp_dir)
 sorted_obj = sorted(os.listdir(intp_dir))

diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
@@ -305,7 +305,6 @@ EXPT_SUBDIR=""
 #
 # Setup default locations for FIRE_RRFS files and update time
 #  FIRE_RAVE_DIR
-#  FIRE_RRFS_ROOT
 #  FIRE_RRFS_update_hour
 #-----------------------------------------------------------------------
 #
@@ -344,7 +343,6 @@ SNOWICE_update_hour=99
 RAPHRR_SOIL_ROOT="/mnt/lfs4/BMC/rtwbl/mhu/wcoss/nco/com"
 SOIL_SURGERY_time=9999999999
 FIRE_RAVE_DIR="/lfs4/BMC/public/data/grids/nesdis/3km_fire_emissions"
-FIRE_RRFS_ROOT="/mnt/lfs4/BMC/gsd-fv3-dev/FIRE_RRFS_ROOT"
 FIRE_RRFS_update_hour=99
 
 #

diff --git a/ush/set_rrfs_config.sh b/ush/set_rrfs_config.sh
@@ -5,7 +5,6 @@ AIRCRAFT_REJECT="/home/amb-verif/acars_RR/amdar_reject_lists"
 SFCOBS_USELIST="/lfs4/BMC/amb-verif/rap_ops_mesonet_uselists"
 SST_ROOT="/lfs4/BMC/public/data/grids/ncep/sst/0p083deg/grib2"
 GVF_ROOT="/public/data/sat/ncep/viirs/gvf/grib2"
-FIRE_RRFS_ROOT="/mnt/lfs4/BMC/gsd-fv3-dev/FIRE_RRFS_ROOT"
 
 BERROR_FN="rrfs_glb_berror.l127y194.f77"
 

diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml
@@ -117,7 +117,7 @@ FV3_HRRR:
     wetdep_ls_opt : 1
     do_plumerise : true
     plumerisefire_frq : 60
-    dust_alpha : 0.01
+    dust_alpha : 0.05
     dust_gamma : 1.3
     wetdep_ls_alpha : 0.5