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 develop up to 2024-01-11 to dev/ufs-weather-model #1342

Merged
merged 27 commits into from
Jan 14, 2025
Merged

Merge develop up to 2024-01-11 to dev/ufs-weather-model #1342

merged 27 commits into from
Jan 14, 2025
+6,373 −962

Conversation

JessicaMeixner-NOAA
Copy link
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA commented Jan 6, 2025 •
edited
Loading

Pull Request Summary

Merge develop branch up to commit date on 2024-01-11 to dev/ufs-weather-model

Description

Merge develop branch up to commit date on 2024-01-11 to dev/ufs-weather-model . This is the first in a sequence of PRs updating dev/ufs-weather-model with updates from develop.

Issue(s) addressed

None

Commit Message

Merge develop up to 2024-01-11 to dev/ufs-weather-model

Check list

Testing

  • How were these changes tested? in ufs-weather-model, see ufs-weather-model PR Merge develop of WW3 up to 2024-01-11 to dev/ufs-weather-model #1342 ufs-community/ufs-weather-model#2549
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)?
  • 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 27 commits July 31, 2023 11:38
@mickaelaccensi
minor bugfix for matrix grepping on keywords (NOAA-EMC#1049)
1cacc43
@benoitp-cmc
Stop masking group 1 output where icec > icen (NOAA-EMC#1019)
dcafc8c
@MatthewMasarik-NOAA
Doxygen documentation added, 8th subset.(NOAA-EMC#1046)
2715a9e
@Ghazal-Mohammadpour
NC4 ,F90 ,XX0 switches removed from ww3_tp2.19 regtest (NOAA-EMC#1054)
b810a89
@MatthewMasarik-NOAA
CI: Fix for Intel scripts. GNU scripts updated. (NOAA-EMC#1064)
991daf8
@mickaelaccensi
correct the computation of QP parameter, add QKK output parameter, ch…
6b9edfa 
…ange UST scale factor (NOAA-EMC#1050)
@mickaelaccensi
correct issue with ww3_multi when requesting restart2 and using nml f…
8589d12 
…ile instead of inp file (NOAA-EMC#1070)
@mickaelaccensi
correct calendar for track netcdf output (NOAA-EMC#1079)
7bbdaca
@ukmo-ccbunney
Fix missing mod_def.ww3 file in multigrid regression tests for track …
b1356dd 
…output (NOAA-EMC#1091)
@MatthewMasarik-NOAA
STAB3: fix cmake build for ST4 or ST3 (NOAA-EMC#1086)
d22b7bb
@mickaelaccensi
new feature to output out_grd.ww3, out_pnt.ww3 and mod_def.ww3 both i…
eff6686 
…n binary and ascii format using switch ASCII. (NOAA-EMC#1089)
@ukmo-ccbunney
Update local unit number arrays (NDS, MDS) to be same size of array d…
d148d09 
…efined in w3odatmd (size=15). Also, defined unit numbers for NDS(14) and NDS(15). (NOAA-EMC#1098)
@ukmo-ccbunney
Removed code referencing PHIOC in output section for PHICE in ww3_ounf (
66262f6 
NOAA-EMC#1093)
@mickaelaccensi
implementation of the GQM (Gaussian Quadrature Method) to replace the…
8eb3596 
… DIA in NL1 or NL2. (NOAA-EMC#1083)
@JessicaMeixner-NOAA
update logic to ensure you are not accessing uninitialized dates (NOA…
4cd995d 
…A-EMC#1114)
@ukmo-ccbunney
Initialised S and D arrays in W3SDB1 before potential early return if…
c3451a9 
… zero energy. (NOAA-EMC#1115)
@Biao-Zhao
ww3_ounp.F90: x/y units attribute corrected from 'm' to 'km' (NOAA-EM…
f702a8f 
…C#1088)
@ukmo-ccbunney
Bugfix: Assign unit numbers to ASCII gridded/point output in multi-gr…
1f928aa 
…id mode. (NOAA-EMC#1118)
@mickaelaccensi
correct bugs to run correctly GQM implementation (NOAA-EMC#1127)
d90078b
@edwardhartnett
Adding documentation to w3iopo() in preparation for code for NOAA-EMC…
3f35df7 
…#682. (NOAA-EMC#1131)
@MatthewMasarik-NOAA
NCEP regtest module updates: uses spack-stack/1.5.0, includes scotch/…
ff1b9e9 
…7.0.4 (NOAA-EMC#1137)
@JessicaMeixner-NOAA
Minor update to ncep regtests (NOAA-EMC#1138)
d3ea810
@edwardhartnett
Updated intel workflow to install oneapi compilers from new location. (…
88c89be 
…NOAA-EMC#1157)
@edwardhartnett
Add unit test for points I/O code. (NOAA-EMC#1158)
7bec560
@AlexanderRichert-NOAA
Update Intel CI (relocate /usr/local; ensure intel-oneapi-mpi; use ub…
63f8270 
…untu-latest) (NOAA-EMC#1161)
@JessicaMeixner-NOAA
Merge branch 'WW3develop20240111' into devufs20241211develop20240111
2e49d78 
 Conflicts:
	.github/workflows/intel.yml
	model/src/w3initmd.F90
	model/src/w3iogomd.F90
	model/src/w3ounfmetamd.F90
@JessicaMeixner-NOAA
update mds 13->15
174cf7b
This was referenced Jan 6, 2025
Closed
Open
@grantfirl grantfirl mentioned this pull request Jan 14, 2025
Merged
15 tasks
sbanihash
sbanihash approved these changes Jan 14, 2025
View reviewed changes
Copy link
Collaborator

@sbanihash sbanihash left a comment

Choose a reason for hiding this comment

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

Changes have been reviewed. Build test in standalone and within the ufs-wm structure have been passed successfully. I approve this PR

@sbanihash sbanihash merged commit d61564b into NOAA-EMC:dev/ufs-weather-model Jan 14, 2025
2 of 4 checks passed
@BrianCurtis-NOAA
Copy link

I think UFSWM would prefer we finish our testing before this merging takes place, in case something happens over there and we need to revert something with WW3.

sbanihash added a commit that referenced this pull request Jan 14, 2025
@sbanihash
Revert "Merge develop up to 2024-01-11 to dev/ufs-weather-model (#1342)"
4abf779 
This reverts commit d61564b.
@sbanihash
Copy link
Collaborator

@BrianCurtis-NOAA will revert this then.

@BrianCurtis-NOAA
Copy link

@JessicaMeixner-NOAA The previous WW3_input_data was 20240214, so I just wanted to verify that we are going back in time with 20240111 ?

@BrianCurtis-NOAA
Copy link

@BrianCurtis-NOAA will revert this then.

No need to right now, let's see how testing goes first.

@JessicaMeixner-NOAA
Copy link
Collaborator Author

@JessicaMeixner-NOAA The previous WW3_input_data was 20240214, so I just wanted to verify that we are going back in time with 20240111 ?

Feel free to move it to a different date. It was my nomenclature and is not consistent with the way the other inputs are numbered.

@BrianCurtis-NOAA
Copy link

@JessicaMeixner-NOAA The previous WW3_input_data was 20240214, so I just wanted to verify that we are going back in time with 20240111 ?

Feel free to move it to a different date. It was my nomenclature and is not consistent with the way the other inputs are numbered.

How should we number it? 20250114 ? Will that hurt/break anything? The number would be set based on when the new data will be "viable" for UFSWM and that date forward.

@JessicaMeixner-NOAA
Copy link
Collaborator Author

@BrianCurtis-NOAA that works! Sorry for this oversight on my part, I saw it but then forgot about it. This will not hurt anything - we just need to make sure we point to the correct date in rt.sh.

@DeniseWorthen
Copy link
Contributor

DeniseWorthen commented Jan 17, 2025 •
edited
Loading

@JessicaMeixner-NOAA Did you mean to merge dev/ufs-weather-model prior to the UWM PR being committed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbanihash sbanihash sbanihash 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.