From 087cf50eccf64b85e7a309ea1f8be27001872616 Mon Sep 17 00:00:00 2001 From: "Kate.Zhang" Date: Fri, 3 May 2024 19:06:16 +0000 Subject: [PATCH 1/6] Update to GBBPEx v005 --- jobs/rocoto/prepchem.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jobs/rocoto/prepchem.sh b/jobs/rocoto/prepchem.sh index 762e4a4284..ef16e07d4f 100755 --- a/jobs/rocoto/prepchem.sh +++ b/jobs/rocoto/prepchem.sh @@ -109,12 +109,18 @@ for n in $(seq 1 6); do else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [ ${emiss_date1} -ge 20230509 ]; then ## JKH - change date + if [ [ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ] ]; then ## JKH - change date BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin + elif [ ${emiss_date1} -ge 20230509 ]; then + BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin + OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin + SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin + FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v5r0_${emiss_date1}.bin + PM25=GBBEPxemis-PM25-${CASE}GT${n}_v5r0_${emiss_date1}.bin else BC=GBBEPx.emis_BC.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin OC=GBBEPx.emis_OC.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin From 4530c461198ae3a08baefb9325aae405676a4a4b Mon Sep 17 00:00:00 2001 From: "Kate.Zhang" Date: Fri, 3 May 2024 21:51:27 +0000 Subject: [PATCH 2/6] Update jobs/rocoto/prepchem.sh --- jobs/rocoto/prepchem.sh | 46 ++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/jobs/rocoto/prepchem.sh b/jobs/rocoto/prepchem.sh index ef16e07d4f..1c38327ebf 100755 --- a/jobs/rocoto/prepchem.sh +++ b/jobs/rocoto/prepchem.sh @@ -109,7 +109,7 @@ for n in $(seq 1 6); do else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [ [ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ] ]; then ## JKH - change date + if [[ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ]]; then ## JKH - change date BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin @@ -192,19 +192,37 @@ EOF echo "NetCDF GBBEPx File $NCGB/${SYEAR}${nmonth}${nday}/FIRE_GBBEPx_data.tile${n}.nc exists, just link." else - #if [ ${SYEAR} -eq 2016 ]; then - BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${SYEAR}${nmonth}${nday}.bin - OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${SYEAR}${nmonth}${nday}.bin - PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${SYEAR}${nmonth}${nday}.bin - SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${SYEAR}${nmonth}${nday}.bin - FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${SYEAR}${nmonth}${nday}.bin - #else - # BC=GBBEPx.bc.${SYEAR}${nmonth}${nday}.FV3.${CASE}Grid.tile${n}.bin - # OC=GBBEPx.oc.${SYEAR}${nmonth}${nday}.FV3.${CASE}Grid.tile${n}.bin - # PM25=GBBEPx.pm25.${SYEAR}${nmonth}${nday}.FV3.${CASE}Grid.tile${n}.bin - # SO2=GBBEPx.so2.${SYEAR}${nmonth}${nday}.FV3.${CASE}Grid.tile${n}.bin - # FRP=meanFRP.${SYEAR}${nmonth}${nday}.FV3.${CASE}Grid.tile${n}.bin - #fi + if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date + if [[ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ]]; then ## JKH - change date + BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin + OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin + SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin + FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin + PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin + elif [ ${emiss_date1} -ge 20230509 ]; then + BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin + OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin + SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin + FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v5r0_${emiss_date1}.bin + PM25=GBBEPxemis-PM25-${CASE}GT${n}_v5r0_${emiss_date1}.bin + else + BC=GBBEPx.emis_BC.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + OC=GBBEPx.emis_OC.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + SO2=GBBEPx.emis_SO2.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + FRP=GBBEPx.FRP.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + if [ ${SYEAR} -eq 2016 ]; then + PM25=GBBEPx.emis_PM25.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + else + PM25=GBBEPx.emis_PM2.5.003.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + fi + fi + else + BC=GBBEPx.bc.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + OC=GBBEPx.oc.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + PM25=GBBEPx.pm25.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + SO2=GBBEPx.so2.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + FRP=meanFRP.${emiss_date1}.FV3.${CASE}Grid.tile${n}.bin + fi mkdir -p $NCGB/${SYEAR}${nmonth}${nday} set -ue From 9162b2a32d96579fa0ad31879a765dfff898c509 Mon Sep 17 00:00:00 2001 From: "Kate.Zhang" Date: Fri, 3 May 2024 22:06:08 +0000 Subject: [PATCH 3/6] Update jobs/rocoto/prepchem.sh --- jobs/rocoto/prepchem.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/rocoto/prepchem.sh b/jobs/rocoto/prepchem.sh index 1c38327ebf..c25a862f91 100755 --- a/jobs/rocoto/prepchem.sh +++ b/jobs/rocoto/prepchem.sh @@ -109,13 +109,13 @@ for n in $(seq 1 6); do else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [[ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ]]; then ## JKH - change date + if [[ "${emiss_date1} -ge 20230509" && "${emiss_date1} -le 20240501" ]]; BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin - elif [ ${emiss_date1} -ge 20230509 ]; then + elif [[ "${emiss_date1} -ge 20240502" ]]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin @@ -193,13 +193,13 @@ EOF else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [[ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ]]; then ## JKH - change date + if [[ "${emiss_date1} -ge 20230509" && "${emiss_date1} -le 20240501" ]]; then ## JKH - change date BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin - elif [ ${emiss_date1} -ge 20230509 ]; then + elif [[ "${emiss_date1} -ge 20240502" ]]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin From 6b03c4e68c0f4445ee099b4fcc6100d8f8498e25 Mon Sep 17 00:00:00 2001 From: "Kate.Zhang" Date: Fri, 3 May 2024 22:10:46 +0000 Subject: [PATCH 4/6] Update prepchem.sh --- jobs/rocoto/prepchem.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/rocoto/prepchem.sh b/jobs/rocoto/prepchem.sh index c25a862f91..a0571e339a 100755 --- a/jobs/rocoto/prepchem.sh +++ b/jobs/rocoto/prepchem.sh @@ -109,13 +109,13 @@ for n in $(seq 1 6); do else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [[ "${emiss_date1} -ge 20230509" && "${emiss_date1} -le 20240501" ]]; + if [[ ${emiss_date1} -ge 20230509 && ${emiss_date1} -le 20240501 ]]; BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin - elif [[ "${emiss_date1} -ge 20240502" ]]; then + elif [[ ${emiss_date1} -ge 20240502 ]]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin @@ -193,13 +193,13 @@ EOF else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [[ "${emiss_date1} -ge 20230509" && "${emiss_date1} -le 20240501" ]]; then ## JKH - change date + if [[ ${emiss_date1} -ge 20230509 && ${emiss_date1} -le 20240501 ]]; then ## JKH - change date BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin - elif [[ "${emiss_date1} -ge 20240502" ]]; then + elif [[ ${emiss_date1} -ge 20240502 ]]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin From 377d5ed8d731685306bd5ccca84b9d1fee9ec442 Mon Sep 17 00:00:00 2001 From: "Kate.Zhang" Date: Fri, 3 May 2024 22:15:29 +0000 Subject: [PATCH 5/6] Fix jobs/rocoto/prepchem.sh --- jobs/rocoto/prepchem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/rocoto/prepchem.sh b/jobs/rocoto/prepchem.sh index a0571e339a..fcaf21ad33 100755 --- a/jobs/rocoto/prepchem.sh +++ b/jobs/rocoto/prepchem.sh @@ -109,7 +109,7 @@ for n in $(seq 1 6); do else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [[ ${emiss_date1} -ge 20230509 && ${emiss_date1} -le 20240501 ]]; + if [[ ${emiss_date1} -ge 20230509 && ${emiss_date1} -le 20240501 ]]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin From f40f00a8b55add3f69805c749917d3e56df857f6 Mon Sep 17 00:00:00 2001 From: "Kate.Zhang" Date: Fri, 3 May 2024 22:19:58 +0000 Subject: [PATCH 6/6] Fix prepchem.sh --- jobs/rocoto/prepchem.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/rocoto/prepchem.sh b/jobs/rocoto/prepchem.sh index fcaf21ad33..f5865089e1 100755 --- a/jobs/rocoto/prepchem.sh +++ b/jobs/rocoto/prepchem.sh @@ -109,13 +109,13 @@ for n in $(seq 1 6); do else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [[ ${emiss_date1} -ge 20230509 && ${emiss_date1} -le 20240501 ]]; then + if [ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin - elif [[ ${emiss_date1} -ge 20240502 ]]; then + elif [ ${emiss_date1} -ge 20240502 ]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin @@ -193,13 +193,13 @@ EOF else if [ ${SYEAR} -eq 2016 -o ${emiss_date1} -ge 20230115 ]; then ## JKH - change date - if [[ ${emiss_date1} -ge 20230509 && ${emiss_date1} -le 20240501 ]]; then ## JKH - change date + if [ ${emiss_date1} -ge 20230509 ] && [ ${emiss_date1} -le 20240501 ]; then ## JKH - change date BC=GBBEPxemis-BC-${CASE}GT${n}_v4r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v4r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v4r0_${emiss_date1}.bin FRP=GBBEPxFRP-MeanFRP-${CASE}GT${n}_v4r0_${emiss_date1}.bin PM25=GBBEPxemis-PM25-${CASE}GT${n}_v4r0_${emiss_date1}.bin - elif [[ ${emiss_date1} -ge 20240502 ]]; then + elif [ ${emiss_date1} -ge 20240502 ]; then BC=GBBEPxemis-BC-${CASE}GT${n}_v5r0_${emiss_date1}.bin OC=GBBEPxemis-OC-${CASE}GT${n}_v5r0_${emiss_date1}.bin SO2=GBBEPxemis-SO2-${CASE}GT${n}_v5r0_${emiss_date1}.bin