search

E3SM-Project / E3SM

Energy Exascale Earth System Model source code. NOTE: use "maint" branches for your work. Head of master is not validated.
https://docs.e3sm.org/E3SM
Other
334 stars 334 forks source link

Point to ekat master branch, and fix usage of deprecated kokkos code in Homme #6421

Closed bartgol closed 2 weeks ago

bartgol commented 2 weeks ago

We just merged the kokkos-4.2 branch in ekat/master, so now we can make e3sm point directly to the ekat/master branch, which avoids conflicts when doing a downstream merge into scream repo.

Also, fix usage of deprecated kokkos code in Homme. The tests on e3sm repo are set so that Kokkos allows using deprecated code (with warnings), but it caused some errors downstream in eamxx. Using the non-deprecated code is a simple fix.

github-actions[bot] commented 2 weeks ago

PR Preview Action v1.4.7 :---: :rocket: Deployed preview to https://E3SM-Project.github.io/E3SM/pr-preview/pr-6421/ on branch gh-pages at 2024-05-16 02:31 UTC

jgfouca commented 2 weeks ago

Merged to next.

jgfouca commented 2 weeks ago

Should I merge to master or hold off? I assume the additional cmake modification should be made in this PR.

bartgol commented 2 weeks ago

@noel has another PR where he adds the mod to mueller mach file. Since mueller is not part of nightly testing, it's ok to do a separate merge (or merge here, whatever).

That said, I haven't checked whether the next failures have anything to do with this PR (though I doubt it). If you can quickly figure that out, then we can merge.

jgfouca commented 2 weeks ago

The new failures were just some DIFFs for lnd compsets. I will merge.