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

Jump to bottom

Sync develop into main #458

Merged
merged 81 commits into from
May 10, 2023
Merged

Sync develop into main #458

merged 81 commits into from
May 10, 2023

Conversation

sdrabenh
Copy link
Collaborator

No description provided.

mathomp4 and others added 30 commits March 8, 2023 14:15
@mathomp4
Setup Fixes for GOCART2G Data Driven
a43e82e
@mathomp4
Fixes for History: Remove THIM and Aerosol Moist Tendencies
787374d
@mathomp4
Fixes for WSUB Handling
38e03c0
@mathomp4
Remove ExtData1 from SCM
79a7f6f
@sdrabenh
Add an additional input question to gcm_setup asking the user for the…
7279ed2 
… model HEARTBEAT_DT. Override with 450 for BACM_1M cases.
@mathomp4
Don't update HISTORY_MERRA2-DD.rc.tmpl
6470e8c
@mathomp4
Don't update HISTORY_GEOSIT.rc.tmpl
3d357ee
@mathomp4
Don't update HISTORY_S2S.rc.tmpl
7680c82
@mathomp4
Don't update GCMPROG.rc.tmpl
3a7067b
@mathomp4
Merge pull request #424 from GEOS-ESM/bugfix/mathomp4/fix-history
da1b4f7 
Fixes for History: Remove THIM and Comment Aerosol Moist Tendencies
@mathomp4
Merge branch 'develop' into bugfix/mathomp4/fix-run-scripts-wsub
5e15f02
@mathomp4
Merge pull request #425 from GEOS-ESM/bugfix/mathomp4/fix-run-scripts…
9ecfe27 
…-wsub

Fixes for WSUB Handling; Make SCM ExtData2G only
@mathomp4
Merge branch 'develop' into feature/sdrabenh/add_HB_question_to_setup
6d307d5
@mathomp4
Update BCs Version
b8741ce
@mathomp4
Update other setup scripts
518cee0
@sdrabenh
Merge pull request #426 from GEOS-ESM/feature/sdrabenh/add_HB_questio…
b6065bb 
…n_to_setup

Add HEARTBEAT_DT question
@wmputman
updates GFDL evap/subl settings
0c91913
@sdrabenh
Merge remote-tracking branch 'origin/feature/sdrabenh/merge_v10.25.0_…
186e555 
…MSTRF' into feature/sdrabenh/v11.0.0-rc.1_updates
@wmputman
WSUB_* fix after name change in MGB2_2MOM
cc4438b
Add connectivity between GOCART2G aerosols and GMI chem
7e14611
@mathomp4
Update gcm_regress.j to include small history
75d8598
@mathomp4
Make history 6 hourly
d091fbb
@sdrabenh
Merge pull request #430 from GEOS-ESM/feature/sdrabenh/v11.0.0-rc.1_u…
4538882 
…pdates

v11.0.0-rc.1 20230316 updates
Merge branch 'develop' into feature/vvalenti/gocart2g_to_gmi_connecti…
537615e 
…vity
@mathomp4
Merge pull request #433 from GEOS-ESM/feature/vvalenti/gocart2g_to_gm…
73d8d90 
…i_connectivity

Turn off 'doing_OCS' for gmichem simulations
@mathomp4
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
89ca642
@wmputman
multiple updates for GFDL tunings
a31522d
@wmputman
new radar and helicity exports
a69e774
@mathomp4
Merge branch 'develop' into feature/mathomp4/gocart2g-data-setup
5232adf
@sdrabenh
hand-resolve merge conflicts regarding WSUB
2bfc1eb
wmputman and others added 24 commits May 1, 2023 12:05
@wmputman
updated NX choices
58cce76
@sdrabenh
changes to enable wet scavenging tendencies
37998c0
@wmputman
DT updates
2153eac
@wmputman
disable ADJUST_DT: dynamic FV3 nsplit option
f443322
@sdrabenh
replicate wet scavenging tendency changes to das histories
d9fbde4
@mathomp4
Merge branch 'develop' into feature/sdrabenh/hwt03_changes_into_v11.0.0
da02ee8
@sdrabenh
Merge pull request #449 from GEOS-ESM/feature/sdrabenh/hwt03_changes_…
78ea84f 
…into_v11.0.0

Merge hwt_v03 changes into v11.0.0-rc1
@sdrabenh
Merge branch 'develop' into feature/mathomp4/add-history-to-regress
0e1cf64
@wmputman
removed USE_AEROSOL_NN override in AGCM.rc.tmpl
02867c6
@wmputman
switch FV3_CONFIG: HWT when running CONUS grids
cfb2e91
@sdrabenh
Merge remote-tracking branch 'origin/feature/wmputman/hwt_spring_exp'…
6662458 
… into feature/sdrabenh/hwt04_into_dev
@sdrabenh
set DT_LONG = 450 for BACM
2f5c658
@sdrabenh
Merge remote-tracking branch 'origin/feature/mathomp4/add-history-to-…
139eda4 
…regress' into feature/sdrabenh/hwt04_into_dev
@bena-nasa
change name of MTRI for wet scavenging bundle
945ca7b
@sdrabenh
Note about running gocart.data
5202c50
@sdrabenh
Merge pull request #451 from GEOS-ESM/feature/sdrabenh/hwt04_into_dev
b8b162a 
Pull in hwt_v04 updates into develop
@mathomp4
Merge branch 'develop' into feature/mmanyin/setup_mods
40b7918
@sdrabenh
Merge pull request #445 from GEOS-ESM/feature/mmanyin/setup_mods
4df8ba1 
Enhance the setup scripts, particularly GMI and StratChem wrt GOCART2G
@mathomp4
Update GOCART Data handling, update other setup scripts
eaf6118
@mathomp4
Add geoschemchem
c6e8399
@sdrabenh
Merge pull request #454 from GEOS-ESM/feature/mathomp4/fix-gocartdata…
b674159 
…-agcm

Update GOCART Data handling, update other setup scripts
@wmputman
reduced tau_revp for GFDL
8178230
@sdrabenh
Merge remote-tracking branch 'origin/feature/wmputman/hwt_spring_exp'…
61ffcbf 
… into feature/sdrabenh/hwt04_into_dev
@mathomp4
Merge pull request #457 from GEOS-ESM/feature/sdrabenh/hwt04_into_dev
ccf6f8c 
reduced tau_revp for GFDL
@sdrabenh sdrabenh added the Non 0-diff The changes in this pull request are non-zero-diff label May 10, 2023
@sdrabenh sdrabenh requested a review from mathomp4 May 10, 2023 18:39
@sdrabenh sdrabenh requested a review from a team as a code owner May 10, 2023 18:39
@mathomp4 mathomp4 merged commit b4d20b4 into main May 10, 2023
11 checks passed
@github-actions github-actions bot mentioned this pull request Nov 16, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mathomp4 mathomp4 mathomp4 approved these changes

Assignees
No one assigned
Labels
Non 0-diff The changes in this pull request are non-zero-diff
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@sdrabenh @mathomp4 @vlvalenti @wmputman @mmanyin @bena-nasa