Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add soil color data and change the way to read in Noah-MP parameter table #1697

Merged
merged 18 commits into from
Jul 28, 2023
Merged

Add soil color data and change the way to read in Noah-MP parameter table #1697

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b545ec2
adding soil color data
HelinWei-NOAA Jun 15, 2023
b3db4bd
Merge remote-tracking branch 'upstream/develop' into hr2_land1
HelinWei-NOAA Jul 17, 2023
a0631c1
Merge pull request #2 from NOAA-EMC/develop
HelinWei-NOAA Jul 17, 2023
b053a65
merge with the latest develop
HelinWei-NOAA Jul 17, 2023
c59ca28
Merge branch 'hr2_land1' of github.com:HelinWei-NOAA/global-workflow …
HelinWei-NOAA Jul 17, 2023
5a07899
Merge branch 'NOAA-EMC:develop' into hr2_land1
HelinWei-NOAA Jul 17, 2023
260c478
changes for NoahMP table
Jul 18, 2023
f7fc25f
create parm/ufs/land
Jul 18, 2023
b5607f9
meet ShellCheck
Jul 20, 2023
89e8f25
address comments from Rahul
Jul 21, 2023
860b990
modification based on Walter's comments
Jul 22, 2023
1723679
Update ush/forecast_postdet.sh
HelinWei-NOAA Jul 24, 2023
830262a
Update Externals.cfg
HelinWei-NOAA Jul 24, 2023
fc4ef6e
Update sorc/link_workflow.sh
aerorahul Jul 24, 2023
5c34fd9
update ufs_model hash and suite list
Jul 24, 2023
30cff53
update .gitignore
Jul 24, 2023
5579d11
Add mask resolution to sfc fix file names
WalterKolczynski-NOAA Jul 26, 2023
9dd8f87
Merge pull request #4 from WalterKolczynski-NOAA/hr2_land1
HelinWei-NOAA Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 49 additions & 49 deletions parm/ufs/fix/gfs/land.fixed_files.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
copy:

# Files from FIX_orog/C??.mx??_frac/fix_sfc
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).facsf.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).facsf.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).facsf.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).facsf.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).facsf.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).facsf.tile6.nc, $(DATA)/]
# Files from FIX_orog/C??.mx??_frac/sfc
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).facsf.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).facsf.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).facsf.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).facsf.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).facsf.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).facsf.tile6.nc, $(DATA)/]

- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).maximum_snow_albedo.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).maximum_snow_albedo.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).maximum_snow_albedo.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).maximum_snow_albedo.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).maximum_snow_albedo.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).maximum_snow_albedo.tile6.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).maximum_snow_albedo.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).maximum_snow_albedo.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).maximum_snow_albedo.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).maximum_snow_albedo.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).maximum_snow_albedo.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).maximum_snow_albedo.tile6.nc, $(DATA)/]

- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).slope_type.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).slope_type.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).slope_type.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).slope_type.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).slope_type.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).slope_type.tile6.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).slope_type.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).slope_type.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).slope_type.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).slope_type.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).slope_type.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).slope_type.tile6.nc, $(DATA)/]

- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).snowfree_albedo.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).snowfree_albedo.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).snowfree_albedo.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).snowfree_albedo.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).snowfree_albedo.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).snowfree_albedo.tile6.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).snowfree_albedo.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).snowfree_albedo.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).snowfree_albedo.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).snowfree_albedo.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).snowfree_albedo.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).snowfree_albedo.tile6.nc, $(DATA)/]

- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).soil_type.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).soil_type.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).soil_type.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).soil_type.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).soil_type.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).soil_type.tile6.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).soil_type.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).soil_type.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).soil_type.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).soil_type.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).soil_type.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).soil_type.tile6.nc, $(DATA)/]

- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).substrate_temperature.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).substrate_temperature.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).substrate_temperature.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).substrate_temperature.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).substrate_temperature.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).substrate_temperature.tile6.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).substrate_temperature.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).substrate_temperature.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).substrate_temperature.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).substrate_temperature.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).substrate_temperature.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).substrate_temperature.tile6.nc, $(DATA)/]

- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_greenness.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_greenness.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_greenness.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_greenness.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_greenness.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_greenness.tile6.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_greenness.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_greenness.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_greenness.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_greenness.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_greenness.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_greenness.tile6.nc, $(DATA)/]

- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_type.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_type.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_type.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_type.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_type.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/fix_sfc/$(atm_res).vegetation_type.tile6.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_type.tile1.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_type.tile2.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_type.tile3.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_type.tile4.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_type.tile5.nc, $(DATA)/]
- [$(FIX_orog)/$(atm_res).mx$(ocn_res)_frac/sfc/$(atm_res).vegetation_type.tile6.nc, $(DATA)/]
3 changes: 2 additions & 1 deletion ush/forecast_postdet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ EOF
fi

OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"}
FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"}
FIX_SFC=${FIX_SFC:-"${OROFIX}/sfc"}
for n in $(seq 1 "${ntiles}"); do
${NLN} "${OROFIX}/oro_${CASE}.mx${OCNRES}.tile${n}.nc" "${DATA}/INPUT/oro_data.tile${n}.nc"
${NLN} "${OROFIX}/${CASE}_grid.tile${n}.nc" "${DATA}/INPUT/${CASE}_grid.tile${n}.nc"
Expand Down Expand Up @@ -304,6 +304,7 @@ EOF
FNALBC=${FNALBC:-"${FIX_SFC}/${CASE}.snowfree_albedo.tileX.nc"}
FNVETC=${FNVETC:-"${FIX_SFC}/${CASE}.vegetation_type.tileX.nc"}
FNSOTC=${FNSOTC:-"${FIX_SFC}/${CASE}.soil_type.tileX.nc"}
FNSOCC=${FNSOCC:-"${FIX_SFC}/${CASE}.soil_color.tileX.nc"}
HelinWei-NOAA marked this conversation as resolved.
Show resolved Hide resolved
FNABSC=${FNABSC:-"${FIX_SFC}/${CASE}.maximum_snow_albedo.tileX.nc"}
FNSMCC=${FNSMCC:-"${FIX_DIR}/am/global_soilmgldas.statsgo.t${JCAP}.${LONB}.${LATB}.grb"}

Expand Down
1 change: 1 addition & 0 deletions ush/parsing_namelists_FV3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ cat >> input.nml <<EOF
FNVEGC = '${FNVEGC}'
FNVETC = '${FNVETC}'
FNSOTC = '${FNSOTC}'
FNSOCC = '${FNSOCC}'
FNSMCC = '${FNSMCC}'
FNMSKH = '${FNMSKH}'
FNTSFA = '${FNTSFA}'
Expand Down
2 changes: 1 addition & 1 deletion versions/fix.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export glwu_ver=20220805
export gsi_ver=20230601
export lut_ver=20220805
export mom6_ver=20220805
export orog_ver=20220805
export orog_ver=20230615
export reg2grb2_ver=20220805
export sfc_climo_ver=20220805
export ugwd_ver=20220805
Expand Down