Skip to content

Commit

Permalink
Link both global-nest fix files and non-nest ones at the same time (#…
Browse files Browse the repository at this point in the history 
…2632)

This PR enables linking both global-nest fix files and non-nest ones at
the same time and users can run both nesting and non-nesting experiments
at the same time without worries about what fix files to be linked.

Resolves #2631
  • Loading branch information
@guoqing-noaa
guoqing-noaa authored Jun 12, 2024
1 parent 61de004 commit 2e6f1fc
Show file tree
Hide file tree
Showing 14 changed files with 134 additions and 121 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ fix/gsi
fix/lut
fix/mom6
fix/orog
fix/orog_nest
fix/sfc_climo
fix/ugwd
fix/ugwd_nest
fix/verif
fix/wave

Expand Down
2 changes: 2 additions & 0 deletions parm/config/gefs/config.base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export FIXgfs=${HOMEgfs}/fix
export PARMgfs=${HOMEgfs}/parm
export SCRgfs=${HOMEgfs}/scripts
export USHgfs=${HOMEgfs}/ush
export FIXorog=${FIXgfs}/orog
export FIXugwd=${FIXgfs}/ugwd

########################################################################

Expand Down
6 changes: 4 additions & 2 deletions parm/config/gfs/config.base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ 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"
export FIXgdas="${FIXgfs}/gdas"

########################################################################
Expand Down Expand Up @@ -190,8 +188,12 @@ export DO_NEST="NO" # Whether to run a global-nested domain
if [[ "${DO_NEST:-NO}" == "YES" ]] ; then
export ntiles=7
export NEST_OUTPUT_GRID="regional_latlon"
export FIXugwd="${FIXgfs}/ugwd_nest"
export FIXorog="${FIXgfs}/orog_nest"
else
export ntiles=6
export FIXugwd="${FIXgfs}/ugwd"
export FIXorog="${FIXgfs}/orog"
fi

# Set operational resolution
Expand Down
42 changes: 21 additions & 21 deletions parm/ufs/fix/gfs/atmos.fixed_files.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
copy:
# Atmosphere mosaic file linked as the grid_spec file (atm only)
- [$(FIXgfs)/orog/$(CASE)/$(CASE)_mosaic.nc, $(DATA)/INPUT/grid_spec.nc]
- [$(FIXorog)/$(CASE)/$(CASE)_mosaic.nc, $(DATA)/INPUT/grid_spec.nc]

# Atmosphere grid tile files
- [$(FIXgfs)/orog/$(CASE)/$(CASE)_grid.tile1.nc, $(DATA)/INPUT/]
- [$(FIXgfs)/orog/$(CASE)/$(CASE)_grid.tile2.nc, $(DATA)/INPUT/]
- [$(FIXgfs)/orog/$(CASE)/$(CASE)_grid.tile3.nc, $(DATA)/INPUT/]
- [$(FIXgfs)/orog/$(CASE)/$(CASE)_grid.tile4.nc, $(DATA)/INPUT/]
- [$(FIXgfs)/orog/$(CASE)/$(CASE)_grid.tile5.nc, $(DATA)/INPUT/]
- [$(FIXgfs)/orog/$(CASE)/$(CASE)_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 FIXgfs/ugwd
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ls.tile1.nc, $(DATA)/INPUT/oro_data_ls.tile1.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ls.tile2.nc, $(DATA)/INPUT/oro_data_ls.tile2.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ls.tile3.nc, $(DATA)/INPUT/oro_data_ls.tile3.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ls.tile4.nc, $(DATA)/INPUT/oro_data_ls.tile4.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ls.tile5.nc, $(DATA)/INPUT/oro_data_ls.tile5.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ls.tile6.nc, $(DATA)/INPUT/oro_data_ls.tile6.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ss.tile1.nc, $(DATA)/INPUT/oro_data_ss.tile1.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ss.tile2.nc, $(DATA)/INPUT/oro_data_ss.tile2.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ss.tile3.nc, $(DATA)/INPUT/oro_data_ss.tile3.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ss.tile4.nc, $(DATA)/INPUT/oro_data_ss.tile4.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_oro_data_ss.tile5.nc, $(DATA)/INPUT/oro_data_ss.tile5.nc]
- [$(FIXgfs)/ugwd/$(CASE)/$(CASE)_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??
- [$(FIXgfs)/ugwd/ugwp_limb_tau.nc, $(DATA)/ugwp_limb_tau.nc]
- [$(FIXugwd)/ugwp_limb_tau.nc, $(DATA)/ugwp_limb_tau.nc]

# CO2 climatology
- [$(FIXgfs)/am/co2monthlycyc.txt, $(DATA)/co2monthlycyc.txt]
Expand Down
98 changes: 49 additions & 49 deletions parm/ufs/fix/gfs/land.fixed_files.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
copy:

# Files from FIXgfs/orog/C??/sfc
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile6.nc, $(DATA)/]
# Files from FIXorog/C??/sfc
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).facsf.tile6.nc, $(DATA)/]

- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile6.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).maximum_snow_albedo.tile6.nc, $(DATA)/]

- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile6.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).slope_type.tile6.nc, $(DATA)/]

- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile6.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).snowfree_albedo.tile6.nc, $(DATA)/]

- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile6.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).soil_type.tile6.nc, $(DATA)/]

- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile6.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).substrate_temperature.tile6.nc, $(DATA)/]

- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile6.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_greenness.tile6.nc, $(DATA)/]

- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile1.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile2.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile3.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile4.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile5.nc, $(DATA)/]
- [$(FIXgfs)/orog/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile6.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile1.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile2.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile3.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile4.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile5.nc, $(DATA)/]
- [$(FIXorog)/$(CASE)/sfc/$(CASE).mx$(OCNRES).vegetation_type.tile6.nc, $(DATA)/]
12 changes: 6 additions & 6 deletions parm/ufs/fix/gfs/ocean.fixed_files.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
copy:

# Orography data tile files
- [$(FIXgfs)/orog/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile1.nc, $(DATA)/INPUT/oro_data.tile1.nc]
- [$(FIXgfs)/orog/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile2.nc, $(DATA)/INPUT/oro_data.tile2.nc]
- [$(FIXgfs)/orog/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile3.nc, $(DATA)/INPUT/oro_data.tile3.nc]
- [$(FIXgfs)/orog/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile4.nc, $(DATA)/INPUT/oro_data.tile4.nc]
- [$(FIXgfs)/orog/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile5.nc, $(DATA)/INPUT/oro_data.tile5.nc]
- [$(FIXgfs)/orog/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile6.nc, $(DATA)/INPUT/oro_data.tile6.nc]
- [$(FIXorog)/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile1.nc, $(DATA)/INPUT/oro_data.tile1.nc]
- [$(FIXorog)/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile2.nc, $(DATA)/INPUT/oro_data.tile2.nc]
- [$(FIXorog)/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile3.nc, $(DATA)/INPUT/oro_data.tile3.nc]
- [$(FIXorog)/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile4.nc, $(DATA)/INPUT/oro_data.tile4.nc]
- [$(FIXorog)/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile5.nc, $(DATA)/INPUT/oro_data.tile5.nc]
- [$(FIXorog)/$(CASE)/$(CASE).mx$(OCNRES)_oro_data.tile6.nc, $(DATA)/INPUT/oro_data.tile6.nc]
8 changes: 4 additions & 4 deletions scripts/exgdas_enkf_sfc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ if [ $DOIAU = "YES" ]; then
"${DATA}/fnbgsi.${cmem}"
${NLN} "${COM_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc" \
"${DATA}/fnbgso.${cmem}"
${NLN} "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc" "${DATA}/fngrid.${cmem}"
${NLN} "${FIXgfs}/orog/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
${NLN} "${FIXorog}/${CASE}/${CASE}_grid.tile${n}.nc" "${DATA}/fngrid.${cmem}"
${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"

if [[ ${GSI_SOILANAL} = "YES" ]]; then
FHR=6
Expand Down Expand Up @@ -207,8 +207,8 @@ if [ $DOSFCANL_ENKF = "YES" ]; then
"${DATA}/fnbgsi.${cmem}"
${NLN} "${COM_ATMOS_RESTART_MEM}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc" \
"${DATA}/fnbgso.${cmem}"
${NLN} "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc" "${DATA}/fngrid.${cmem}"
${NLN} "${FIXgfs}/orog/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
${NLN} "${FIXorog}/${CASE}/${CASE}_grid.tile${n}.nc" "${DATA}/fngrid.${cmem}"
${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"

done

Expand Down
6 changes: 3 additions & 3 deletions scripts/exglobal_forecast.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
## Restart files:
##
## Fix files:
## 1. computing grid, ${FIXgfs}/orog/$CASE/${CASE}_grid.tile${n}.nc
## 2. orography data, ${FIXgfs}/orog/$CASE/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc
## 3. mosaic data, ${FIXgfs}/orog/$CASE/${CASE}_mosaic.nc
## 1. computing grid, ${FIXorog}/$CASE/${CASE}_grid.tile${n}.nc
## 2. orography data, ${FIXorog}/$CASE/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc
## 3. mosaic data, ${FIXorog}/$CASE/${CASE}_mosaic.nc
## 4. Global O3 data, ${FIXgfs}/am/${O3FORC}
## 5. Global H2O data, ${FIXgfs}/am/${H2OFORC}
## 6. Global solar constant data, ${FIXgfs}/am/global_solarconstant_noaa_an.txt
Expand Down
19 changes: 14 additions & 5 deletions sorc/link_workflow.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ esac

# Source fix version file
source "${HOMEgfs}/versions/fix.ver"
# global-nest uses different versions of orog and ugwd
if [[ "${LINK_NEST:-OFF}" == "ON" ]] ; then
source "${HOMEgfs}/versions/fix.nest.ver"
fi

# Link python pacakges in ush/python
# TODO: This will be unnecessary when these are part of the virtualenv
Expand Down Expand Up @@ -134,7 +130,20 @@ do
fix_ver="${dir}_ver"
${LINK_OR_COPY} "${FIX_DIR}/${dir}/${!fix_ver}" "${dir}"
done

# global-nest uses different versions of orog and ugwd
if [[ "${LINK_NEST:-OFF}" == "ON" ]] ; then
for dir in orog \
ugwd
do
nestdir=${dir}_nest
if [[ -d "${nestdir}" ]]; then
[[ "${RUN_ENVIR}" == "nco" ]] && chmod -R 755 "${nestdir}"
rm -rf "${nestdir}"
fi
fix_ver="${dir}_nest_ver"
${LINK_OR_COPY} "${FIX_DIR}/${dir}/${!fix_ver}" "${nestdir}"
done
fi

#---------------------------------------
#--add files from external repositories
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_utils.fd
Submodule ufs_utils.fd updated 94 files
+5 −1 .github/PULL_REQUEST_TEMPLATE
+8 −5 CMakeLists.txt
+1 −1 README.md
+4 −10 build_all.sh
+1 −1 ccpp-physics
+22 −22 docs/source/chgres_cube.rst
+1 −1 docs/source/ufs_utils.rst
+2 −2 driver_scripts/driver_grid.hercules.sh
+6 −4 fix/link_fixdirs.sh
+0 −22 modulefiles/build.gaea.intel
+66 −0 modulefiles/build.gaea.intel.lua
+3 −2 modulefiles/build.hera.gnu.lua
+3 −2 modulefiles/build.hera.intel.lua
+3 −2 modulefiles/build.hercules.intel.lua
+3 −2 modulefiles/build.jet.intel.lua
+12 −49 modulefiles/build.noaacloud.intel.lua
+3 −2 modulefiles/build.orion.intel.lua
+3 −2 modulefiles/build.s4.intel.lua
+3 −2 modulefiles/build.wcoss2.intel.lua
+60 −0 modulefiles/common4noaacloud.lua
+80 −54 reg_tests/chgres_cube/driver.hera.sh
+43 −70 reg_tests/chgres_cube/driver.hercules.sh
+27 −54 reg_tests/chgres_cube/driver.jet.sh
+43 −70 reg_tests/chgres_cube/driver.orion.sh
+30 −57 reg_tests/chgres_cube/driver.s4.sh
+26 −54 reg_tests/chgres_cube/driver.wcoss2.sh
+18 −11 reg_tests/cpld_gridgen/RegressionTests_hera.intel.log
+150 −0 reg_tests/cpld_gridgen/RegressionTests_hercules.intel.log
+26 −19 reg_tests/cpld_gridgen/RegressionTests_jet.intel.log
+18 −11 reg_tests/cpld_gridgen/RegressionTests_orion.intel.log
+18 −11 reg_tests/cpld_gridgen/RegressionTests_wcoss2.intel.log
+3 −3 reg_tests/cpld_gridgen/parm/grid.nml.IN
+2 −3 reg_tests/cpld_gridgen/rt.sh
+17 −6 reg_tests/global_cycle/C192.gsi_lndincsoilnoahmp.sh
+88 −0 reg_tests/global_cycle/C192.jedi_lndincsoilnoahmp.sh
+2 −1 reg_tests/global_cycle/C768.lndincsnow.sh
+9 −3 reg_tests/global_cycle/driver.hera.sh
+9 −3 reg_tests/global_cycle/driver.hercules.sh
+9 −3 reg_tests/global_cycle/driver.jet.sh
+9 −3 reg_tests/global_cycle/driver.orion.sh
+7 −2 reg_tests/global_cycle/driver.wcoss2.sh
+10 −3 reg_tests/grid_gen/driver.hera.sh
+11 −3 reg_tests/grid_gen/driver.hercules.sh
+9 −2 reg_tests/grid_gen/driver.jet.sh
+10 −3 reg_tests/grid_gen/driver.orion.sh
+10 −3 reg_tests/grid_gen/driver.wcoss2.sh
+8 −5 reg_tests/grid_gen/regional.gsl.gwd.sh
+1 −3 reg_tests/ice_blend/driver.jet.sh
+1 −3 reg_tests/snow2mdl/driver.jet.sh
+13 −3 sorc/chgres_cube.fd/CMakeLists.txt
+12 −0 sorc/chgres_cube.fd/atm_input_data.F90
+34 −22 sorc/chgres_cube.fd/model_grid.F90
+12 −0 sorc/chgres_cube.fd/nst_input_data.F90
+2 −0 sorc/chgres_cube.fd/program_setup.F90
+10 −0 sorc/chgres_cube.fd/sfc_input_data.F90
+99 −94 sorc/cpld_gridgen.fd/angles.F90
+29 −24 sorc/cpld_gridgen.fd/docs/cpld_gridgen.md
+98 −60 sorc/cpld_gridgen.fd/gen_fixgrid.F90
+8 −12 sorc/cpld_gridgen.fd/grdvars.F90
+11 −9 sorc/cpld_gridgen.fd/inputnml.F90
+2 −2 sorc/cpld_gridgen.fd/topoedits.F90
+13 −1 sorc/cpld_gridgen.fd/tripolegrid.F90
+1 −1 sorc/global_cycle.fd/CMakeLists.txt
+121 −59 sorc/global_cycle.fd/cycle.f90
+207 −127 sorc/global_cycle.fd/land_increments.f90
+103 −6 sorc/global_cycle.fd/read_write_data.f90
+4 −0 sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt
+42 −2 sorc/grid_tools.fd/filter_topo.fd/filter_topo.F90
+56 −3 sorc/lsm_routines.fd/noah.fd/set_soilveg_snippet.f90
+7 −33 sorc/machine-setup.sh
+90 −562 sorc/orog_mask_tools.fd/orog.fd/mtnlm7_oclsm.F
+4 −0 sorc/orog_mask_tools.fd/orog_gsl.fd/CMakeLists.txt
+10 −2 sorc/orog_mask_tools.fd/orog_gsl.fd/gsl_oro_data.f90
+7 −9 sorc/orog_mask_tools.fd/orog_gsl.fd/module_gsl_oro_data_lg_scale.f90
+7 −13 sorc/orog_mask_tools.fd/orog_gsl.fd/module_gsl_oro_data_sm_scale.f90
+39 −28 tests/chgres_cube/CMakeLists.txt
+22 −24 tests/chgres_cube/ftst_program_setup.F90
+333 −106 tests/cpld_gridgen/ftst_find_angq.F90
+18 −3 tests/global_cycle/CMakeLists.txt
+51 −27 tests/global_cycle/ftst_land_increments.F90
+168 −0 tests/global_cycle/ftst_read_increments.F90
+2 −2 ush/fv3gfs_driver_grid.sh
+88 −82 ush/fv3gfs_make_orog.sh
+8 −5 ush/fv3gfs_ocean_merge.sh
+33 −26 ush/global_cycle.sh
+17 −7 ush/global_cycle_driver.sh
+29 −13 util/gdas_init/config
+4 −11 util/gdas_init/driver.hera.sh
+4 −11 util/gdas_init/driver.jet.sh
+2 −7 util/gdas_init/driver.s4.sh
+4 −11 util/gdas_init/driver.wcoss2.sh
+9 −25 util/gdas_init/get_v15.data.sh
+0 −64 util/gdas_init/run_v15.chgres.gfs.sh
+1 −1 util/gdas_init/run_v15.chgres.sh
Loading

0 comments on commit 2e6f1fc

Please sign in to comment.