replace chem with atmos, CRTM_VER with crtm_VERSION, update atmanl_in…

…c variables (NOAA-EMC#1313)
RussTreadon-NOAA · Mar 2, 2023 · 6ae4c3a · 6ae4c3a
1 parent 25f0694
commit 6ae4c3a
Show file tree

Hide file tree

Showing 15 changed files with 201 additions and 204 deletions.
diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE b/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE
@@ -31,8 +31,8 @@ export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}}
 mkdir -p "${COMOUT}"
 
 # COMIN_GES and COMIN_GES_ENS are used in script
-export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/chem"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/chem"
+export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
+export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/atmos"
 
 ###############################################################
 # Run relevant script

diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
@@ -25,7 +25,7 @@ export OPREFIX="${CDUMP_OBS}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/chem}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos}
 
 mkdir -p "${COMOUT}"
 

diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_RUN b/jobs/JGLOBAL_ATMENS_ANALYSIS_RUN
@@ -26,13 +26,13 @@ export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/chem}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos}
 
 mkdir -p "${COMOUT}"
 
 # COMIN_GES and COMIN_GES_ENS are used in script
-export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/chem"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/chem"
+export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
+export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/atmos"
 
 ###############################################################
 # Run relevant script

diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE b/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE
@@ -26,13 +26,13 @@ export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/chem}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos}
 
 mkdir -p "${COMOUT}"
 
 # COMIN_GES and COMIN_GES_ENS are used in script
-export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/chem"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/chem"
+export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
+export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/atmos"
 
 ###############################################################
 # Run relevant script

diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE
@@ -25,13 +25,13 @@ export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/chem}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos}
 
 mkdir -p "${COMOUT}"
 
 # COMIN_GES and COMIN_GES_ENS are used in script
-export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/chem"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/chem"
+export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
+export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/atmos"
 
 ###############################################################
 # Run relevant script

diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_RUN b/jobs/JGLOBAL_ATM_ANALYSIS_RUN
@@ -26,13 +26,13 @@ export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/chem}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos}
 
 mkdir -p "${COMOUT}"
 
 # COMIN_GES and COMIN_GES_ENS are used in script
-export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/chem"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/chem"
+export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
+export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/atmos"
 
 ###############################################################
 # Run relevant script

diff --git a/parm/config/config.aeroanl b/parm/config/config.aeroanl
@@ -19,6 +19,5 @@ export io_layout_x=@IO_LAYOUT_X@
 export io_layout_y=@IO_LAYOUT_Y@
 
 export JEDIVAREXE=${HOMEgfs}/exec/fv3jedi_var.x
-export CRTM_VER="2.3.0"
 
 echo "END: config.aeroanl"
diff --git a/parm/config/config.atmanl b/parm/config/config.atmanl
@@ -26,6 +26,5 @@ export io_layout_x=1
 export io_layout_y=1
 
 export JEDIVAREXE=${HOMEgfs}/exec/fv3jedi_var.x
-export CRTM_VER="2.3.0"
 
 echo "END: config.atmanl"
diff --git a/parm/config/config.atmanlinit b/parm/config/config.atmanlinit
@@ -6,5 +6,5 @@
 echo "BEGIN: config.atmanlinit"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources atmanlinit"
+. ${EXPDIR}/config.resources atmanlinit
 echo "END: config.atmanlinit"
diff --git a/parm/config/config.atmensanl b/parm/config/config.atmensanl
@@ -26,6 +26,5 @@ export io_layout_x=1
 export io_layout_y=1
 
 export JEDIVAREXE=${HOMEgfs}/exec/fv3jedi_var.x
-export CRTM_VER="2.3.0"
 
 echo "END: config.atmensanl"
diff --git a/parm/parm_gdas/aero_crtm_coeff.yaml b/parm/parm_gdas/aero_crtm_coeff.yaml
@@ -1,23 +1,23 @@
 mkdir:
 - !ENV ${DATA}/crtm/
 copy:
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/AerosolCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/AerosolCoeff.bin
   - !ENV ${DATA}/crtm/AerosolCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/CloudCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/CloudCoeff.bin
   - !ENV ${DATA}/crtm/CloudCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/v.viirs-m_npp.SpcCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/v.viirs-m_npp.SpcCoeff.bin
   - !ENV ${DATA}/crtm/v.viirs-m_npp.SpcCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/v.viirs-m_npp.TauCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/v.viirs-m_npp.TauCoeff.bin
   - !ENV ${DATA}/crtm/v.viirs-m_npp.TauCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/v.viirs-m_j1.SpcCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/v.viirs-m_j1.SpcCoeff.bin
   - !ENV ${DATA}/crtm/v.viirs-m_j1.SpcCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/v.viirs-m_j1.TauCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/v.viirs-m_j1.TauCoeff.bin
   - !ENV ${DATA}/crtm/v.viirs-m_j1.TauCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/NPOESS.VISice.EmisCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/NPOESS.VISice.EmisCoeff.bin
   - !ENV ${DATA}/crtm/NPOESS.VISice.EmisCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/NPOESS.VISland.EmisCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/NPOESS.VISland.EmisCoeff.bin
   - !ENV ${DATA}/crtm/NPOESS.VISland.EmisCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/NPOESS.VISsnow.EmisCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/NPOESS.VISsnow.EmisCoeff.bin
   - !ENV ${DATA}/crtm/NPOESS.VISsnow.EmisCoeff.bin
-- - !ENV ${FV3JEDI_FIX}/crtm/${CRTM_VER}/NPOESS.VISwater.EmisCoeff.bin
+- - !ENV ${FV3JEDI_FIX}/crtm/${crtm_VERSION}/NPOESS.VISwater.EmisCoeff.bin
   - !ENV ${DATA}/crtm/NPOESS.VISwater.EmisCoeff.bin