Skip to content

Dev/gfdl_test to dev/gfdl#205

Merged
laurenchilutti merged 1 commit into
dev/gfdlfrom
dev/gfdl_test
Aug 1, 2022
Merged

Dev/gfdl_test to dev/gfdl#205
laurenchilutti merged 1 commit into
dev/gfdlfrom
dev/gfdl_test

Conversation

@laurenchilutti
Copy link
Copy Markdown
Member

Description

This PR merges dev/gfdl_test into dev/gfdl. The changes include GNU fixes and mixed mode updates

Fixes # (issue)

How Has This Been Tested?

Extensively tested during the FMS 2022.03 release testing
Checklist:

Please check all whether they apply or not

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

* mixed mode emc squash commit

Conflicts:
	driver/SHiELD/atmosphere.F90
	model/fv_dynamics.F90
	model/fv_update_phys.F90
	model/nh_core.F90
	model/nh_utils.F90
	tools/fv_nggps_diag.F90
	tools/test_cases.F90

* GNU compiler bug fix

* removing constants changes as these wont be needed on dev/gfdl
@laurenchilutti laurenchilutti requested a review from bensonr August 1, 2022 16:26
@laurenchilutti laurenchilutti merged commit 0d89349 into dev/gfdl Aug 1, 2022
laurenchilutti added a commit to laurenchilutti/GFDL_atmos_cubed_sphere that referenced this pull request Jan 24, 2023
* mixed mode emc squash commit

* GNU compiler bug fix

* removing constants changes as these wont be needed on dev/gfdl
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