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

merge 2-way update bugfix from master #23

Merged
merged 16 commits into from
Apr 21, 2020
Merged

merge 2-way update bugfix from master #23

merged 16 commits into from
Apr 21, 2020

Conversation

bensonr
Copy link
Contributor

@bensonr bensonr commented Apr 20, 2020

Incorporates bugfixes from @lharris4 incorporated into NOAA-GFDL/GFDL_atmos_cubed_sphere::master

bensonr and others added 14 commits July 17, 2019 14:07
* commit of new version of dycore from Weather and Climate Dynamics Group at GFDL

* updated versions of GFDL-specific files from dev/gfdl

* updated README.md with current release information

* cleaned up a few lines in fv_dynamics

* new file RELEASE.md with release notes documenting differences between this and the last release

* updated RELEASE.md message

* hand merge of diagnostic updates

* remove trailing spaces from sources

* updates to merge some GFDL specific updates into this public release
* commit of new version of dycore from Weather and Climate Dynamics Group at GFDL

* updated versions of GFDL-specific files from dev/gfdl

* updated README.md with current release information

* cleaned up a few lines in fv_dynamics

* new file RELEASE.md with release notes documenting differences between this and the last release

* updated RELEASE.md message

* hand merge of diagnostic updates

* remove trailing spaces from sources

* updates to merge some GFDL specific updates into this public release

* updated README.md

* updated GFDL_tools/fv_cmip_diag to be consistent with dev/gfdl branch
Includes 2-way nesting update fixes

 Conflicts:
breaks up a too long line in fv_nesting.F90
@bensonr bensonr added the enhancement New feature or request label Apr 20, 2020
@bensonr bensonr added bug Something isn't working and removed enhancement New feature or request labels Apr 21, 2020
@bensonr bensonr merged commit 028c1d8 into NOAA-GFDL:dev/gfdl Apr 21, 2020
climbfuji pushed a commit to climbfuji/GFDL_atmos_cubed_sphere that referenced this pull request Apr 24, 2024
…create-tp-core-driver

Feature/pchakrab/NCAR#12 create tp core driver
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants