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

Land surface upgrades for HR2 #1777

Merged
merged 34 commits into from
Jul 19, 2023
Merged

Land surface upgrades for HR2 #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
790d07e
update FV3 repository
HelinWei-NOAA Mar 31, 2023
2e958a9
update FV3 repository and some RT setting
HelinWei-NOAA Apr 3, 2023
1b77634
add iopt_diag for 2m t/q diagnostic option
HelinWei-NOAA Apr 3, 2023
81ce00e
Merge remote-tracking branch 'upstream/develop' into hr2_land1
HelinWei-NOAA May 8, 2023
e408deb
Merge remote-tracking branch 'upstream/develop' into hr2_land1
HelinWei-NOAA Jun 1, 2023
dcd72ed
land surface upgrades for hr2
HelinWei-NOAA Jun 2, 2023
bfb660c
update fv3 repo
HelinWei-NOAA Jun 15, 2023
93f966c
update fv3 repo
HelinWei-NOAA Jun 15, 2023
c29a63d
update NOAHMP-interface repository
HelinWei-NOAA Jun 20, 2023
a2e5c31
update FV3 repository
HelinWei-NOAA Jun 20, 2023
1950720
update FV3 repo
HelinWei-NOAA Jun 27, 2023
5739c0c
Merge remote-tracking branch 'upstream/develop' into hr2_land1
HelinWei-NOAA Jun 27, 2023
096ec29
update FV3 repo
HelinWei-NOAA Jun 27, 2023
65fcf06
modification based on the feedback from reviewers
HelinWei-NOAA Jun 27, 2023
67c2025
fixed a typo for soil color file flag
HelinWei-NOAA Jun 28, 2023
9cf806f
update fv3 repo
HelinWei-NOAA Jun 28, 2023
810a021
change FNSOCC setting
HelinWei-NOAA Jun 29, 2023
14caac8
update fv3 repo
HelinWei-NOAA Jun 29, 2023
f8e51f3
update cmake of NOAHMP-interface
HelinWei-NOAA Jun 30, 2023
5e575da
update fv3 repo
HelinWei-NOAA Jul 3, 2023
e449396
Merge remote-tracking branch 'upstream/develop' into hr2_land1
HelinWei-NOAA Jul 10, 2023
f4f92e2
update fv3 repo
HelinWei-NOAA Jul 10, 2023
d47f1a6
update fv3 repo
HelinWei-NOAA Jul 11, 2023
f8b0b6b
soil data for datm_cdeps_lnd_gswp test
HelinWei-NOAA Jul 11, 2023
a740e47
upload hera RTs logfile
HelinWei-NOAA Jul 12, 2023
328cb73
Update bl_date.conf
FernandoAndrade-NOAA Jul 13, 2023
0a06a5b
add gaea RT log: passed
jkbk2004 Jul 14, 2023
468540c
WCOSS2 RT Log
BrianCurtis-NOAA Jul 14, 2023
2def331
add jet RT log: passed
jkbk2004 Jul 14, 2023
e888150
Update rt.conf remove baselines for hrrr_control_qr
zach1221 Jul 14, 2023
d88c359
add orion RT logs: passed
zach1221 Jul 15, 2023
e5a830d
add hera RT logs: passed
FernandoAndrade-NOAA Jul 15, 2023
35fa9a6
Acorn RT Log
BrianCurtis-NOAA Jul 17, 2023
94f4161
update fv3 and noah-mp repo
Jul 19, 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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 6 files
+14 −1 ccpp/data/GFS_typedefs.F90
+18 −0 ccpp/data/GFS_typedefs.meta
+12 −0 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
+2 −1 io/fv3atm_restart_io.F90
+29 −13 io/fv3atm_sfc_io.F90
4 changes: 2 additions & 2 deletions NOAHMP-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ list(APPEND _noahmp_ccpp_files noahmp/drivers/ccpp/noahmpdrv.F90
noahmp/drivers/ccpp/physcons.F90)

# NoahMP
list(APPEND _noahmp_files noahmp/src/module_sf_noahmplsm.f90
noahmp/src/module_sf_noahmp_glacier.f90)
list(APPEND _noahmp_files noahmp/src/module_sf_noahmplsm.F90
noahmp/src/module_sf_noahmp_glacier.F90)

#------------------------------------------------------------------------------
# Set CCPP flags for C/C++/Fortran preprocessor
Expand Down
2 changes: 1 addition & 1 deletion NOAHMP-interface/noahmp
Open in desktop
Submodule noahmp updated 15 files
+5 −5 .github/workflows/datm_noahmp.yaml
+6 −0 .github/workflows/tests/test_datm_lnd/lnd.yaml
+2 −2 CMakeLists.txt
+1,285 −997 drivers/ccpp/noahmp_tables.f90
+160 −28 drivers/ccpp/noahmpdrv.F90
+3 −2 drivers/ccpp/physcons.F90
+15 −7 drivers/ccpp/set_soilveg.f
+5 −3 drivers/ccpp/sfc_diff.f
+4 −4 drivers/ccpp/update.sh
+2 −1 drivers/nuopc/lnd_comp_driver.F90
+15 −0 drivers/nuopc/lnd_comp_io.F90
+11 −0 drivers/nuopc/lnd_comp_shr.F90
+5 −0 drivers/nuopc/lnd_comp_types.F90
+40 −26 src/module_sf_noahmp_glacier.F90
+1,810 −1,358 src/module_sf_noahmplsm.F90
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export BL_DATE=20230705
export BL_DATE=20230713

3 changes: 3 additions & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ export FHZERO=6
export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb'"
export FNVETC="'global_vegtype.igbp.t126.384.190.rg.grb'"
export FNSOTC="'global_soiltype.statsgo.t126.384.190.rg.grb'"
export FNSOCC="''"
export FNSMCC="'global_soilmgldas.t126.384.190.grb'"
export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
Expand Down Expand Up @@ -738,6 +739,7 @@ export IOPT_STC=3
# P8
export IOPT_SFC=3
export IOPT_TRS=2
export IOPT_DIAG=2

# FV3 P7 settings
export D2_BG_K1=0.20
Expand Down Expand Up @@ -802,6 +804,7 @@ export FNTG3C="'C96.substrate_temperature.tileX.nc'"
export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
export FNVETC="'C96.vegetation_type.tileX.nc'"
export FNSOTC="'C96.soil_type.tileX.nc'"
export FNSOCC="'C96.soil_color.tileX.nc'"
export FNSMCC=${FNSMCC_control}
export FNMSKH=${FNMSKH_control}
export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
Expand Down
2 changes: 1 addition & 1 deletion tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ case $(hostname -f) in

esac

case $(echo $PW_CSP) in
case $(echo $PW_CSP:-nono) in

aws) MACHINE_ID=aws ;; ### parallelworks aws
google) MACHINE_ID=gcp ;; ### parallelworks gcp
Expand Down
1 change: 1 addition & 0 deletions tests/fv3_conf/noahmp_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/ufs-land_C96_init_fields.tile6.nc C96.ini
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.maximum_snow_albedo.tile*.nc .
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.slope_type.tile*.nc .
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.soil_type.tile*.nc .
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.soil_color.tile*.nc .
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.substrate_temperature.tile*.nc .
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.vegetation_greenness.tile*.nc .
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.vegetation_type.tile*.nc .
Expand Down
1,757 changes: 988 additions & 769 deletions tests/logs/RegressionTests_acorn.log
View file
Open in desktop

Large diffs are not rendered by default.

1,476 changes: 738 additions & 738 deletions tests/logs/RegressionTests_gaea.log
View file
Open in desktop

Large diffs are not rendered by default.

2,440 changes: 1,220 additions & 1,220 deletions tests/logs/RegressionTests_hera.log
View file
Open in desktop

Large diffs are not rendered by default.

1,453 changes: 731 additions & 722 deletions tests/logs/RegressionTests_jet.log
View file
Open in desktop

Large diffs are not rendered by default.

1,967 changes: 890 additions & 1,077 deletions tests/logs/RegressionTests_orion.log
View file
Open in desktop

Large diffs are not rendered by default.

1,719 changes: 800 additions & 919 deletions tests/logs/RegressionTests_wcoss2.log
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions tests/parm/control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -270,6 +271,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = @[FNSMCC_control]
FNMSKH = @[FNMSKH_control]
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/control_ca.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -270,6 +271,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
FNMSKH = 'global_slmask.t1534.3072.1536.grb'
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/control_csawmg.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -214,6 +215,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
FNMSKH = 'global_slmask.t1534.3072.1536.grb'
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/control_flake.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -253,6 +254,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
FNMSKH = 'global_slmask.t1534.3072.1536.grb'
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/control_gdas.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -276,6 +277,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
FNMSKH = 'global_slmask.t1534.3072.1536.grb'
FNTSFA = ' '
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/control_gfsv17.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -269,6 +270,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = @[FNSMCC_control]
FNMSKH = @[FNMSKH_control]
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/control_noahmp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 3
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -247,6 +248,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
FNMSKH = 'global_slmask.t1534.3072.1536.grb'
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/control_ugwpv1.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ deflate_level=1
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down Expand Up @@ -260,6 +261,7 @@ deflate_level=1
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
FNMSKH = 'global_slmask.t1534.3072.1536.grb'
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/cpld_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ deflate_level=1
iopt_run = 1
iopt_sfc = @[IOPT_SFC]
iopt_trs = @[IOPT_TRS]
iopt_diag = @[IOPT_DIAG]
iopt_frz = 1
iopt_inf = 1
iopt_rad = @[IOPT_RAD]
Expand Down Expand Up @@ -330,6 +331,7 @@ deflate_level=1
FNVEGC = @[FNVEGC]
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = @[FNSMCC]
FNMSKH = @[FNMSKH]
FNTSFA = ''
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/cpt.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
oz_phys = .false.
oz_phys_2015 = .true.
debug = .false.
Expand Down Expand Up @@ -263,6 +264,7 @@
FNVEGC = "global_vegfrac.0.144.decpercent.grb",
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = @[FNSMCC]
FNMSKH = "global_slmask.t1534.3072.1536.grb",
FNTSFA = "",
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/csawmg3shoc127.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.

ras = .false.
Expand Down Expand Up @@ -213,6 +214,7 @@
FNVEGC = "global_vegfrac.0.144.decpercent.grb",
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = @[FNSMCC]
FNMSKH = "global_slmask.t1534.3072.1536.grb",
FNTSFA = "",
Expand Down
1 change: 1 addition & 0 deletions tests/parm/csawmgshoc.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.

ras = .false.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_global_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
HelinWei-NOAA marked this conversation as resolved.
Show resolved Hide resolved
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_nest02.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
nstf_name = @[NSTF_NAME]
xkzminv = 0.3
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_nest_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_regional_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
iopt_diag = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/merra2_thompson.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ deflate_level=1
iopt_run = 1
iopt_sfc = @[IOPT_SFC]
iopt_trs = @[IOPT_TRS]
iopt_diag = @[IOPT_DIAG]
iopt_frz = 1
iopt_inf = 1
iopt_rad = @[IOPT_RAD]
Expand Down Expand Up @@ -328,6 +329,7 @@ deflate_level=1
FNVEGC = @[FNVEGC]
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSOCC = @[FNSOCC]
FNSMCC = @[FNSMCC]
FNMSKH = @[FNMSKH]
FNTSFA = ''
Expand Down
Loading