Remove FIX* variables from configs

- Delete the block that sets the various FIX* variables for the fix subfolders. - Replace FIX* variables with their relevant ${FIXgfs}/type subfolder paths. Refs NOAA-EMC#2184
KateFriedman-NOAA · Feb 15, 2024 · 9670caa · 9670caa
1 parent 39fe579
commit 9670caa
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 51 deletions.
diff --git a/parm/config/gefs/config.base.emc.dyn b/parm/config/gefs/config.base.emc.dyn
@@ -30,16 +30,6 @@ export UTILgfs=${HOMEgfs}/util
 export EXECgfs=${HOMEgfs}/exec
 export SCRgfs=${HOMEgfs}/scripts
 
-export FIXam="${FIXgfs}/am"
-export FIXaer="${FIXgfs}/aer"
-export FIXcpl="${FIXgfs}/cpl"
-export FIXlut="${FIXgfs}/lut"
-export FIXorog="${FIXgfs}/orog"
-export FIXcice="${FIXgfs}/cice"
-export FIXmom="${FIXgfs}/mom6"
-export FIXreg2grb2="${FIXgfs}/reg2grb2"
-export FIXugwd="${FIXgfs}/ugwd"
-
 ########################################################################
 
 # GLOBAL static environment parameters

diff --git a/parm/config/gefs/config.wave b/parm/config/gefs/config.wave
@@ -11,7 +11,6 @@ echo "BEGIN: config.wave"
 export wave_sys_ver=v1.0.0
 
 export EXECwave="${HOMEgfs}/exec"
-export FIXwave="${HOMEgfs}/fix/wave"
 export PARMwave="${HOMEgfs}/parm/wave"
 export USHwave="${HOMEgfs}/ush"
 

diff --git a/parm/config/gfs/config.aeroanl b/parm/config/gfs/config.aeroanl
@@ -10,8 +10,7 @@ export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/aero/obs/config/
 export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/aero/obs/lists/gdas_aero_prototype.yaml
 export STATICB_TYPE='identity'
 export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/aero/berror/staticb_${STATICB_TYPE}.yaml
-export FIXgdas=${HOMEgfs}/fix/gdas
-export BERROR_DATA_DIR=${FIXgdas}/bump/aero/${CASE_ANL}/
+export BERROR_DATA_DIR=${FIXgfs}/gdas/bump/aero/${CASE_ANL}/
 export BERROR_DATE="20160630.000000"
 
 export io_layout_x=@IO_LAYOUT_X@

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
@@ -45,51 +45,51 @@ export AMSR2BF=${AMSR2BF:-/dev/null}
 
 # Set default values for info files and observation error
 #  NOTE:  Remember to set PRVT in config.prep as OBERROR is set below
-export CONVINFO=${FIXgsi}/global_convinfo.txt
-export OZINFO=${FIXgsi}/global_ozinfo.txt
-export SATINFO=${FIXgsi}/global_satinfo.txt
-export OBERROR=${FIXgsi}/prepobs_errtable.global
+export CONVINFO=${FIXgfs}/gsi/global_convinfo.txt
+export OZINFO=${FIXgfs}/gsi/global_ozinfo.txt
+export SATINFO=${FIXgfs}/gsi/global_satinfo.txt
+export OBERROR=${FIXgfs}/gsi/prepobs_errtable.global
 
 
 # Use experimental dumps in EMC GFS v16 parallels
 if [[ ${RUN_ENVIR} == "emc" ]]; then
   #   Set info files and prepobs.errtable.global for GFS v16 retrospective parallels
   if [[ "${PDY}${cyc}" -ge "2019021900" && "${PDY}${cyc}" -lt "2019110706" ]]; then
-    export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2019021900
-    export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2019021900
+    export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2019021900
+    export OBERROR=${FIXgfs}/gsi/gfsv16_historical/prepobs_errtable.global.2019021900
   fi
 
   #   Place GOES-15 AMVs in monitor, assimilate GOES-17 AMVs, assimilate KOMPSAT-5 gps
   if [[ "${PDY}${cyc}" -ge "2019110706" && "${PDY}${cyc}" -lt "2020040718" ]]; then
-    export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2019110706
-    export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2019110706
+    export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2019110706
+    export OBERROR=${FIXgfs}/gsi/gfsv16_historical/prepobs_errtable.global.2019110706
   fi
 
   #   Assimilate 135 (T) & 235 (uv) Canadian AMDAR observations
   if [[ "${PDY}${cyc}" -ge "2020040718" && "${PDY}${cyc}" -lt "2020052612" ]]; then
-    export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020040718
-    export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2020040718
+    export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2020040718
+    export OBERROR=${FIXgfs}/gsi/gfsv16_historical/prepobs_errtable.global.2020040718
   fi
 
   #   Assimilate COSMIC-2
   if [[ "${PDY}${cyc}" -ge "2020052612" && "${PDY}${cyc}" -lt "2020082412" ]]; then
-    export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020052612
-    export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2020040718
+    export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2020052612
+    export OBERROR=${FIXgfs}/gsi/gfsv16_historical/prepobs_errtable.global.2020040718
   fi
 
   #   Assimilate HDOB
   if [[ "${PDY}${cyc}" -ge "2020082412" && "${PDY}${cyc}" -lt "2020091612" ]]; then
-    export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020082412
+    export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2020082412
   fi
 
   #   Assimilate Metop-C GNSSRO
   if [[ "${PDY}${cyc}" -ge "2020091612" && "${PDY}${cyc}" -lt "2021031712" ]]; then
-    export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020091612
+    export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2020091612
   fi
 
   #   Assimilate DO-2 GeoOptics
   if [[ "${PDY}${cyc}" -ge "2021031712" && "${PDY}${cyc}" -lt "2021091612" ]]; then
-    export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2021031712
+    export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2021031712
   fi
 
   #   NOTE:
@@ -98,38 +98,38 @@ if [[ ${RUN_ENVIR} == "emc" ]]; then
   #   needed at this time.
   #   Assimilate COSMIC-2 GPS
   #   if [[ "${PDY}${cyc}" -ge "2021110312" && "${PDY}${cyc}" -lt "YYYYMMDDHH" ]]; then
-  #   export CONVINFO=$FIXgsi/gfsv16_historical/global_convinfo.txt.2021110312
+  #   export CONVINFO=${FIXgfs}/gsi/gfsv16_historical/global_convinfo.txt.2021110312
   #   fi
 
   #   Turn off assmilation of OMPS during period of bad data
   if [[ "${PDY}${cyc}" -ge "2020011600" && "${PDY}${cyc}" -lt "2020011806" ]]; then
-    export OZINFO=${FIXgsi}/gfsv16_historical/global_ozinfo.txt.2020011600
+    export OZINFO=${FIXgfs}/gsi/gfsv16_historical/global_ozinfo.txt.2020011600
   fi
 
 
   #   Set satinfo for start of GFS v16 parallels
   if [[ "${PDY}${cyc}" -ge "2019021900" && "${PDY}${cyc}" -lt "2019110706" ]]; then
-    export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2019021900
+    export SATINFO=${FIXgfs}/gsi/gfsv16_historical/global_satinfo.txt.2019021900
   fi
 
   #   Turn on assimilation of Metop-C AMSUA and MHS
   if [[ "${PDY}${cyc}" -ge "2019110706" && "${PDY}${cyc}" -lt "2020022012" ]]; then
-    export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2019110706
+    export SATINFO=${FIXgfs}/gsi/gfsv16_historical/global_satinfo.txt.2019110706
   fi
 
   #   Turn off assimilation of Metop-A MHS
   if [[ "${PDY}${cyc}" -ge "2020022012" && "${PDY}${cyc}" -lt "2021052118" ]]; then
-    export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2020022012
+    export SATINFO=${FIXgfs}/gsi/gfsv16_historical/global_satinfo.txt.2020022012
   fi
 
   #   Turn off assimilation of S-NPP CrIS
   if [[ "${PDY}${cyc}" -ge "2021052118" && "${PDY}${cyc}" -lt "2021092206" ]]; then
-    export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2021052118
+    export SATINFO=${FIXgfs}/gsi/gfsv16_historical/global_satinfo.txt.2021052118
   fi
 
   #   Turn off assimilation of MetOp-A IASI
   if [[ "${PDY}${cyc}" -ge "2021092206" && "${PDY}${cyc}" -lt "2021102612" ]]; then
-    export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2021092206
+    export SATINFO=${FIXgfs}/gsi/gfsv16_historical/global_satinfo.txt.2021092206
   fi
 
   #   NOTE:
@@ -139,7 +139,7 @@ if [[ ${RUN_ENVIR} == "emc" ]]; then
   #
   #   Turn off assmilation of all Metop-A MHS
   #   if [[ "${PDY}${cyc}" -ge "2021110312" && "${PDY}${cyc}" -lt "YYYYMMDDHH" ]]; then
-  #     export SATINFO=$FIXgsi/gfsv16_historical/global_satinfo.txt.2021110312
+  #     export SATINFO=${FIXgfs}/gsi/gfsv16_historical/global_satinfo.txt.2021110312
   #   fi
 fi
 

diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
@@ -30,16 +30,6 @@ export UTILgfs="${HOMEgfs}/util"
 export EXECgfs="${HOMEgfs}/exec"
 export SCRgfs="${HOMEgfs}/scripts"
 
-export FIXam="${FIXgfs}/am"
-export FIXaer="${FIXgfs}/aer"
-export FIXcpl="${FIXgfs}/cpl"
-export FIXlut="${FIXgfs}/lut"
-export FIXorog="${FIXgfs}/orog"
-export FIXcice="${FIXgfs}/cice"
-export FIXmom="${FIXgfs}/mom6"
-export FIXreg2grb2="${FIXgfs}/reg2grb2"
-export FIXugwd="${FIXgfs}/ugwd"
-
 ########################################################################
 
 # GLOBAL static environment parameters

diff --git a/parm/config/gfs/config.prep b/parm/config/gfs/config.prep
@@ -20,26 +20,25 @@ export COMINsyn=${COMINsyn:-$(compath.py ${envir}/com/gfs/${gfs_ver})/syndat}
 
 export HOMERELO=$HOMEgfs
 export EXECRELO=${HOMERELO}/exec
-export FIXRELO=${HOMERELO}/fix/am
 export USHRELO=${HOMERELO}/ush
 
 # Adjust observation error for GFS v16 parallels
 #
 #   NOTE:  Remember to set OBERROR in config.anal as PRVT is set below
 #
 # Set default prepobs_errtable.global
-export PRVT=$FIXgsi/prepobs_errtable.global
+export PRVT=${FIXgfs}/gsi/prepobs_errtable.global
 
 
 # Set prepobs.errtable.global for GFS v16 retrospective parallels
 if [[ $RUN_ENVIR == "emc" ]]; then
   if [[ "${PDY}${cyc}" -ge "2019021900" && "${PDY}${cyc}" -lt "2019110706" ]]; then
-    export PRVT=$FIXgsi/gfsv16_historical/prepobs_errtable.global.2019021900
+    export PRVT=${FIXgfs}/gsi/gfsv16_historical/prepobs_errtable.global.2019021900
   fi
 
 #   Place GOES-15 AMVs in monitor, assimilate GOES-17 AMVs, assimilate KOMPSAT-5 gps
   if [[ "${PDY}${cyc}" -ge "2019110706" && "${PDY}${cyc}" -lt "2020040718" ]]; then
-    export PRVT=$FIXgsi/gfsv16_historical/prepobs_errtable.global.2019110706
+    export PRVT=${FIXgfs}/gsi/gfsv16_historical/prepobs_errtable.global.2019110706
   fi
 
 #   NOTE:

diff --git a/parm/config/gfs/config.wave b/parm/config/gfs/config.wave
@@ -11,7 +11,6 @@ echo "BEGIN: config.wave"
 export wave_sys_ver=v1.0.0
 
 export EXECwave="${HOMEgfs}/exec"
-export FIXwave="${HOMEgfs}/fix/wave"
 export PARMwave="${HOMEgfs}/parm/wave"
 export USHwave="${HOMEgfs}/ush"