Skip to content

Merge develop to dev/ufs-weather-model #914

Merged
JessicaMeixner-NOAA merged 15 commits into
NOAA-EMC:dev/ufs-weather-modelfrom
JessicaMeixner-NOAA:updatedevufs
Mar 13, 2023
Merged

Merge develop to dev/ufs-weather-model #914
JessicaMeixner-NOAA merged 15 commits into
NOAA-EMC:dev/ufs-weather-modelfrom
JessicaMeixner-NOAA:updatedevufs

Conversation

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA commented Feb 24, 2023 •
edited
Loading

Pull Request Summary

Merge updates from develop to dev/ufs-waether-model

Description

Merging various updates from develop to dev/ufs-waether-model, including:

  • updates to how charnock is set for IC0 flag.

Please also include the following information:

  • Add any suggestions for a reviewer @MatthewMasarik-NOAA
  • Are answer changes expected from this PR? None

Issue(s) addressed

No issue, just routine merge from develop to dev/ufs-weather-dmoel

Commit Message

Merge develop to dev/ufs-weather-model branch

Check list

Testing

  • How were these changes tested? With ufs-weather-model tests hera intel and gnu:
    RegressionTests_hera.gnu.log
    RegressionTests_hera.intel.log
  • Are the changes covered by regression tests? yes
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)? Yes, all tests passed. No comparisons made as this was done within the develop branch PRs. This just confirmed the merge resolutions didn't unintentionally break anything.

MatthewMasarik-NOAA and others added 12 commits November 1, 2022 10:00
@MatthewMasarik-NOAA
doxygen documentation (NOAA-EMC#841)
e69325d
@MatthewMasarik-NOAA
wmmdatmd.F90: update MTAG parameters for 2022 compilers (NOAA-EMC#825)
43e95b4
@JessicaMeixner-NOAA
Set value of charn for IC0
ddbe944
@MatthewMasarik-NOAA
NCEP Regtest Intel compiler version updated to 2022 (NOAA-EMC#854)
7ebe5b9
@JessicaMeixner-NOAA
Fix ifdef bug from previous Charnock PR
616bf79
@DeniseWorthen
print_memcheck and general code clean up
bcde1d0
@alexrichert
Fix various CI failures for intel/ubuntu-latest
2ff38a0
@MatthewMasarik-NOAA
Update hpc-stack hera.intel module path to current UFS (NOAA-EMC#866)
ff7a2ee
@MatthewMasarik-NOAA
Doxygen documentation added, 7th subset. (NOAA-EMC#862)
bf02291
@ukmo-juan-castillo @ukmo-ccbunney
Fix duplicated calls to oasis_get happening in some mixed forced/coup…
5ebed91 
…led configurations (NOAA-EMC#858)

Co-authored-by: ukmo-chris.bunney <christopher.bunney@metoffice.gov.uk>
@MatthewMasarik-NOAA
Parmetis: update install paths for hera, orion (NOAA-EMC#892)
9c50455
@JessicaMeixner-NOAA
Merge remote-tracking branch 'origin/develop' into updatedevufs
30efb1c 
 Conflicts:
	.github/workflows/gnu.yml
	model/src/w3adatmd.F90
	model/src/w3initmd.F90
	model/src/w3profsmd_pdlib.F90
	model/src/w3updtmd.F90
	model/src/w3wavemd.F90
@JessicaMeixner-NOAA JessicaMeixner-NOAA mentioned this pull request Feb 24, 2023
Merged
37 tasks
JessicaMeixner-NOAA and others added 2 commits February 28, 2023 11:00
@JessicaMeixner-NOAA
Move Intel CI tests from ubuntu-latest to ubuntu-20.04 (NOAA-EMC#918)
a4fc630 
co-author: Matthew Masarik
@aliabdolali @JessicaMeixner-NOAA
@MatthewMasarik-NOAA @thesser1
Add SCOTCH library for geographical domain decomposition (NOAA-EMC#849)
ea0de58 
Co-authored-by: JessicaMeixner-NOAA <Jessica.Meixner@noaa.gov>
Co-authored-by: Matthew Masarik <Matthew.Masarik@noaa.gov>
Co-authored-by: Ty Hesser <thesser1@gmail.com>
MatthewMasarik-NOAA
MatthewMasarik-NOAA approved these changes Mar 2, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@MatthewMasarik-NOAA MatthewMasarik-NOAA left a comment

Choose a reason for hiding this comment

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

The code review looks good. Intel/Gnu RT logs show all tests pass. Approved.

@aronroland
Copy link
Copy Markdown
Collaborator

aronroland commented Mar 2, 2023

As for the regtesting I understood that all regtests will have changes due to the fact that the unstructured namelist is written also in the case of a regular regtest and I have changed it now.

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Collaborator Author

JessicaMeixner-NOAA commented Mar 2, 2023

As for the regtesting I understood that all regtests will have changes due to the fact that the unstructured namelist is written also in the case of a regular regtest and I have changed it now.

@aronroland I think you are confusing this PR for another.

@aronroland
Copy link
Copy Markdown
Collaborator

aronroland commented Mar 2, 2023

As for the regtesting I understood that all regtests will have changes due to the fact that the unstructured namelist is written also in the case of a regular regtest and I have changed it now.

ups, i hit the wrong button ... sorry!

MatthewMasarik-NOAA
MatthewMasarik-NOAA approved these changes Mar 2, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@MatthewMasarik-NOAA MatthewMasarik-NOAA left a comment

Choose a reason for hiding this comment

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

Update to PR

  • CI fix.
  • SCOTCH library for geographic domain decomposition.

These changes have passed testing separately in WW3 standalone.
For UFS RTs the updated logs from @JessicaMeixner-NOAA:

Re-approved.

@JessicaMeixner-NOAA JessicaMeixner-NOAA merged commit 29edfe2 into NOAA-EMC:dev/ufs-weather-model Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@MatthewMasarik-NOAA MatthewMasarik-NOAA MatthewMasarik-NOAA approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@JessicaMeixner-NOAA @aronroland @MatthewMasarik-NOAA @DeniseWorthen @alexrichert @ukmo-juan-castillo @aliabdolali