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.

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

Changes to Logging and Initialization of the CLM Lake Model (Including PR#1863) #1844

Merged
merged 24 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b426fd0
Changes to logging and initialization of the CLM Lake Model.
SamuelTrahanNOAA Jul 24, 2023
922d543
merge upstream develop
SamuelTrahanNOAA Jul 27, 2023
824a597
changes missing from prior FV3/ccpp/physics commits
SamuelTrahanNOAA Jul 27, 2023
7b4b0e2
explicitly turn of frac_ice for flake
SamuelTrahanNOAA Jul 27, 2023
19207c5
t_grnd(i) should be t_grnd(c)
SamuelTrahanNOAA Jul 28, 2023
c1e3f71
fix another typo in clm_lake.f90
SamuelTrahanNOAA Jul 28, 2023
e2a4e94
hera tests passed
SamuelTrahanNOAA Jul 28, 2023
c8b0888
merge upstream
SamuelTrahanNOAA Aug 11, 2023
abc615e
hera tests passed
SamuelTrahanNOAA Aug 12, 2023
bfc5915
correction to lake_q2m metadata in GFS_diagnostics.F90
SamuelTrahanNOAA Aug 17, 2023
2411807
hera tests passed again
SamuelTrahanNOAA Aug 17, 2023
22337aa
merge upstream develop
SamuelTrahanNOAA Aug 17, 2023
2ce3eb0
hera tests passed again
SamuelTrahanNOAA Aug 18, 2023
320fa9e
merge upstream develop
SamuelTrahanNOAA Aug 18, 2023
6b63e02
merge ccpp-physics #91 (UFS-SRW v3.0.0 SciDoc updates)
SamuelTrahanNOAA Aug 18, 2023
787b055
hera tests passed again
SamuelTrahanNOAA Aug 19, 2023
76d86b8
Add new BL_DATE
jkbk2004 Aug 20, 2023
e09d1cb
add hera RT log: passed
jkbk2004 Aug 21, 2023
ef9bd85
Add Orion RT log: passed
jkbk2004 Aug 21, 2023
ec3a6cd
Add Gaea RT log: passed
jkbk2004 Aug 21, 2023
4ea26a4
add cheyenne RT logs: passed
zach1221 Aug 21, 2023
2fb90bb
Acorn RT Log
BrianCurtis-NOAA Aug 21, 2023
4317b7e
point to upstream ufs/dev for FV3/ccpp/physics
SamuelTrahanNOAA Aug 22, 2023
bfe77be
point to upstream develop for FV3
SamuelTrahanNOAA Aug 22, 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
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export BL_DATE=20230816
export BL_DATE=20230818

2 changes: 1 addition & 1 deletion tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ export LKM=0 # 0=no lake, 1=run lake model, 2=run both lake and nsst on lake poi
export IOPT_LAKE=2 # 1=flake, 2=clm lake
export LAKEFRAC_THRESHOLD=0.0 # lake fraction must be higher for lake model to run it
export LAKEDEPTH_THRESHOLD=1.0 # lake must be deeper (in meters) for a lake model to run it
export FRAC_ICE=.false.
export FRAC_ICE=.true. # should be false for flake, true for clm_lake

export CPL=.false.
export CPLCHM=.false.
Expand Down
1,652 changes: 812 additions & 840 deletions tests/logs/RegressionTests_acorn.log

Large diffs are not rendered by default.

3,343 changes: 1,511 additions & 1,832 deletions tests/logs/RegressionTests_cheyenne.log

Large diffs are not rendered by default.

1,527 changes: 776 additions & 751 deletions tests/logs/RegressionTests_gaea.log

Large diffs are not rendered by default.

2,106 changes: 1,054 additions & 1,052 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

1,552 changes: 776 additions & 776 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/parm/control_flake.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ deflate_level=1
lakefrac_threshold = @[LAKEFRAC_THRESHOLD] ! 0.15
lakedepth_threshold = @[LAKEDEPTH_THRESHOLD] ! 0.5
clm_lake_debug = .false.

frac_ice = @[FRAC_ICE] ! false for flake, true for clm lake
fhzero = 6
h2o_phys = .true.
ldiag3d = .false.
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_flake
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export RESTART_INTERVAL=6

export LKM=1
export IOPT_LAKE=1
export FRAC_ICE=.false.

export DO_SPPT=.true.
export DO_SHUM=.true.
Expand Down
1 change: 1 addition & 0 deletions tests/tests/control_flake_debug
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export OUTPUT_FH="0 1"

export LKM=1
export IOPT_LAKE=1
export FRAC_ICE=.false.

export DO_SPPT=.true.
export DO_SHUM=.true.
Expand Down
1 change: 1 addition & 0 deletions tests/tests/rap_flake_debug
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export CCPP_SUITE=FV3_RAP_flake
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export DIAG_TABLE=diag_table_rap
export FRAC_ICE=.false.

export IMP_PHYSICS=8
export DNATS=0
Expand Down