Skip to content

Merge gsl/develop to RRFS_dev#136

Closed
SamuelTrahanNOAA wants to merge 221 commits into
RRFS_devfrom
gsl/develop
Closed

Merge gsl/develop to RRFS_dev#136
SamuelTrahanNOAA wants to merge 221 commits into
RRFS_devfrom
gsl/develop

Conversation

@SamuelTrahanNOAA
Copy link
Copy Markdown
Collaborator

@SamuelTrahanNOAA SamuelTrahanNOAA commented Mar 14, 2022 •
edited
Loading

See title for details.

There are conflicts where code was commented out, but that code changed.

SMoorthi-emc and others added 30 commits October 1, 2021 16:45
@SMoorthi-emc
Merge branch 'SM_Sept21_PR' of https://github.com/SMoorthi-emc/ccpp-p…
738ce45 
…hysics into SM_Sep142021
@SMoorthi-emc
Merge branch 'SM_Sept21_PR' of https://github.com/SMoorthi-emc/ccpp-p…
cc1cbe7 
…hysics into SM_Sep142021
@SMoorthi-emc
Merge branch 'SM_Sep142021' of https://github.com/SMoorthi-emc/ccpp-p…
24884b0 
…hysics into SM_Sep142021
@SMoorthi-emc
reverting to my versions of GFS_rrtmgp_*post.F90 files
949ca84
@SMoorthi-emc
additional updates to emissivity calculation etc
215c80e
@SMoorthi-emc
updating .gitmodules
3d9b79c
@SMoorthi-emc
Merge branch 'SM_Sep142021' of https://github.com/SMoorthi-emc/ccpp-p…
c557c33 
…hysics into SM_Sep142021
@SMoorthi-emc
after merging wiht SM_Sept21_PR
6ae5461
@SMoorthi-emc
changes consistent with branch SM_Sept21_PR
c4c8bad
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
52ca358
@grantfirl
change flag_for_restart to do_lsm_cold_start in GFS_phys_time_vary an…
eff984d 
…d sfc_drv_ruc
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
d71cd82
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
7482c15
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
3d9d437
@SMoorthi-emc
after merging with ccpp/main
c458be1
@SMoorthi-emc
after submodule sync
3233eba
@SMoorthi-emc
Merge branch 'SM_Sep142021' of https://github.com/SMoorthi-emc/ccpp-p…
cf05d9d 
…hysics into SM_Sep142021
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
a34ad95
Add SPP option to several physics parameterizations
b996662
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
5ea113c
@mzhangw
revert ivor=4 options in RRTMG
2a14385
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
25f84dc
@SMoorthi-emc
Merge branch 'SM_Sep142021' of https://github.com/SMoorthi-emc/ccpp-p…
ce37043 
…hysics into SM_Sep142021
bug fixes
0947372
@SMoorthi-emc
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
4cbfa30
@climbfuji
Fix dimensions of vertical eta level variables in several metadata files
1337aeb
@climbfuji
Suggested improvements for Thompson effective radii calculation and c…
98aba4a 
…onsistency checking
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into feat…
a6453ae 
…ure/stoch_spp
checkout dtc/ccpp branch (not main), for rte-rrtmgp
9fcd6da
remove optional keyword from metadata files
12f92fb
JeffBeck-NOAA and others added 14 commits February 21, 2022 20:36
@JeffBeck-NOAA
Merge branch 'feature/stoch_spp' of https://github.com/JeffBeck-NOAA/…
f07475c 
…ccpp-physics into feature/stoch_spp
@grantfirl
change optional and explicitly-shaped SPP arrays to non-optional and …
88d0dd3 
…assumed-shape in module_bl_mynn and module_sf_mynn
@JeffBeck-NOAA
Merge pull request #3 from grantfirl/feature/stoch_spp_gjf
f77322b 
Fix the rest of the Cheyenne/GNU tests
@grantfirl
Merge pull request NCAR#820 from JeffBeck-NOAA/feature/stoch_spp
ff6395c 
Add support for Stochastically Perturbed Parameterizations (SPP) in FV3
@christinaholtNOAA
Merge remote-tracking branch 'auth/main' into gsl/develop
59a56f3
@christinaholtNOAA
A few corrections to the last merge commit.
4986cac
@SamuelTrahanNOAA
Merge pull request #126 from christinaholtNOAA/merge_main
8c2450b 
Merge NCAR main into gsl/develop
@hannahcbarnes
-Removes consistency check in GF, allows GF to run with different or …
b19488f 
…no shallow scheme
@SamuelTrahanNOAA
New codeowners for NOAA-GSL repo
1746cb2
@SamuelTrahanNOAA
Merge pull request #127 from hannahcbarnes/GFinitclean_SDF_v2
278a6d2 
Remove GF Consistency Check & Add SDFs - V2
@SamuelTrahanNOAA
Add Li to the list, by Georg's request.
022b3c4
@SamuelTrahanNOAA
No Ming Hu
fe2db09
@SamuelTrahanNOAA
Merge remote-tracking branch 'gsl/gsl/develop' into feature/gsl-physi…
61450bd 
…cs-codeowners
@SamuelTrahanNOAA
Update codeowners
791fab6 
Remove Dom, add new code manager Christina and various developers.
@SamuelTrahanNOAA
Copy link
Copy Markdown
Collaborator Author

SamuelTrahanNOAA commented Mar 14, 2022

There are conflicts where code was commented out, but that code changed.

This was referenced Mar 14, 2022
Closed
Closed
@SamuelTrahanNOAA
Copy link
Copy Markdown
Collaborator Author

SamuelTrahanNOAA commented Mar 14, 2022

Developer @mdtoyNOAA made the conflicting changes in RRFS_dev, and he's gone this week. He commented out some code, and the code he commented out has changed in gsl/develop. I'm pretty sure we can resolve the conflicts by commenting out the new code. It looks like that will achieve his intended effect. Does anyone object?

@SamuelTrahanNOAA
Copy link
Copy Markdown
Collaborator Author

SamuelTrahanNOAA commented Mar 14, 2022

Developer @mdtoyNOAA made the conflicting changes in RRFS_dev, and he's gone this week. He commented out some code, and the code he commented out has changed in gsl/develop. I'm pretty sure we can resolve the conflicts by commenting out the new code. It looks like that will achieve his intended effect. Does anyone object?

I'm hoping for a response from @tanyasmirnova or @joeolson42 here.

@tanyasmirnova
Copy link
Copy Markdown

tanyasmirnova commented Mar 14, 2022

@SamuelTrahanNOAA It is ok with me to comment out the new code.

@joeolson42
Copy link
Copy Markdown
Collaborator

joeolson42 commented Mar 14, 2022

It's OK with me too.

@SamuelTrahanNOAA
Copy link
Copy Markdown
Collaborator Author

SamuelTrahanNOAA commented Mar 14, 2022

I'm going to generate new baselines before merging this.

@SamuelTrahanNOAA
Copy link
Copy Markdown
Collaborator Author

SamuelTrahanNOAA commented Mar 14, 2022

I'm going to have to make a branch for this merge due to the regression test logs. I'll open another PR shortly.

@SamuelTrahanNOAA SamuelTrahanNOAA mentioned this pull request Mar 14, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DomHeinzeller DomHeinzeller Awaiting requested review from DomHeinzeller

@tanyasmirnova tanyasmirnova Awaiting requested review from tanyasmirnova

@hu5970 hu5970 Awaiting requested review from hu5970

@mdtoyNOAA mdtoyNOAA Awaiting requested review from mdtoyNOAA mdtoyNOAA is a code owner

@hannahcbarnes hannahcbarnes Awaiting requested review from hannahcbarnes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.