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

scnv_interstitial update #121

Merged
merged 7 commits into from
Jul 21, 2018
Merged

Conversation

grantfirl
Copy link
Collaborator

removed mfdeepcnv and mfshalcnv since they were replaced by samfshalcnv and samfdeepcnv, respectively; updates to samfshalcnv-specific interstitial and generic shallow convection interstitial

…nv and samfdeepcnv, respectively; updates to samfshalcnv-specific interstitial and generic shallow convection interstitial
@climbfuji
Copy link
Collaborator

Somehow my commit on the stochastic physics shows up in your commit list. Could you try to get rid of it by pulling in the latest master branch? If you take a backup beforehand and a graphical diff afterwards shows no differences, then you can safely push the updated version w/o having to rerun the tests.

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.

Approved, would be a nice to have to get rid of the commits that are already in master.

@grantfirl
Copy link
Collaborator Author

I think that I need to back away from the computer. :)

I think that I squashed your commit in with one from this PR. Since it's already pushed to github, I'm not really sure how to undo this. I have the original branch (before rebasing) on Theia that I can try to fix this with.

@grantfirl grantfirl force-pushed the SCNV_interstitial branch from 5d35c15 to 021a33f Compare July 21, 2018 02:12
@grantfirl grantfirl force-pushed the SCNV_interstitial branch from 021a33f to aaf168a Compare July 21, 2018 02:15
@grantfirl
Copy link
Collaborator Author

OK, that worked. I redid the rebase of the last few debugging commits on Theia and pushed it in. It is the exact same code that was tested.

@grantfirl grantfirl merged commit b7c355d into NCAR:master Jul 21, 2018
@climbfuji
Copy link
Collaborator

Thanks!

SamuelTrahanNOAA added a commit to SamuelTrahanNOAA/ccpp-physics that referenced this pull request Feb 23, 2022
Updates to MYNN-EDMF, part I - goes with other PR for fv3atm

Overview of changes:

    This commit should be considered step one of the "universalization" process to generalize module_bl_mynn.F90 both for all dycores. Much of this is strictly reformatting or repositioning the driver to the top of the module - a request from collaborators, but some of it involve removing ifdefs, and the handling of the model constants. More commits to complete this work will follow. Despite the huge number of lines changed from this work alone, there is no change in behavior/performance.
    fixed some old crash cases (improved numerical stability)
    conservation work - removes all negative qv printouts
    A bug fix for the interpolation of the mass-flux clouds from interface levels to mid-levels which cause excessive LWP in shallow-cumulus fields
    Removes a few unused variables/arrays
    Fixes for the smoke/chemical mixing (works but still not in final state - another commit will follow)
    Some tuning work to improve the excessive cloud bias in polar regions.
    Some tuning of the mass-flux component to improve the tropics.
    General clean up of code and updates to many comments.
hannahcbarnes pushed a commit to hannahcbarnes/ccpp-physics that referenced this pull request Aug 3, 2022
* Updates to MYNN-EDMF, part II - goes with mods for ccpp-physics

* updating default mixing length option to 1

* Changing eq to eqv for logical if-then tests.

* Removing .eq. and .eqv. from logical if-then tests.

* point to top of gsl/develop for ccpp/physics

Co-authored-by: Samuel Trahan <Samuel.Trahan@noaa.gov>
SamuelTrahanNOAA added a commit to SamuelTrahanNOAA/ccpp-physics that referenced this pull request Nov 8, 2023
SamuelTrahanNOAA pushed a commit to SamuelTrahanNOAA/ccpp-physics that referenced this pull request Nov 9, 2023
Add a condition to turn off samfdeepcnv when MYNN shallow convection active
lisa-bengtsson added a commit to lisa-bengtsson/ccpp-physics that referenced this pull request Nov 9, 2023
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.

2 participants