Orog fix file reorg and fix directory variable standardization

jobs/JGLOBAL_WAVE_INIT

@@ -10,7 +10,7 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
+export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

jobs/JGLOBAL_WAVE_POST_BNDPNT

@@ -9,7 +9,7 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
+export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

jobs/JGLOBAL_WAVE_POST_BNDPNTBLL

@@ -13,7 +13,7 @@ export CDATE=${PDY}${cyc}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
+export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

jobs/JGLOBAL_WAVE_POST_PNT

@@ -9,7 +9,7 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
+export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

jobs/JGLOBAL_WAVE_POST_SBS

@@ -9,7 +9,7 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
+export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

jobs/JGLOBAL_WAVE_PREP

@@ -17,7 +17,7 @@ export MP_PULSE=0
 export CDO=${CDO_ROOT}/bin/cdo
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
+export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

parm/config/gefs/config.base.emc.dyn

@@ -30,9 +30,15 @@ export UTILgfs=${HOMEgfs}/util
 export EXECgfs=${HOMEgfs}/exec
 export SCRgfs=${HOMEgfs}/scripts
 
-export FIXcice=${HOMEgfs}/fix/cice
-export FIXmom=${HOMEgfs}/fix/mom6
-export FIXreg2grb2=${HOMEgfs}/fix/reg2grb2
+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"
 
 ########################################################################
 

parm/config/gfs/config.aeroanl

@@ -10,8 +10,8 @@ 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 FV3JEDI_FIX=${HOMEgfs}/fix/gdas
-export BERROR_DATA_DIR=${FV3JEDI_FIX}/bump/aero/${CASE_ANL}/
+export FIXgdas=${HOMEgfs}/fix/gdas
+export BERROR_DATA_DIR=${FIXgdas}/bump/aero/${CASE_ANL}/
 export BERROR_DATE="20160630.000000"
 
 export io_layout_x=@IO_LAYOUT_X@

parm/config/gfs/config.base.emc.dyn

@@ -23,16 +23,22 @@ export HPSS_PROJECT="@HPSS_PROJECT@"
 
 # Directories relative to installation areas:
 export HOMEgfs=@HOMEgfs@
-export PARMgfs=${HOMEgfs}/parm
-export FIXgfs=${HOMEgfs}/fix
-export USHgfs=${HOMEgfs}/ush
-export UTILgfs=${HOMEgfs}/util
-export EXECgfs=${HOMEgfs}/exec
-export SCRgfs=${HOMEgfs}/scripts
-
-export FIXcice=${HOMEgfs}/fix/cice
-export FIXmom=${HOMEgfs}/fix/mom6
-export FIXreg2grb2=${HOMEgfs}/fix/reg2grb2
+export PARMgfs="${HOMEgfs}/parm"
+export FIXgfs="${HOMEgfs}/fix"
+export USHgfs="${HOMEgfs}/ush"
+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"
 
 ########################################################################
 

parm/gdas/aero_jedi_fix.yaml

@@ -1,11 +1,11 @@
 mkdir:
 - !ENV ${DATA}/fv3jedi
 copy:
-- - !ENV ${FV3JEDI_FIX}/fv3jedi/fv3files/akbk$(npz).nc4
+- - !ENV ${FIXgdas}/fv3jedi/fv3files/akbk$(npz).nc4
   - !ENV ${DATA}/fv3jedi/akbk.nc4
-- - !ENV ${FV3JEDI_FIX}/fv3jedi/fv3files/fmsmpp.nml
+- - !ENV ${FIXgdas}/fv3jedi/fv3files/fmsmpp.nml
   - !ENV ${DATA}/fv3jedi/fmsmpp.nml
-- - !ENV ${FV3JEDI_FIX}/fv3jedi/fv3files/field_table_gfdl
+- - !ENV ${FIXgdas}/fv3jedi/fv3files/field_table_gfdl
   - !ENV ${DATA}/fv3jedi/field_table
 - - !ENV $(HOMEgfs)/sorc/gdas.cd/parm/io/fv3jedi_fieldmetadata_restart.yaml
   - !ENV ${DATA}/fv3jedi/fv3jedi_fieldmetadata_restart.yaml

parm/ufs/fix/gfs/atmos.fixed_files.yaml

@@ -1,85 +1,85 @@
 copy:
   # Atmosphere mosaic file linked as the grid_spec file (atm only)
-  - [$(FIX_orog)/$(atm_res)/$(atm_res)_mosaic.nc, $(DATA)/INPUT/grid_spec.nc]
+  - [$(FIXorog)/$(CASE)/$(CASE)_mosaic.nc, $(DATA)/INPUT/grid_spec.nc]
 
   # Atmosphere grid tile files
-  - [$(FIX_orog)/$(atm_res)/$(atm_res)_grid.tile1.nc, $(DATA)/INPUT/]
-  - [$(FIX_orog)/$(atm_res)/$(atm_res)_grid.tile2.nc, $(DATA)/INPUT/]
-  - [$(FIX_orog)/$(atm_res)/$(atm_res)_grid.tile3.nc, $(DATA)/INPUT/]
-  - [$(FIX_orog)/$(atm_res)/$(atm_res)_grid.tile4.nc, $(DATA)/INPUT/]
-  - [$(FIX_orog)/$(atm_res)/$(atm_res)_grid.tile5.nc, $(DATA)/INPUT/]
-  - [$(FIX_orog)/$(atm_res)/$(atm_res)_grid.tile6.nc, $(DATA)/INPUT/]
+  - [$(FIXorog)/$(CASE)/$(CASE)_grid.tile1.nc, $(DATA)/INPUT/]
+  - [$(FIXorog)/$(CASE)/$(CASE)_grid.tile2.nc, $(DATA)/INPUT/]
+  - [$(FIXorog)/$(CASE)/$(CASE)_grid.tile3.nc, $(DATA)/INPUT/]
+  - [$(FIXorog)/$(CASE)/$(CASE)_grid.tile4.nc, $(DATA)/INPUT/]
+  - [$(FIXorog)/$(CASE)/$(CASE)_grid.tile5.nc, $(DATA)/INPUT/]
+  - [$(FIXorog)/$(CASE)/$(CASE)_grid.tile6.nc, $(DATA)/INPUT/]
 
-  # oro_data_ls and oro_data_ss files from FIX_ugwd
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ls.tile1.nc, $(DATA)/INPUT/oro_data_ls.tile1.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ls.tile2.nc, $(DATA)/INPUT/oro_data_ls.tile2.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ls.tile3.nc, $(DATA)/INPUT/oro_data_ls.tile3.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ls.tile4.nc, $(DATA)/INPUT/oro_data_ls.tile4.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ls.tile5.nc, $(DATA)/INPUT/oro_data_ls.tile5.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ls.tile6.nc, $(DATA)/INPUT/oro_data_ls.tile6.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ss.tile1.nc, $(DATA)/INPUT/oro_data_ss.tile1.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ss.tile2.nc, $(DATA)/INPUT/oro_data_ss.tile2.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ss.tile3.nc, $(DATA)/INPUT/oro_data_ss.tile3.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ss.tile4.nc, $(DATA)/INPUT/oro_data_ss.tile4.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ss.tile5.nc, $(DATA)/INPUT/oro_data_ss.tile5.nc]
-  - [$(FIX_ugwd)/$(atm_res)/$(atm_res)_oro_data_ss.tile6.nc, $(DATA)/INPUT/oro_data_ss.tile6.nc]
+  # oro_data_ls and oro_data_ss files from FIXugwd
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ls.tile1.nc, $(DATA)/INPUT/oro_data_ls.tile1.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ls.tile2.nc, $(DATA)/INPUT/oro_data_ls.tile2.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ls.tile3.nc, $(DATA)/INPUT/oro_data_ls.tile3.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ls.tile4.nc, $(DATA)/INPUT/oro_data_ls.tile4.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ls.tile5.nc, $(DATA)/INPUT/oro_data_ls.tile5.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ls.tile6.nc, $(DATA)/INPUT/oro_data_ls.tile6.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ss.tile1.nc, $(DATA)/INPUT/oro_data_ss.tile1.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ss.tile2.nc, $(DATA)/INPUT/oro_data_ss.tile2.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ss.tile3.nc, $(DATA)/INPUT/oro_data_ss.tile3.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ss.tile4.nc, $(DATA)/INPUT/oro_data_ss.tile4.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ss.tile5.nc, $(DATA)/INPUT/oro_data_ss.tile5.nc]
+  - [$(FIXugwd)/$(CASE)/$(CASE)_oro_data_ss.tile6.nc, $(DATA)/INPUT/oro_data_ss.tile6.nc]
 
   # GWD??
-  - [$(FIX_ugwd)/ugwp_limb_tau.nc, $(DATA)/ugwp_limb_tau.nc]
+  - [$(FIXugwd)/ugwp_limb_tau.nc, $(DATA)/ugwp_limb_tau.nc]
 
   # CO2 climatology
-  - [$(FIX_am)/co2monthlycyc.txt,                              $(DATA)/co2monthlycyc.txt]
-  - [$(FIX_am)/global_co2historicaldata_glob.txt,              $(DATA)/co2historicaldata_glob.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2009.txt, $(DATA)/co2historicaldata_2009.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2010.txt, $(DATA)/co2historicaldata_2010.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2011.txt, $(DATA)/co2historicaldata_2011.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2012.txt, $(DATA)/co2historicaldata_2012.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2013.txt, $(DATA)/co2historicaldata_2013.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2014.txt, $(DATA)/co2historicaldata_2014.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2015.txt, $(DATA)/co2historicaldata_2015.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2016.txt, $(DATA)/co2historicaldata_2016.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2017.txt, $(DATA)/co2historicaldata_2017.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2018.txt, $(DATA)/co2historicaldata_2018.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2019.txt, $(DATA)/co2historicaldata_2019.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2020.txt, $(DATA)/co2historicaldata_2020.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2021.txt, $(DATA)/co2historicaldata_2021.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2022.txt, $(DATA)/co2historicaldata_2022.txt]
-  - [$(FIX_am)/fix_co2_proj/global_co2historicaldata_2023.txt, $(DATA)/co2historicaldata_2023.txt]
+  - [$(FIXam)/co2monthlycyc.txt,                              $(DATA)/co2monthlycyc.txt]
+  - [$(FIXam)/global_co2historicaldata_glob.txt,              $(DATA)/co2historicaldata_glob.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2009.txt, $(DATA)/co2historicaldata_2009.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2010.txt, $(DATA)/co2historicaldata_2010.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2011.txt, $(DATA)/co2historicaldata_2011.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2012.txt, $(DATA)/co2historicaldata_2012.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2013.txt, $(DATA)/co2historicaldata_2013.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2014.txt, $(DATA)/co2historicaldata_2014.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2015.txt, $(DATA)/co2historicaldata_2015.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2016.txt, $(DATA)/co2historicaldata_2016.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2017.txt, $(DATA)/co2historicaldata_2017.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2018.txt, $(DATA)/co2historicaldata_2018.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2019.txt, $(DATA)/co2historicaldata_2019.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2020.txt, $(DATA)/co2historicaldata_2020.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2021.txt, $(DATA)/co2historicaldata_2021.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2022.txt, $(DATA)/co2historicaldata_2022.txt]
+  - [$(FIXam)/fix_co2_proj/global_co2historicaldata_2023.txt, $(DATA)/co2historicaldata_2023.txt]
 
-  # FIX_am files
-  - [$(FIX_am)/global_climaeropac_global.txt,                 $(DATA)/aerosol.dat]
-  - [$(FIX_am)/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77,    $(DATA)/global_o3prdlos.f77]
-  - [$(FIX_am)/global_h2o_pltc.f77,                           $(DATA)/global_h2oprdlos.f77]
-  - [$(FIX_am)/global_glacier.2x2.grb,                        $(DATA)/global_glacier.2x2.grb]
-  - [$(FIX_am)/global_maxice.2x2.grb,                         $(DATA)/global_maxice.2x2.grb]
-  - [$(FIX_am)/global_snoclim.1.875.grb,                      $(DATA)/global_snoclim.1.875.grb]
-  - [$(FIX_am)/global_slmask.t1534.3072.1536.grb,             $(DATA)/global_slmask.t1534.3072.1536.grb]
-  - [$(FIX_am)/global_soilmgldas.statsgo.t1534.3072.1536.grb, $(DATA)/global_soilmgldas.statsgo.t1534.3072.1536.grb]
-  - [$(FIX_am)/global_solarconstant_noaa_an.txt,              $(DATA)/solarconstant_noaa_an.txt]
-  - [$(FIX_am)/global_sfc_emissivity_idx.txt,                 $(DATA)/sfc_emissivity_idx.txt]
-  - [$(FIX_am)/RTGSST.1982.2012.monthly.clim.grb,             $(DATA)/RTGSST.1982.2012.monthly.clim.grb]
-  - [$(FIX_am)/IMS-NIC.blended.ice.monthly.clim.grb,          $(DATA)/IMS-NIC.blended.ice.monthly.clim.grb]
+  # FIXam files
+  - [$(FIXam)/global_climaeropac_global.txt,                 $(DATA)/aerosol.dat]
+  - [$(FIXam)/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77,    $(DATA)/global_o3prdlos.f77]
+  - [$(FIXam)/global_h2o_pltc.f77,                           $(DATA)/global_h2oprdlos.f77]
+  - [$(FIXam)/global_glacier.2x2.grb,                        $(DATA)/global_glacier.2x2.grb]
+  - [$(FIXam)/global_maxice.2x2.grb,                         $(DATA)/global_maxice.2x2.grb]
+  - [$(FIXam)/global_snoclim.1.875.grb,                      $(DATA)/global_snoclim.1.875.grb]
+  - [$(FIXam)/global_slmask.t1534.3072.1536.grb,             $(DATA)/global_slmask.t1534.3072.1536.grb]
+  - [$(FIXam)/global_soilmgldas.statsgo.t1534.3072.1536.grb, $(DATA)/global_soilmgldas.statsgo.t1534.3072.1536.grb]
+  - [$(FIXam)/global_solarconstant_noaa_an.txt,              $(DATA)/solarconstant_noaa_an.txt]
+  - [$(FIXam)/global_sfc_emissivity_idx.txt,                 $(DATA)/sfc_emissivity_idx.txt]
+  - [$(FIXam)/RTGSST.1982.2012.monthly.clim.grb,             $(DATA)/RTGSST.1982.2012.monthly.clim.grb]
+  - [$(FIXam)/IMS-NIC.blended.ice.monthly.clim.grb,          $(DATA)/IMS-NIC.blended.ice.monthly.clim.grb]
 
   # MERRA2 Aerosol Climatology
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m01.nc, $(DATA)/aeroclim.m01.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m02.nc, $(DATA)/aeroclim.m02.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m03.nc, $(DATA)/aeroclim.m03.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m04.nc, $(DATA)/aeroclim.m04.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m05.nc, $(DATA)/aeroclim.m05.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m06.nc, $(DATA)/aeroclim.m06.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m07.nc, $(DATA)/aeroclim.m07.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m08.nc, $(DATA)/aeroclim.m08.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m09.nc, $(DATA)/aeroclim.m09.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m10.nc, $(DATA)/aeroclim.m10.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m11.nc, $(DATA)/aeroclim.m11.nc]
-  - [$(FIX_aer)/merra2.aerclim.2003-2014.m12.nc, $(DATA)/aeroclim.m12.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m01.nc, $(DATA)/aeroclim.m01.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m02.nc, $(DATA)/aeroclim.m02.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m03.nc, $(DATA)/aeroclim.m03.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m04.nc, $(DATA)/aeroclim.m04.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m05.nc, $(DATA)/aeroclim.m05.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m06.nc, $(DATA)/aeroclim.m06.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m07.nc, $(DATA)/aeroclim.m07.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m08.nc, $(DATA)/aeroclim.m08.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m09.nc, $(DATA)/aeroclim.m09.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m10.nc, $(DATA)/aeroclim.m10.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m11.nc, $(DATA)/aeroclim.m11.nc]
+  - [$(FIXaer)/merra2.aerclim.2003-2014.m12.nc, $(DATA)/aeroclim.m12.nc]
 
   # Optical depth
-  - [$(FIX_lut)/optics_BC.v1_3.dat,  $(DATA)/optics_BC.dat]
-  - [$(FIX_lut)/optics_DU.v15_3.dat, $(DATA)/optics_DU.dat]
-  - [$(FIX_lut)/optics_OC.v1_3.dat,  $(DATA)/optics_OC.dat]
-  - [$(FIX_lut)/optics_SS.v3_3.dat,  $(DATA)/optics_SS.dat]
-  - [$(FIX_lut)/optics_SU.v1_3.dat,  $(DATA)/optics_SU.dat]
+  - [$(FIXlut)/optics_BC.v1_3.dat,  $(DATA)/optics_BC.dat]
+  - [$(FIXlut)/optics_DU.v15_3.dat, $(DATA)/optics_DU.dat]
+  - [$(FIXlut)/optics_OC.v1_3.dat,  $(DATA)/optics_OC.dat]
+  - [$(FIXlut)/optics_SS.v3_3.dat,  $(DATA)/optics_SS.dat]
+  - [$(FIXlut)/optics_SU.v1_3.dat,  $(DATA)/optics_SU.dat]
 
   # fd_ufs.yaml file
   - [$(HOMEgfs)/sorc/ufs_model.fd/tests/parm/fd_ufs.yaml, $(DATA)/]