Skip to content

Remove crtm-fix/crtm 2.3.0_emc; fix directory structure of crtm-fix files (create symbolic links for backward compatibility) #43

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

Draft
climbfuji wants to merge 2 commits into
base: spack-stack-dev
Choose a base branch
from
Draft

Remove crtm-fix/crtm 2.3.0_emc; fix directory structure of crtm-fix files (create symbolic links for backward compatibility) #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276c1b3
Remove crtm-fix@2.3.0_emc and crtm@2.3.0_emc; update crtm-fix for all…
climbfuji Feb 19, 2026
26e64b9
Enable all CRTM tests
climbfuji Feb 20, 2026
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
10 changes: 2 additions & 8 deletions repos/spack_repo/builtin/packages/crtm/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Crtm(CMakePackage):

homepage = "https://www.jcsda.org/jcsda-project-community-radiative-transfer-model"
git = "https://github.com/JCSDA/crtm.git"
url = "https://github.com/JCSDA/crtm/archive/refs/tags/v2.3.0.tar.gz"
url = "https://github.com/JCSDA/crtm/archive/refs/tags/v2.4.0.tar.gz"

maintainers(
"BenjaminTJohnson",
Expand Down Expand Up @@ -66,8 +66,6 @@ class Crtm(CMakePackage):
version("2.4.0.1", tag="v2.4.0_emc.3", commit="7ecad4866c400d7d0db1413348ee225cfa99ff36")
# REL-2.4.0_emc (v2.4.0 ecbuild does not work)
version("2.4.0", commit="5ddd0d6b0138284764065feda73b5adf599082a2")
# Uses the tip of REL-2.3.0_emc branch
version("2.3.0", commit="99760e693ce3b90a3b3b0e97d80972b4dfb61196")

variant(
"fix", default=False, description='Download CRTM coefficient or "fix" files (several GBs).'
Expand All @@ -80,24 +78,20 @@ class Crtm(CMakePackage):
depends_on("cmake@3.20:", when="@3.1.3:", type="build")
depends_on("git-lfs", when="@:3.1.2")
depends_on("netcdf-fortran", when="@2.4.0:")
depends_on("netcdf-fortran", when="@v2.3")
depends_on("netcdf-fortran", when="@v2.4")
depends_on("netcdf-fortran", when="@v3")

depends_on("crtm-fix@2.3.0_emc", when="@2.3.0 +fix")
depends_on("crtm-fix@2.4.0_emc", when="@=2.4.0 +fix")
depends_on("crtm-fix@2.4.0.1_emc", when="@2.4.0.1 +fix")
depends_on("crtm-fix@3.1.1", when="@3.1.1 +fix")
depends_on("crtm-fix@3.1.2", when="@3.1.2 +fix")
# Note. crtm@3.1.3 uses crtm-fix@3.1.2
depends_on("crtm-fix@3.1.2", when="@3.1.3 +fix")

depends_on("ecbuild", type=("build"), when="@v2.3")
depends_on("ecbuild", type=("build"), when="@v2.4")
depends_on("ecbuild", type=("build"), when="@v3")

conflicts("%oneapi", when="@2")
conflicts("%oneapi", when="@v2.3")
conflicts("%oneapi", when="@v2.4-jedi")
conflicts("%oneapi", when="@=v2.4.1-jedi")
conflicts("%oneapi", when="@=v2.4.1-jedi.1")
Expand Down Expand Up @@ -148,4 +142,4 @@ def check(self):
# see https://github.com/JCSDA/spack-stack/issues/1910
ctest = Executable(self.spec["cmake"].prefix.bin.ctest)
with working_dir(self.build_directory):
ctest("--timeout", "120", "-R", "test_check_crtm")
ctest("--timeout", "120")
105 changes: 57 additions & 48 deletions repos/spack_repo/builtin/packages/crtm_fix/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class CrtmFix(Package):
"""CRTM coefficient files"""

homepage = "https://github.com/NOAA-EMC/crtm"
url = "ftp://ftp.ssec.wisc.edu/pub/s4/CRTM/fix_REL-2.3.0_emc.tgz"
url = "ftp://ftp.ssec.wisc.edu/pub/s4/CRTM/fix_REL-2.4.0_emc.tgz"

maintainers(
"BenjaminTJohnson", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "climbfuji"
Expand All @@ -26,14 +26,15 @@ class CrtmFix(Package):
"2.4.0.1_emc", sha256="6e4005b780435c8e280d6bfa23808d8f12609dfd72f77717d046d4795cac0457"
)
version("2.4.0_emc", sha256="d0f1b2ae2905457f4c3731746892aaa8f6b84ee0691f6228dfbe48917df1e85e")
version("2.3.0_emc", sha256="1452af2d1d11d57ef3c57b6b861646541e7042a9b0f3c230f9a82854d7e90924")

variant("big_endian", default=True, description="Install big_endian fix files")
variant("little_endian", default=False, description="Install little endian fix files")
variant("netcdf", default=True, description="Install netcdf fix files")
variant("testfiles", default=False, description="Install test files", when="@3:")
# All of these are legacy settings. Linking files from subdirectories
# to the top-level directory will be removed in the near future
variant("link-big-endian", default=True, description="Link big endian fix files to top-level 'fix' dir")
variant("link-little-endian", default=False, description="Link little endian fix files to top-level 'fix' dir")
variant("link-netcdf", default=True, description="Link netcdf fix files to top-level 'fix' dir")
variant("link-testfiles", default=False, description="Link test files to top-level 'fix' dir", when="@3:")

conflicts("+big_endian", when="+little_endian", msg="big_endian and little_endian conflict")
conflicts("+link-big-endian", when="+link-little-endian", msg="Cannot link both litte endian and big endian fix files to top-level 'fix' dir")

def url_for_version(self, version):
if version == Version("2.4.0.1_emc"):
Expand All @@ -44,54 +45,62 @@ def url_for_version(self, version):

def install(self, spec, prefix):
spec = self.spec
mkdir(self.prefix.fix)
if spec.version in [Version("2.4.0.1_emc")]:
fix_source_dir = self.stage.source_path
else:
fix_source_dir = join_path(self.stage.source_path, "fix")
install_tree(fix_source_dir, self.prefix.fix)

# Everything below is legacy code that will be deprecated (removed)
# by the end of 2026: symlink certain versions of files to the
# top-level "fix" directory in the install prefix.
endian_dirs = []
if spec.satisfies("+big_endian"):
if spec.satisfies("+link-big-endian"):
endian_dirs.append("Big_Endian")
elif spec.satisfies("+little_endian"):
elif spec.satisfies("+link-little-endian"):
endian_dirs.append("Little_Endian")

if spec.satisfies("+netcdf"):
if spec.satisfies("+link-netcdf"):
endian_dirs.extend(["netcdf", "netCDF"])

fix_files = []
for d in endian_dirs:
fix_files = fix_files + find(".", "*/{}/*".format(d), recursive=False)
fix_files = fix_files + find(".", "*/*/{}/*".format(d), recursive=False)
fix_files = fix_files + find(".", "*/*/*/{}/*".format(d), recursive=False)
if self.spec.satisfies("~testfiles"):
fix_files = [f for f in fix_files if "/fix/test_data/" not in f]
fix_files = [f for f in fix_files if os.path.isfile(f)]

# Big_Endian amsua_metop-c.SpcCoeff.bin is incorrect
# Little_Endian amsua_metop-c_v2.SpcCoeff.bin is what it's supposed to be.
# Remove the incorrect file, and install it as noACC,, then install
# correct file under new name.
if "+big_endian" in spec and (
spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]
):
amc_sc_path = join_path("SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin")
amc_sc_v2_path = join_path(
"SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin"
)
# In 2.4.0_emc, the path is prefixed by 'fix/'
if spec.version == Version("2.4.0_emc"):
amc_sc_path = join_path("fix", amc_sc_path)
amc_sc_v2_path = join_path("fix", amc_sc_v2_path)

remove_path = join_path(os.getcwd(), amc_sc_path)

fix_files.remove(remove_path)

# This file is incorrect, install it as a different name.
install(amc_sc_path, join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.noACC.bin"))

# This "Little_Endian" file is actually the correct one.
install(amc_sc_v2_path, join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.bin"))

for f in fix_files:
install(f, self.prefix.fix)
with working_dir(self.prefix.fix):
fix_files = []
for d in endian_dirs:
fix_files = fix_files + find(".", "*/{}/*".format(d), recursive=False)
fix_files = fix_files + find(".", "*/*/{}/*".format(d), recursive=False)
fix_files = fix_files + find(".", "*/*/*/{}/*".format(d), recursive=False)
if self.spec.satisfies("~link-testfiles"):
fix_files = [f for f in fix_files if "test_data/" not in f]
fix_files = [f for f in fix_files if os.path.isfile(f)]

# Big_Endian amsua_metop-c.SpcCoeff.bin is incorrect
# Little_Endian amsua_metop-c_v2.SpcCoeff.bin is what it's supposed to be.
# Link the incorrect file as noACC (DH 2026/02/19 why???),
# then link the correct file under the original name.
amc_sc_bad_target = None
if "+link-big-endian" in spec and (
spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]
):
amc_sc_bad_target = join_path(
"SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin"
)
amc_sc_good_target = join_path(
"SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin"
)
amc_sc_bad_link = "amsua_metop-c.SpcCoeff.noACC.bin"
amc_sc_good_link = "amsua_metop-c.SpcCoeff.bin"

for f in fix_files:
target = f.replace(self.prefix.fix, "").lstrip("/")
link = os.path.split(f)[1]
if amc_sc_bad_target and amc_sc_bad_target==target:
symlink(amc_sc_bad_target, amc_sc_bad_link)
symlink(amc_sc_good_target, amc_sc_good_link)
else:
# https://github.com/JCSDA/spack-stack/issues/1910#issuecomment-3930004524
if os.path.islink(link):
os.remove(link)
symlink(target, link)

def setup_run_environment(self, env: EnvironmentModifications) -> None:
env.set("CRTM_FIX", self.prefix.fix)