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

Pull in hwt_v04 updates into develop #451

Merged
merged 26 commits into from
May 9, 2023
Merged

Pull in hwt_v04 updates into develop #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
75d8598
Update gcm_regress.j to include small history
mathomp4 Mar 23, 2023
d091fbb
Make history 6 hourly
mathomp4 Mar 23, 2023
89ca642
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Mar 24, 2023
b4d5634
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Mar 29, 2023
c50d2f5
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Apr 11, 2023
bab0033
First attempt at separated regress
mathomp4 Apr 11, 2023
f5f075d
Fix many bugs
mathomp4 Apr 11, 2023
b01c71b
Label successes and failures
mathomp4 Apr 11, 2023
13bb563
Fixes for MOM6
mathomp4 Apr 12, 2023
5c3fbeb
Merge pull request #442 from GEOS-ESM/feature/mathomp4/separate-regress
mathomp4 Apr 12, 2023
9049b98
Allow running only startstop or layout
mathomp4 Apr 13, 2023
9e68c15
added options for CONUS stretched grid and updated revp/frz timescale…
wmputman Apr 16, 2023
1f369e9
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
mathomp4 Apr 17, 2023
b7421cc
final preps for the HWT spring forecast experiments
wmputman Apr 29, 2023
67fbad7
updated heartbeat and long_dt settings
wmputman May 1, 2023
58cce76
updated NX choices
wmputman May 1, 2023
2153eac
DT updates
wmputman May 2, 2023
f443322
disable ADJUST_DT: dynamic FV3 nsplit option
wmputman May 2, 2023
0e1cf64
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
sdrabenh May 4, 2023
02867c6
removed USE_AEROSOL_NN override in AGCM.rc.tmpl
wmputman May 4, 2023
cfb2e91
switch FV3_CONFIG: HWT when running CONUS grids
wmputman May 4, 2023
6662458
Merge remote-tracking branch 'origin/feature/wmputman/hwt_spring_exp'…
sdrabenh May 5, 2023
2f5c658
set DT_LONG = 450 for BACM
sdrabenh May 5, 2023
139eda4
Merge remote-tracking branch 'origin/feature/mathomp4/add-history-to-…
sdrabenh May 5, 2023
945ca7b
change name of MTRI for wet scavenging bundle
bena-nasa May 9, 2023
5202c50
Note about running gocart.data
sdrabenh May 9, 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
28 changes: 22 additions & 6 deletions AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,36 @@ AGCM.LM: @AGCM_LM
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM

@CONUS AGCM.STRETCH_FACTOR: @STRETCH_FACTOR
@CONUS AGCM.TARGET_LAT: 39.5
@CONUS AGCM.TARGET_LON: -98.35

###########################################################
# long physics DT options
# ----------------------------------------
ADJUST_DT: .FALSE.
CHEMISTRY_RUN_AT_INTERVAL_START: .TRUE.
CHEMISTRY_DT: @LONG_DT
GOCART_DT: @LONG_DT
HEMCO_DT: @LONG_DT
GF_DT: @LONG_DT
UW_DT: @LONG_DT
###########################################################

###########################################################
# dynamics options
# ----------------------------------------
DYCORE: @DYCORE
#FV3_CONFIG: MONOTONIC
@CONUS FV3_CONFIG: HWT
AdvCore_Advection: 0
###########################################################

###########################################################
# radiation options
# ----------------------------------------
SOLAR_DT: 3600
IRRAD_DT: 3600
SATSIM_DT: 3600
SOLAR_DT: @SOLAR_DT
IRRAD_DT: @IRRAD_DT
SATSIM_DT: @IRRAD_DT
SOLARAvrg: 0
IRRADAvrg: 0
EOT: .TRUE.
Expand All @@ -50,7 +66,6 @@ ORBIT_ANAL2B: .TRUE.
# ----------------------------------------
@GFDL_1M_CLDMICR_OPTION: GFDL_1M
@GFDL_1M_HYDROSTATIC: @GFDL_HYDRO
@GFDL_1M_USE_AEROSOL_NN: .FALSE.
###########################################################

###########################################################
Expand Down Expand Up @@ -91,7 +106,8 @@ CLOSURE_CONGESTUS: 3

###########################################################
# Enable wet scavenging
MTRI_increments::
# NOTE: this section should be commented out when running gocart.data
MCHEMTRI_increments::
DU::DU default
SS::SS default
SU::SO4 default
Expand Down
14 changes: 7 additions & 7 deletions HISTORY.AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,13 +991,13 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NIFLUXV' , 'NI' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3d_aer_p.template: '%y4%m2%d2_%h2%n2z.nc4',
Expand Down
8 changes: 6 additions & 2 deletions fvcore_layout.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
@FV_HYDRO
range_warn = .T.
fv_debug = .F.
@FV_SCHMIDT
@FV_STRETCH_FAC
@FV_TARGET_LON
@FV_TARGET_LAT
/

&main_nml
Expand All @@ -28,8 +32,8 @@
do_qa = .false.
tau_l2v = 150.
tau_i2v = 150.
tau_revp = 300.
tau_frz = 300.
tau_revp = 450.
tau_frz = 450.
dw_land = 0.05
dw_ocean = 0.10
rh_inc = 0.30
Expand Down
Loading