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

Incorporate BNU soil type data #717

Merged
merged 13 commits into from
Dec 1, 2022
Merged

Incorporate BNU soil type data #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bd91189
Add program to read the raw bnu soil data on tiles, combine
GeorgeGayno-NOAA Oct 20, 2022
87b69dc
Update utility to output a NH subset file.
GeorgeGayno-NOAA Oct 25, 2022
c984bfd
Remove utility as the land group used its own processes
GeorgeGayno-NOAA Oct 28, 2022
66ca305
Update script comments for new soil type.
GeorgeGayno-NOAA Oct 28, 2022
94146f3
Update comments in sfc_climo_gen utility script.
GeorgeGayno-NOAA Oct 28, 2022
ae26d52
Merge branch 'develop' into feature/bnu_soil
GeorgeGayno-NOAA Nov 1, 2022
2660b1a
Merge branch 'develop' into feature/bnu_soil
GeorgeGayno-NOAA Nov 29, 2022
4f835c0
Update ./ush/sfc_climo_gen.sh for user selected
GeorgeGayno-NOAA Nov 29, 2022
ada42f6
Update script comments.
GeorgeGayno-NOAA Nov 29, 2022
1876706
Merge branch 'develop' into feature/bnu_soil
GeorgeGayno-NOAA Nov 30, 2022
3040461
Correct script comment.
GeorgeGayno-NOAA Nov 30, 2022
144c86b
Correct script comment.
GeorgeGayno-NOAA Nov 30, 2022
933af52
Increase memory for wcoss2 grid driver script.
GeorgeGayno-NOAA Dec 1, 2022
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
2 changes: 2 additions & 0 deletions docs/source/ufs_utils.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ The surface climatological data is located here `./fix/fix_sfc_climo <https://no
* CONUS 30 sec - soil_type.statsgo.conus.30s.nc
* N Hemis 30 sec - soil_type.statsgo.nh.30s.nc
* Global 30 sec - soil_type.statsgo.30s.nc
* Categorical BNU soil type
* Global 30-second - soil_type.bnu.30s.nc
* Categorical IGBP vegetation type
* MODIS-based global 0.05-degree - vegetation_type.modis.igbp.0.05.nc
* MODIS-based global 0.03-degree - vegetation_type.modis.igbp.0.03.nc
Expand Down
8 changes: 6 additions & 2 deletions driver_scripts/driver_grid.hera.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ export gtype=uniform # 'uniform', 'stretch', 'nest',
# 'regional_gfdl', 'regional_esg'.
export make_gsl_orog=false # When 'true' will output 'oro' files for
# the GSL orographic drag suite.
export veg_type_src="modis.igbp.0.05" # veg type data.

export veg_type_src="modis.igbp.0.05" # Vegetation type data.
# For viirs-based vegetation type data, set to:
# 1) "viirs.igbp.0.1" for global 0.10-deg data
# 2) "viirs.igbp.0.05" for global 0.05-deg data
Expand All @@ -91,12 +92,15 @@ export veg_type_src="modis.igbp.0.05" # veg type data.
# 4) "modis.igbp.nh.30s" for N Hemis 30s data
# 5) "modis.igbp.30s" for global 30s data

export soil_type_src="statsgo.0.05" # Soil type data. Choices are:
export soil_type_src="statsgo.0.05" # Soil type data.
# For STATSGO data
# 1) "statsgo.0.05" for global 0.05-deg data
# 2) "statsgo.0.03" for global 0.03-deg data
# 3) "statsgo.conus.30s" for CONUS 30s data
# 4) "statsgo.nh.30s" for NH 30s data
# 5) "statsgo.30s" for global 30s data
# For Beijing Norm. Univ. data
# 1) "bnu.30s" for global 30s data.

if [ $gtype = uniform ]; then
export res=96
Expand Down
9 changes: 7 additions & 2 deletions driver_scripts/driver_grid.jet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,11 @@ module list

export gtype=uniform # 'uniform', 'stretch', 'nest',
# 'regional_gfdl', 'regional_esg'

export make_gsl_orog=false # When 'true' will output 'oro' files for
# the GSL orographic drag suite.
export veg_type_src="modis.igbp.0.05" # veg type data.

export veg_type_src="modis.igbp.0.05" # Vegetation type data.
# For viirs-based vegetation type data, set to:
# 1) "viirs.igbp.0.1" for global 0.10-deg data
# 2) "viirs.igbp.0.05" for global 0.05-deg data
Expand All @@ -91,12 +93,15 @@ export veg_type_src="modis.igbp.0.05" # veg type data.
# 4) "modis.igbp.nh.30s" for N Hemis 30s data
# 5) "modis.igbp.30s" for global 30s data

export soil_type_src="statsgo.0.05" # Soil type data. Choices are:
export soil_type_src="statsgo.0.05" # Soil type data.
# For STATSGO soil type data, set to:
# 1) "statsgo.0.05" for global 0.05-deg data
# 2) "statsgo.0.03" for global 0.03-deg data
# 3) "statsgo.conus.30s" for CONUS 30s data
# 4) "statsgo.nh.30s" for NH 30s data
# 5) "statsgo.30s" for global 30s data
# For Beijing Normal Univ. data, set to:
# 1) "bnu.30s" for global 30s data.

if [ $gtype = uniform ]; then
export res=96
Expand Down
7 changes: 5 additions & 2 deletions driver_scripts/driver_grid.orion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export gtype=regional_esg # 'uniform', 'stretch', 'nest',
export make_gsl_orog=false # When 'true' will output 'oro' files for
# the GSL orographic drag suite.

export veg_type_src="modis.igbp.0.05" # veg type data.
export veg_type_src="modis.igbp.0.05" # Vegetation type data.
# For viirs-based vegetation type data, set to:
# 1) "viirs.igbp.0.1" for global 0.10-deg data
# 2) "viirs.igbp.0.05" for global 0.05-deg data
Expand All @@ -92,12 +92,15 @@ export veg_type_src="modis.igbp.0.05" # veg type data.
# 4) "modis.igbp.nh.30s" for N Hemis 30s data
# 5) "modis.igbp.30s" for global 30s data

export soil_type_src="statsgo.0.05" # Soil type data. Choices are:
export soil_type_src="statsgo.0.05" # Soil type data.
# For STATSGO soil type data, set to:
# 1) "statsgo.0.05" for global 0.05-deg data
# 2) "statsgo.0.03" for global 0.03-deg data
# 3) "statsgo.conus.30s" for CONUS 30s data
# 4) "statsgo.nh.30s" for NH 30s data
# 5) "statsgo.30s" for global 30s data
# For Beijing Normal Univ. data, set to:
# 1) "bnu.30s" for global 30s data.

if [ $gtype = uniform ]; then
export res=96
Expand Down
13 changes: 9 additions & 4 deletions driver_scripts/driver_grid.wcoss2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#PBS -A GFS-DEV
#PBS -l walltime=00:15:00
#PBS -N make_grid
#PBS -l select=1:ncpus=24:mem=200GB
#PBS -l select=1:ncpus=24:mem=500GB

#-----------------------------------------------------------------------
# Driver script to create a cubic-sphere based model grid on WCOSS2.
Expand Down Expand Up @@ -70,11 +70,13 @@ module list
# Set grid specs here.
#-----------------------------------------------------------------------

export gtype=regional_esg # 'uniform', 'stretch', 'nest',
export gtype=regional_esg # 'uniform', 'stretch', 'nest',
# 'regional_gfdl', 'regional_esg'

export make_gsl_orog=false # When 'true' will output 'oro' files for
# the GSL orographic drag suite.
export veg_type_src="modis.igbp.0.05" # veg type data.

export veg_type_src="modis.igbp.0.05" # Vegetation type data.
# For viirs-based vegetation type data, set to:
# 1) "viirs.igbp.0.1" for global 0.10-deg data
# 2) "viirs.igbp.0.05" for global 0.05-deg data
Expand All @@ -89,12 +91,15 @@ export veg_type_src="modis.igbp.0.05" # veg type data.
# 4) "modis.igbp.nh.30s" for N Hemis 30s data
# 5) "modis.igbp.30s" for global 30s data

export soil_type_src="statsgo.0.05" # Soil type data. Choices are:
export soil_type_src="statsgo.0.05" # Soil type data
# For STATSGO soil type data, set to:
# 1) "statsgo.0.05" for global 0.05-deg data
# 2) "statsgo.0.03" for global 0.03-deg data
# 3) "statsgo.conus.30s" for CONUS 30s data
# 4) "statsgo.nh.30s" for NH 30s data
# 5) "statsgo.30s" for global 30s data
# For Beijing Normal Univ. data, set to:
# 1) "bnu.30s" for global 30s data.

if [ $gtype = uniform ]; then
export res=96
Expand Down
5 changes: 4 additions & 1 deletion util/sfc_climo_gen/run.wcoss2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,15 @@ export FIX_FV3=${BASE_DIR}/fix/orog/C${res}
# 4) "modis.igbp.nh.30s" for NH 30s data
# 5) "modis.igbp.30s" for global 30s data
#
# Soil type data
# For STATSGO soil type data
# 1) "statsgo.0.05" for global 0.05-deg data
# 2) "statsgo.0.03" for global 0.03-deg data
# 3) "statsgo.conus.30s" for CONUS 30s data
# 4) "statsgo.nh.30s" for NH 30s data
# 5) "statsgo.30s" for global 30s data
#
# For Beijing Norm. Univ. soil type data
# 1) "bnu.30s" for global 30s data
#-------------------------------------------------------------

export veg_type_src="modis.igbp.0.05"
Expand Down