Skip to content

Sync Develop 2024-12-12 to dev/ufs-weather-model #1381

Merged
JessicaMeixner-NOAA merged 30 commits into
NOAA-EMC:dev/ufs-weather-modelfrom
JessicaMeixner-NOAA:SyncDev2UFS_20241212
Mar 19, 2025
Merged

Sync Develop 2024-12-12 to dev/ufs-weather-model #1381
JessicaMeixner-NOAA merged 30 commits into
NOAA-EMC:dev/ufs-weather-modelfrom
JessicaMeixner-NOAA:SyncDev2UFS_20241212

Conversation

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA commented Feb 24, 2025

Pull Request Summary

Next segment of syncing develop to dev/ufs-weather-model, no answer changes.

Description

Merge the next segment of develop to dev/ufs-weather-model, which has no answer changes.

Issue(s) addressed

Commit Message

Sync Develop 2024-12-12 to dev/ufs-weather-model

(Note to self: Don't forget to use merge commit, not squash merge)

Check list

Testing

  • How were these changes tested? These tests were tested via the ufs-weather-model. New mod_defs were used:
    /scratch1/NCEPDEV/climate/Jessica.Meixner/PR_WW3/syncdev2ufs/WW3_input_01

Testing: https://github.com/JessicaMeixner-NOAA/ufs-weather-model/tree/WW3_nochangesync
RegressionTests_hera.log

The test_changes.list file is blank.

  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?): matrix is not run as these were run in the develop branch.

  • Have the matrix regression tests been run (if yes, please note HPC and compiler)? no used ufs-wetaher-model.

  • Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)

  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):

mickaelaccensi and others added 30 commits January 16, 2024 12:49
…ST4 code (NOAA-EMC#1124)

Co-authored-by: Fabrice Ardhuin <fabrice.ardhuin@ifremer.fr>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
…ompiled with the OMPG switch. Also fixes truncation of build.log when running run_cmake_build. (NOAA-EMC#1191)

* Added screen output showing number of threads when OMP enabled.

* update build to get more info in logs (NOAA-EMC#46)

---------

Co-authored-by: Jessica Meixner <jessica.meixner@noaa.gov>
Co-authored-by: Fabrice Ardhuin <fabrice.ardhuin@ifremer.fr>
Co-authored-by: Nicholas Szapiro <149816583+NickSzapiro-NOAA@users.noreply.github.com>
…OAA-EMC#1230)

---------

Co-authored-by: Edward Hartnett <edward.hartnett@noaa.gov>
Co-authored-by: Matthew Masarik <Matthew.Masarik@noaa.gov>
Co-authored-by: saeideh banihashemi <saeideh.banihashemi@clogin02.cactus.wcoss2.ncep.noaa.gov>
Co-authored-by: Ty Hesser <thesser1@gmail.com>
Co-authored-by: Tyler James Hesser <thesser1@carpenter09.hsn.ex4000.erdc.hpc.mil>
 Based on Meylan Horvat Bitz and Bennetts, Ocean Modelling, 2021. 

Co-Authors include: Erin Thomas, Cecilia Bitz, David Bailey, Nick Szapiro.
Co-authored-by: Erin Thomas <ac.ethomas@chrlogin1.lcrc.anl.gov>
 Conflicts:
	model/inp/ww3_ounf.inp
	model/src/w3gdatmd.F90
	model/src/w3gridmd.F90
	model/src/w3initmd.F90
	model/src/w3iogomd.F90
	model/src/w3iogrmd.F90
	model/src/w3sic4md.F90
	model/src/w3src4md.F90
@JessicaMeixner-NOAA
Copy link
Copy Markdown
Collaborator Author

UFS-PR: ufs-community/ufs-weather-model#2621

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.

Code review
Pass

Testing
Pass

UFS RTs run with no failures.

RegressionTests_hera.log.txt
test_changes.list.txt

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Collaborator Author

This PR's UFS PR (ufs-community/ufs-weather-model#2621) is now combined into ufs-community/ufs-weather-model#2503

@JessicaMeixner-NOAA JessicaMeixner-NOAA merged commit d040ccf into NOAA-EMC:dev/ufs-weather-model Mar 19, 2025
@JessicaMeixner-NOAA JessicaMeixner-NOAA deleted the SyncDev2UFS_20241212 branch April 28, 2025 15:49
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.

10 participants