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

Update DTs in gcm_setup for non-stock configs #537

Merged
merged 15 commits into from
Nov 16, 2023
Merged

Update DTs in gcm_setup for non-stock configs #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b4d20b4
Merge pull request #458 from GEOS-ESM/develop
mathomp4 May 10, 2023
d76cb93
Merge pull request #463 from GEOS-ESM/develop
sdrabenh May 17, 2023
2b1e0a7
Merge pull request #465 from GEOS-ESM/develop
mathomp4 May 18, 2023
784002c
Merge pull request #472 from GEOS-ESM/develop
sdrabenh Jun 7, 2023
9836042
Merge pull request #474 from GEOS-ESM/develop
sdrabenh Jun 8, 2023
f16fa80
Merge pull request #497 from GEOS-ESM/develop
sdrabenh Jul 28, 2023
3c94262
Merge pull request #507 from GEOS-ESM/develop
sdrabenh Aug 24, 2023
9b59962
Merge pull request #519 from GEOS-ESM/develop
mathomp4 Sep 28, 2023
1a9c593
Merge pull request #525 from GEOS-ESM/develop
sdrabenh Oct 18, 2023
2844b70
Merge pull request #528 from GEOS-ESM/develop
mathomp4 Oct 20, 2023
00b6dd9
Merge pull request #534 from GEOS-ESM/develop
sdrabenh Oct 31, 2023
dfedbfc
Update DTs in gcm_setup for non-stock configs
sdrabenh Nov 15, 2023
26216df
latest GF2020 GFDL_1M and MGB2_2M codes and fixes
wmputman Nov 16, 2023
7c27e36
Merge branch 'feature/wmputman/KM_v11_3_2_Moist_WMP' into feature/sdr…
sdrabenh Nov 16, 2023
eb63448
Remove fv_sg_adj=-1 from stock config
sdrabenh Nov 16, 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
4 changes: 4 additions & 0 deletions AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ ORBIT_ANAL2B: .TRUE.
# GFDL_1M microphysics options
# ----------------------------------------
@GFDL_1M_CLDMICR_OPTION: GFDL_1M
@GFDL_1M_USE_BERGERON: .FALSE.
@GFDL_1M_USE_AEROSOL_NN: .TRUE.
@GFDL_1M_ICE_RADII_PARAM: 1
@GFDL_1M_MELTFRZ: .TRUE.
@GFDL_1M_HYDROSTATIC: @GFDL_HYDRO
###########################################################

Expand Down
10 changes: 6 additions & 4 deletions fvcore_layout.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
do_evap = .false.
do_subl = .false.
do_qa = .false.
tau_l2v = 450.
tau_i2v = 450.
tau_revp = 450.
tau_frz = 450.
tau_l2v = 300.
tau_i2v = 300.
tau_s2v = 300.
tau_g2v = 300.
tau_revp = 300.
tau_frz = 300.
dw_land = 0.05
dw_ocean = 0.10
rh_inc = 0.30
Expand Down
10 changes: 5 additions & 5 deletions gcm_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ if( $AGCM_IM == "c48" ) then
set POST_NDS = 4
endif
if( $AGCM_IM == "c90" ) then
set DT = 1800
set DT = 900
set SOLAR_DT = 3600
set IRRAD_DT = 3600
set LONG_DT = $DT
Expand Down Expand Up @@ -1129,7 +1129,7 @@ if( $AGCM_IM == "c90" ) then
set POST_NDS = 8
endif
if( $AGCM_IM == "c180" ) then
set DT = 900
set DT = 600
set SOLAR_DT = 3600
set IRRAD_DT = 3600
set LONG_DT = $DT
Expand Down Expand Up @@ -1173,11 +1173,11 @@ if( $AGCM_IM == "c360" ) then
set POST_NDS = 12
endif
if( $AGCM_IM == "c720" ) then
set DT = 225
set DT = 300
set SOLAR_DT = 3600
set IRRAD_DT = 3600
set OCEAN_DT = $IRRAD_DT
set LONG_DT = 450
set LONG_DT = $DT
set AGCM_IM = 720
set AGCM_JM = `expr $AGCM_IM \* 6`
set NX = 24
Expand Down Expand Up @@ -1235,7 +1235,7 @@ if( $AGCM_IM == "c2880" ) then
set CONVPAR_OPTION = NONE
endif
if( $AGCM_IM == "c5760" ) then
set DT = 30
set DT = 45
set SOLAR_DT = 900
set IRRAD_DT = 900
set OCEAN_DT = $IRRAD_DT
Expand Down