Skip to content

ERF - add support for Noah-MP Land Surface Model #2774

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

Merged
becker33 merged 7 commits into from
Jan 16, 2026
Merged

ERF - add support for Noah-MP Land Surface Model #2774

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f46527a
ERF package test in CI
larenspear Nov 11, 2025
c6858ff
Remove extra spec
larenspear Nov 11, 2025
9a22f1e
Merge branch 'develop' of https://github.com/larenspear/spack-package…
larenspear Dec 15, 2025
266916d
NoahMP Submodule
larenspear Dec 15, 2025
bdf1e1c
Delete .github/workflows/erf_test.yml
larenspear Dec 15, 2025
fab8a0f
Black formatting
larenspear Dec 15, 2025
e0ccc76
with when -> spec satisfies
larenspear Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 35 additions & 23 deletions repos/spack_repo/builtin/packages/erf/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
from spack.package import *


def submodules(package):
submodules = []

if package.spec.satisfies("+noahmp"):
submodules.append("Submodules/Noah-MP")

return submodules


class Erf(CMakePackage, CudaPackage):
"""ERF solves the compressible Navier-Stokes on a Arakawa C-grid
for large-scale weather modeling.
Expand All @@ -22,29 +31,29 @@ def url_for_version(self, v):

license("BSD-3-Clause", checked_by="larenspear")

version("25.12", tag="25.12")
version("25.11", tag="25.11")
version("25.10", tag="25.10")
version("25.08", tag="25.08")
version("25.07", tag="25.07")
version("25.06", tag="25.06")
version("25.05", tag="25.05")
version("25.04", tag="25.04")
version("25.03", tag="25.03")
version("25.01", tag="25.01")
version("24.11", tag="24.11")
version("24.10", tag="24.10")
version("24.09", tag="24.09")
version("24.08", tag="24.08")
version("24.06", tag="24.06")
version("24.05", tag="24.05")
version("24.04", tag="24.04")
version("24.03", tag="24.03")
version("24.02", tag="24.02")
version("24.01", tag="24.01")
version("23.12", tag="23.12")
version("23.11", tag="23.11")
version("23.10", tag="23.10")
version("25.12", tag="25.12", submodules=submodules)
version("25.11", tag="25.11", submodules=submodules)
version("25.10", tag="25.10", submodules=submodules)
version("25.08", tag="25.08", submodules=submodules)
version("25.07", tag="25.07", submodules=submodules)
version("25.06", tag="25.06", submodules=submodules)
version("25.05", tag="25.05", submodules=submodules)
version("25.04", tag="25.04", submodules=submodules)
version("25.03", tag="25.03", submodules=submodules)
version("25.01", tag="25.01", submodules=submodules)
version("24.11", tag="24.11", submodules=submodules)
version("24.10", tag="24.10", submodules=submodules)
version("24.09", tag="24.09", submodules=submodules)
version("24.08", tag="24.08", submodules=submodules)
version("24.06", tag="24.06", submodules=submodules)
version("24.05", tag="24.05", submodules=submodules)
version("24.04", tag="24.04", submodules=submodules)
version("24.03", tag="24.03", submodules=submodules)
version("24.02", tag="24.02", submodules=submodules)
version("24.01", tag="24.01", submodules=submodules)
version("23.12", tag="23.12", submodules=submodules)
version("23.11", tag="23.11", submodules=submodules)
version("23.10", tag="23.10", submodules=submodules)

variant("mpi", default=False, description="Enable MPI support")
variant("openmp", default=False, description="Enable OpenMP support")
Expand All @@ -54,6 +63,7 @@ def url_for_version(self, v):
variant("tests", default=False, description="Enable tests")
variant("fcompare", default=False, description="Enable fcompare")
variant("fft", default=False, description="Enable FFT support")
variant("noahmp", default=False, description="Enable Noah-MP")

with default_args(type="build"):
depends_on("[email protected]:")
Expand Down Expand Up @@ -92,6 +102,8 @@ def cmake_args(self):
self.define_from_variant("ERF_BUILD_TESTS", "tests"),
self.define_from_variant("ERF_BUILD_FCOMPARE", "fcompare"),
self.define_from_variant("ERF_ENABLE_FFT", "fft"),
self.define_from_variant("ERF_ENABLE_NOAHMP", "noahmp"),
self.define("ERF_DIM", "3"),
self.define("ERF_USE_INTERNAL_AMREX", False),
self.define("ERF_CLONE_AMREX", False),
self.define("GIT_SUBMODULE_PROTOCOL", "https"),
Expand Down
Loading