Skip to content

UFS-dev PR#78 #105

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

Merged
grantfirl merged 6 commits into from
Oct 5, 2023
Merged

UFS-dev PR#78 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2088bf
Land surface upgrades for HR2 (#1777)
HelinWei-NOAA Jul 19, 2023
8a48eda
Merge commit 'a2088bf0e44736e50248ec4a9bc6ab3e5f19018e' into ufs-dev-…
grantfirl Sep 13, 2023
dcdf43f
update .gitmodules for testing
grantfirl Sep 13, 2023
94d1526
Merge branch 'main' into ufs-dev-PR78
grantfirl Oct 3, 2023
109691c
add successful Hera RT log and update bl_date.ncar.conf
grantfirl Oct 5, 2023
3960d47
update FV3 submodule pointer and revert .gitmodules
grantfirl Oct 5, 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

2 changes: 1 addition & 1 deletion tests/bl_date.ncar.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export BL_DATE=20230929
export BL_DATE=20231004

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
2,280 changes: 1,140 additions & 1,140 deletions tests/logs/RegressionTests_hera.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
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