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

Intel CI bugfix #1064

Merged
merged 17 commits into from
Sep 2, 2023
Merged

Intel CI bugfix #1064

merged 17 commits into from
Sep 2, 2023

Conversation

MatthewMasarik-NOAA
Copy link
Collaborator

@MatthewMasarik-NOAA MatthewMasarik-NOAA commented Sep 1, 2023 •
edited
Loading

Pull Request Summary

Fixes the broken Intel CI scripts.

Description

This fixes the Intel CI scripts which had been broken. The GNU CI scripts were also adjusted to make the two as similar as possible.

Please also include the following information:

  • Add any suggestions for a reviewer
  • Mention any labels that should be added:
    • bug
  • Are answer changes expected from this PR?
    • No. Only changes to CI scripts running on the github server were made.
  • Co-authors:

Issue(s) addressed

Commit Message

CI: fix for Intel scripts. GNU scripts updated.

Check list

Testing

  • How were these changes tested?
    • Testing occurred by running the CI scripts on the Github server.
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
    • No. These changes do not affect the regtests. Only changes to CI scripts were made.
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)?
    • No. None of the changes would be exercised by the regression tests.
  • Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
    • No changes expected.
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):
    • In this case (CI only changes), regression testing is not necessary.

@MatthewMasarik-NOAA
fix attempt for ci, 1
bc519ea
@MatthewMasarik-NOAA
intel.yml: cache_key decrement, previously +2
525ad98
@MatthewMasarik-NOAA
ci: [email protected] and [email protected]
cd326d5
@MatthewMasarik-NOAA
ci: [email protected]
1dd620f
@MatthewMasarik-NOAA
intel.yml - cache@v2 --> cache@v3
fb98e89
@MatthewMasarik-NOAA
intel.yml: checkout@v2 --> checkout@v3
6074255
@MatthewMasarik-NOAA
intel.yml: bash command sourcing for attempted fix
ea380ce
@MatthewMasarik-NOAA
intel ci updates: ufs_utils example
9393164
@MatthewMasarik-NOAA
revert setvars sourcing to original
a52a6a2
@MatthewMasarik-NOAA
woops, needed to update the cache key
0cd374f
@MatthewMasarik-NOAA
intel.yml - remove "make install"
6d4ffe3
@MatthewMasarik-NOAA
cache_key updates for gnu/intel - used a number (10) based on current…
0ad68b8 
… numbers, and having gnu and intel keys the same
@MatthewMasarik-NOAA
intel.yml - remove bugfix line for /usr/local
d1ad578
@MatthewMasarik-NOAA
intel.yml: spack repo, NOAA-EMC --> JCSDA
30109a5
@MatthewMasarik-NOAA
gnu.yml - updates to bring in line with updates to intel.yml
6abbd70
@MatthewMasarik-NOAA
intel.yml - typo JCDSA --> JCSDA
9e78c8e
@MatthewMasarik-NOAA
gnu.yml - ugh, 1st attempt fixing introduced GNU issue
19833d2
@MatthewMasarik-NOAA MatthewMasarik-NOAA merged commit 991daf8 into NOAA-EMC:develop Sep 2, 2023
20 checks passed
@MatthewMasarik-NOAA
Copy link
Collaborator Author

In my haste yesterday I left off intended co-authors, @AlexanderRichert-NOAA and @aerorahul. My apologies, I updated the PR header at least. Thank you Alex and Rahul.

@MatthewMasarik-NOAA MatthewMasarik-NOAA deleted the bugfix/ci branch September 3, 2023 01:19
@MatthewMasarik-NOAA MatthewMasarik-NOAA mentioned this pull request Sep 6, 2023
Merged
2 tasks
miguelsolanocordoba added a commit to wavespotter/WW3 that referenced this pull request Apr 19, 2024
@miguelsolanocordoba @ukmo-ccbunney
@mickaelaccensi @benoitp-cmc @MatthewMasarik-NOAA @Ghazal-Mohammadpour @JessicaMeixner-NOAA @Biao-Zhao @edwardhartnett @AlexanderRichert-NOAA @ErickRogers @DeniseWorthen @camilleanne
Re-base with NOAA-EMC and fix gustiness (#15)
6334796 
* Bugfix - initialised VD and VS to zero in w3srcemd. (NOAA-EMC#1037)

* More efficient test for binary files in matrix.comp (NOAA-EMC#1035)

* Tidy up of pre-processor directives and unused variables in w3srcemd.F90 (NOAA-EMC#1010)

* Correct typo in w3srcemd.F90 pre-processor directive. (NOAA-EMC#1039)

* minor bugfix for matrix grepping on keywords (NOAA-EMC#1049)

* Stop masking group 1 output where icec > icen (NOAA-EMC#1019)

* Doxygen documentation added, 8th subset.(NOAA-EMC#1046)

* NC4 ,F90 ,XX0 switches removed from ww3_tp2.19 regtest (NOAA-EMC#1054)

* CI:  Fix for Intel scripts. GNU scripts updated. (NOAA-EMC#1064)

* correct the computation of QP parameter, add QKK output parameter, change UST scale factor (NOAA-EMC#1050)

* correct issue with ww3_multi when requesting restart2 and using nml file instead of inp file (NOAA-EMC#1070)

* correct calendar for track netcdf output (NOAA-EMC#1079)

* Fix missing mod_def.ww3 file in multigrid regression tests for track output (NOAA-EMC#1091)

* STAB3: fix cmake build for ST4 or ST3 (NOAA-EMC#1086)

* new feature to output out_grd.ww3, out_pnt.ww3 and mod_def.ww3 both in binary and ascii format using switch ASCII. (NOAA-EMC#1089)

* Update local unit number arrays (NDS, MDS) to be same size of array defined in w3odatmd (size=15). Also, defined unit numbers for NDS(14) and NDS(15). (NOAA-EMC#1098)

* Removed code referencing PHIOC in output section for PHICE in ww3_ounf (NOAA-EMC#1093)

* implementation of the GQM (Gaussian Quadrature Method) to replace the DIA in NL1 or NL2. (NOAA-EMC#1083)

* update logic to ensure you are not accessing uninitialized dates (NOAA-EMC#1114)

* Initialised S and D arrays in W3SDB1 before potential early return if zero energy. (NOAA-EMC#1115)

* ww3_ounp.F90:  x/y units attribute corrected from 'm' to 'km' (NOAA-EMC#1088)

* Bugfix: Assign unit numbers to ASCII gridded/point output in multi-grid mode. (NOAA-EMC#1118)

* correct bugs to run correctly GQM implementation (NOAA-EMC#1127)

* Adding documentation to w3iopo() in preparation for code for NOAA-EMC#682. (NOAA-EMC#1131)

* NCEP regtest module updates: uses spack-stack/1.5.0, includes scotch/7.0.4 (NOAA-EMC#1137)

* Minor update to ncep regtests (NOAA-EMC#1138)

* Updated intel workflow to install oneapi compilers from new location. (NOAA-EMC#1157)

* Add unit test for points I/O code. (NOAA-EMC#1158)

* Update Intel CI (relocate /usr/local; ensure intel-oneapi-mpi; use ubuntu-latest) (NOAA-EMC#1161)

* remove lookup table for ST4 to speed up computation and clean up the ST4 code (NOAA-EMC#1124)

Co-authored-by: Fabrice Ardhuin <[email protected]>

* initialize USSP_WN for mod_def (NOAA-EMC#1165)

* Introduce IC4M8 and IC4M9 to WW3 (NOAA-EMC#1176)

* clean up and add ST4 variables (NOAA-EMC#1181)

* w3fld1md.F90: fix divide by zero in CRIT2 parameter (NOAA-EMC#1184)

* ww3_prnc.F90: fix out-of-scope grid index write statement (NOAA-EMC#1185)

* Bugfix: address potential divide-by-zero in APPENDTAIL (NOAA-EMC#1188)

Co-authored-by: Denise Worthen <[email protected]>

* Provide initial drying of cells with depth < ZLIM for SMC grid. (NOAA-EMC#1192)

* Output OMP threading info to screen when running ww3_shel/ww3_multi compiled 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 <[email protected]>

* update run_cmake_test to catch build errors and exit (NOAA-EMC#1194)

* fix merge conflicts

* Fix gustiness bug, as suggst by Pieter

* Change USTARsigma to WAM implementation

---------

Co-authored-by: Chris Bunney <[email protected]>
Co-authored-by: Mickael Accensi <[email protected]>
Co-authored-by: Benoit Pouliot <[email protected]>
Co-authored-by: Matthew Masarik <[email protected]>
Co-authored-by: Ghazal-Mohammadpour <[email protected]>
Co-authored-by: Jessica Meixner <[email protected]>
Co-authored-by: Biao Zhao <[email protected]>
Co-authored-by: Edward Hartnett <[email protected]>
Co-authored-by: Alex Richert <[email protected]>
Co-authored-by: Fabrice Ardhuin <[email protected]>
Co-authored-by: W. Erick Rogers <[email protected]>
Co-authored-by: Denise Worthen <[email protected]>
Co-authored-by: Camille Teicheira <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JessicaMeixner-NOAA JessicaMeixner-NOAA JessicaMeixner-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.

Fix Intel CI
2 participants
@MatthewMasarik-NOAA @JessicaMeixner-NOAA