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

Physics Separator Merge Step2 #23

Closed
wants to merge 54 commits into from
Closed

Physics Separator Merge Step2 #23

wants to merge 54 commits into from

Conversation

llpcarson
Copy link
Contributor

From Dave Gill,
https://github.com/davegill/gmtb-gfsphysics
branch: gfs_separator_SASS

merged with master, bit-for-bit match with baseline.

Note: this PR includes the changes from PR#22, which will be committed to master first.

t-brown and others added 30 commits June 22, 2017 08:59
Adding an IPD cap file so the IPD can be called by the CCPP.
* makefile update: list $(OBJS) to create the dynamic library

* makefile updates for dynamic lib
adding README file for workflow testing purposes
Bugfix to update the IPD driver cap to use the CCPP without
crashing.
Replace sfc_nst with sfc_nst_run.
Add empty sfc_nst_init and sfc_nst_finalize.
Add parseable table of sfc_nst argument descriptions.
Split nstf_name argument into: nstf_name1, nstf_name4, nstf_name5.
Modify call to sfc_nst in GFS_physics_driver.F90 to call sfc_nst_run.

Code passes basic canned correctness tests.
grantfirl and others added 20 commits October 10, 2017 14:54
No argument table or doxygen for them yet.
Pass in correct slices of variables from physics driver.
	deleted:    IPD_layer/IPD_driver_cap.f90
	deleted:    IPD_layer/scheme.xml
	modified:   makefile
1. modified:   GFS_layer/GFS_physics_driver.F90

   add module use stmts for the sasas_deep module (was simple subr previously)

2.  modified:   physics/mfdeepcnv.f

  declare variables ql1 and ql2 (instead of ql(:,:,2)
Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, the commit history is overwhelming but as you said this includes PR#22 that needs to be merged first (will review it in a minute). Maybe it would be better to pull in the master branch into this PR once #22 is merged, then it should look cleaner?

@llpcarson
Copy link
Contributor Author

Yes, that is my plan, I just wanted to get a branch and PR ready to go... will commit the first step and merge it this afternoon!

Conflicts:
	GFS_layer/GFS_physics_driver.F90
@llpcarson
Copy link
Contributor Author

Merged step1, so these diffs are now specific to step2 (Dave's deep convection work)

@climbfuji
Copy link
Collaborator

Replaced by PR#24.

@climbfuji climbfuji closed this Dec 14, 2017
SamuelTrahanNOAA pushed a commit to SamuelTrahanNOAA/ccpp-physics that referenced this pull request May 8, 2020
…_latest_gsd_develop

Merge "Updates to MYNN-EDMF NCAR#22" into gsd/develop
lisa-bengtsson pushed a commit to lisa-bengtsson/ccpp-physics that referenced this pull request Nov 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants