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.

Sign up for GitHub

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

Jump to bottom

Merge public v2 #295

Merged
merged 59 commits into from
Apr 19, 2021
Merged

Merge public v2 #295

merged 59 commits into from
Apr 19, 2021

Conversation

fossell
Copy link
Contributor

@fossell fossell commented Apr 9, 2021 •
edited
Loading

This commit merges the release/public-v2 branch into develop and resolves Issue #295. Changes are minimal and include:

  • Updates to documentation files
  • Updating naming convention in parm/makefile to be consistent with LAM (SAR --> LAM)
  • Removal of community build mechanisms including removal of comlibs directory and crtm submodule
  • Renaming community run script to be consistent with executable name
  • Updates to module files for Odin and Stampede platforms

hertneky and others added 30 commits August 17, 2020 16:33
@hertneky
Add grib2 output tables for MRW/SRW to InputOutput documentation
a28db0f
@hertneky
Include a variety of examples for regridding instead of a single gene…
491f2d2 
…ric example
@hertneky
Minor mod to Acknowledgments
4123463
@ericaligo-NOAA @fossell
Replace cld_amt, the 3D cloud fraction from the GFDL mp with the same…
3a1595d 
… field for all (NOAA-EMC#170)

microphysics schemes, cldfra.
@fossell
Merge pull request NOAA-EMC#177 from fossell/release/public-v2
ba89a7d 
Cherry-pick NOAA-EMC#170 cloud fraction mod for FV3LAM
@fossell
Merge pull request NOAA-EMC#164 from hertneky/v2_doc_mods
bacadb2 
Documentation modifications for release/public-v2
@DusanJovic-NOAA @fossell
Add (gnu) compiler option to allow argument mismatch. (NOAA-EMC#179)
b660c45 
gfortran 10.x treats argument mismatch as error
@fossell
Merge pull request NOAA-EMC#180 from fossell/release/public-v2
33fd887 
Add (gnu) compiler option to allow argument mismatch. (NOAA-EMC#179)
@hertneky
Change control files names fv3sar->fv3lam to be in-line with SRW release
54111a6
@hertneky
Change flat file names fv3sar->fv3lam
b2d5abe
@fossell
Merge pull request NOAA-EMC#188 from hertneky/v2_config_naming
abb393e 
Change nomenclature of SAR config files to use "LAM" instead of "SAR"  per SRW team.
@ywangwof
Updated support on Odin & Stampede to use NCEPLIBS public-v2 release
0e6bdd1
@fossell
Merge pull request NOAA-EMC#194 from ywangwof/release/public-v2_odin
9d4eb19 
Updated support on Odin & Stampede to use NCEPLIBS public-v2 release
@fossell
Change executable name of cmake build for public-v2 to be ncep_post, …
0011769 
…consistent with other applications
@climbfuji
Update submodule pointer for CMakeModules to fix linker problem again…
8c7c01f 
…st static NetCDF libraries
@climbfuji
Merge pull request NOAA-EMC#198 from climbfuji/release_public_v2_upda…
201a197 
…te_cmakemodules

release/public-v2: fix problem linking to static NetCDF libraries
@fossell
Merge remote-tracking branch 'upstream/release/public-v2' into releas…
acc5eff 
…e/public-v2
@fossell
Merge pull request NOAA-EMC#197 from fossell/release/public-v2
459ad72 
Unify the public-v2 executable name
@fossell
Starting UPP version numbers with 10.0.0 for develop branch
0c97410
@fossell
Starting release/public-v2 branch with UPP version 9.0.0
3965966
@fossell
Merge pull request NOAA-EMC#203 from fossell/release/public-v2
2689a70 
Starting release/public-v2 branch with UPP version 9.0.0
@fossell
Remove old community build libraries and gnu make utilities
7675b82
@fossell
Remove configure/compile/clean utilties for old community build
95d4ad5
@hertneky
Modified UPP stand-alone run script with name change to run_upp
6dd7d58
@fossell
Merge pull request NOAA-EMC#214 from hertneky/v2_script_mods
c0899ed 
Modified UPP stand-alone run script with name change to run_upp
@fossell
Merge remote-tracking branch 'upstream/release/public-v2' into remove…
088f5fb 
…_old_comm_build
@fossell
Merge remote-tracking branch 'upstream/develop' into develop
b16a92f
@fossell
Merge remote-tracking branch 'upstream/develop' into develop
7cd8794
@WenMeng-NOAA @fossell
Bug fix for FV3 LAM/LAMX (NOAA-EMC#219)
d3199e8 
* Fix of total cloud fraction in CLDRAD.f for FV3/LAMX.

* Setting  iSF_SURFACE_PHYSICS as 2 in regional FV3 read interface.
@fossell
Merge pull request NOAA-EMC#221 from fossell/release/public-v2
bff872f 
Bug fix for FV3 LAM/LAMX (NOAA-EMC#219)
@fossell
Copy link
Contributor Author

fossell commented Apr 9, 2021

@ywangwof - Can you please confirm the changes you added in public-v2 for Odin and Stampede module files are still correct and should be merged into develop branch?

@ywangwof
Copy link
Contributor

ywangwof commented Apr 9, 2021

@ywangwof - Can you please confirm the changes you added in public-v2 for Odin and Stampede module files are still correct and should be merged into develop branch?

As I understand, we will not need those changes because we are using cmake to build the programs and the configuration will be handled in the SRW app level, right?

mkavulich
mkavulich approved these changes Apr 9, 2021
View reviewed changes
Copy link
Contributor

@mkavulich mkavulich 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; my comments are very minor text changes, just things I noticed while reading through.

docs/Installation.rst Show resolved Hide resolved
docs/Regridding.rst Outdated Show resolved Hide resolved
@WenMeng-NOAA WenMeng-NOAA linked an issue Apr 12, 2021 that may be closed by this pull request
Merge release/public-v2 #292
Closed
@WenMeng-NOAA WenMeng-NOAA mentioned this pull request Apr 12, 2021
Closed
@fossell
Copy link
Contributor Author

fossell commented Apr 12, 2021

@ywangwof - Can you please confirm the changes you added in public-v2 for Odin and Stampede module files are still correct and should be merged into develop branch?

As I understand, we will not need those changes because we are using cmake to build the programs and the configuration will be handled in the SRW app level, right?

@ywangwof - Yes if using the SRW app, set up and build is handled there and via cmake. I can revert these changes then if not needed.

@fossell fossell linked an issue Apr 12, 2021 that may be closed by this pull request
Can CRTM submodule be deleted? #281
Closed
@fossell
Revert module files for Odin and Stampede per ywangwof since build en…
517dae2 
…v is handled at app level for these machines
@fossell
Copy link
Contributor Author

fossell commented Apr 12, 2021

@WenMeng-NOAA - Code passed reg tests on Hera. Ready for your final review.

hertneky
hertneky approved these changes Apr 12, 2021
View reviewed changes
Copy link
Contributor

@hertneky hertneky left a comment

Choose a reason for hiding this comment

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

This looks good to me.

@WenMeng-NOAA
Copy link
Collaborator

@fossell The changes look good to me. I will schedule merging after the PR #294.

@WenMeng-NOAA
Copy link
Collaborator

@fossell It might take more time for tweaking the PR #294. I am thinking merging your PR first. Please let me know if this plan works to you.

@fossell
Copy link
Contributor Author

fossell commented Apr 19, 2021

@WenMeng-NOAA - Yes, that is fine with me. Just let me know what I can do to help.

@WenMeng-NOAA
Copy link
Collaborator

@fossell After your branch is synced, I will start to the regression tests.
Also Yali updated her current issue in the issue #272, please let us know if the DTC could help that. Thanks!

@fossell
Copy link
Contributor Author

fossell commented Apr 19, 2021

@WenMeng-NOAA - Branch has been updated.

WenMeng-NOAA
WenMeng-NOAA reviewed Apr 19, 2021
View reviewed changes
parm/makefile Outdated Show resolved Hide resolved
@WenMeng-NOAA
Copy link
Collaborator

The UPP regression tests were conducted on WCOSS and Hera. No changed results were found. This PR is ready for merging.

@WenMeng-NOAA WenMeng-NOAA merged commit 557ab31 into NOAA-EMC:develop Apr 19, 2021
@WenMeng-NOAA WenMeng-NOAA mentioned this pull request Apr 19, 2021
Closed
@fossell
Copy link
Contributor Author

fossell commented Apr 22, 2021

@fossell After your branch is synced, I will start to the regression tests.
Also Yali updated her current issue in the issue #272, please let us know if the DTC could help that. Thanks!

@WenMeng-NOAA - I have not had a chance to look at issue #272. Our planning year ends next week so we are working on finishing up final tasks. But I will try to look as soon as I can.

EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request Dec 14, 2022
@gsketefian
Add new subconus 3km predefined grid; add WE2E tests for this and the…
fbd2826 
… GSD_HRRR25km grid. (NOAA-EMC#295)

## DESCRIPTION OF CHANGES: 
* Add new subconus 3km grid of ESGgrid type named GSD_SUBCONUS3km.
* Allow this as well as the GSD_HRRR25km, GSD_HRRR13km, and GSD_RAP13km grids to run in NCO mode.
* Add new WE2E test for the GSD_SUBCONUS3km grid in NCO mode named nco_GSD_SUBCONUS3km_HRRRX_RAPX.
* Add new WE2E test for the GSD_HRRR25km grid in NCO mode named nco_GSD_HRRR25km_HRRRX_RAPX.

## TESTS CONDUCTED: 
Ran the two new WE2E tests on hera -- nco_GSD_SUBCONUS3km_HRRRX_RAPX and nco_GSD_HRRR25km_HRRRX_RAPX.  Both completed successfully.  The changes do not affect any of the other WE2E tests, so those were not run.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkavulich mkavulich mkavulich approved these changes

@hertneky hertneky hertneky approved these changes

@WenMeng-NOAA WenMeng-NOAA WenMeng-NOAA approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge release/public-v2 Can CRTM submodule be deleted?
8 participants
@fossell @ywangwof @WenMeng-NOAA @mkavulich @hertneky @ericaligo-NOAA @DusanJovic-NOAA @climbfuji