From 002bd8d20ba53c60e1a0ecee823e95ec7483c16f Mon Sep 17 00:00:00 2001 From: Timothy Brown Date: Wed, 1 Feb 2023 13:29:35 -0700 Subject: [WRF] Adding new versions (#35244) * [WRF] Adding new versions. * Style fixes. --- var/spack/repos/builtin/packages/wrf/package.py | 9 +- .../4.2/4.2.2_arch.configure.defaults.patch | 111 +++++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/wrf/patches/4.2/4.2.2_arch.configure.defaults.patch diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index c2a3352d0c..4562ecc2d9 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -71,6 +71,11 @@ class Wrf(Package): maintainers = ["MichaelLaufer", "ptooley"] tags = ["windows"] + version( + "4.4.2", + sha256="5d6237f1500c44a33626362936ba0a4388360c5070d9d53262e5a950c586da85", + url="https://github.com/wrf-model/WRF/releases/download/v4.4.2/v4.4.2.tar.gz", + ) version( "4.4", sha256="6b649e5ac5532f74d74ab913950b632777ce349d26ebfb7f0042b80f9f4ee83e", @@ -79,6 +84,7 @@ class Wrf(Package): version("4.3.3", sha256="1b98b8673513f95716c7fc54e950dfebdb582516e22758cd94bc442bccfc0b86") version("4.3.2", sha256="2c682da0cd0fd13f57d5125eef331f9871ec6a43d860d13b0c94a07fa64348ec") version("4.3.1", sha256="6c9a69d05ee17d2c80b3699da173cfe6fdf65487db7587c8cc96bfa9ceafce87") + version("4.2.2", sha256="7be2968c67c2175cd40b57118d9732eda5fdb0828edaa25baf57cc289da1a9b8") version("4.2", sha256="c39a1464fd5c439134bbd39be632f7ce1afd9a82ad726737e37228c6a3d74706") version("4.0", sha256="9718f26ee48e6c348d8e28b8bc5e8ff20eafee151334b3959a11b7320999cf65") version( @@ -144,7 +150,8 @@ class Wrf(Package): patch("patches/4.0/add_aarch64.patch", when="@4.0") patch("patches/4.2/arch.Config.pl.patch", when="@4.2:") - patch("patches/4.2/arch.configure.defaults.patch", when="@4.2") + patch("patches/4.2/arch.configure.defaults.patch", when="@4.2:4.2.0") + patch("patches/4.2/4.2.2_arch.configure.defaults.patch", when="@4.2.2") patch("patches/4.2/arch.conf_tokens.patch", when="@4.2:") patch("patches/4.2/arch.postamble.patch", when="@4.2") patch("patches/4.2/configure.patch", when="@4.2:4.3.3") diff --git a/var/spack/repos/builtin/packages/wrf/patches/4.2/4.2.2_arch.configure.defaults.patch b/var/spack/repos/builtin/packages/wrf/patches/4.2/4.2.2_arch.configure.defaults.patch new file mode 100644 index 0000000000..ce171f8afd --- /dev/null +++ b/var/spack/repos/builtin/packages/wrf/patches/4.2/4.2.2_arch.configure.defaults.patch @@ -0,0 +1,111 @@ +--- a/arch/configure.defaults 2021-01-15 17:21:58.000000000 +0000 ++++ b/arch/configure.defaults 2023-01-27 21:07:58.233103595 +0000 +@@ -30,7 +30,7 @@ + FORMAT_FREE = -w -f4 + FCSUFFIX = + BYTESWAPIO = #-FIX_BYTE_SWAP_IF_NECESSARY_FOR_BIG_ENDIAN +-FCBASEOPTS_NO_G = -w -Wf'-M noflunf -M nozdiv' $(FORMAT_FREE) $(BYTESWAPIO) ++FCBASEOPTS_NO_G = -w -Wf'-M noflunf -M nozdiv' $(FORMAT_FREE) $(BYTESWAPIO) $(FFLAGS) + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = -I/SX/usr/include/module/dwdadW64/ + TRADFLAG = CONFIGURE_TRADFLAG +@@ -75,7 +75,7 @@ + FCSUFFIX = + FCCOMPAT = + BYTESWAPIO = -fconvert=big-endian -frecord-marker=4 +-FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT) ++FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT) $(FFLAGS) + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = + TRADFLAG = CONFIGURE_TRADFLAG +@@ -118,7 +118,7 @@ + FORMAT_FREE = -ffree-form -ffree-line-length-huge + FCSUFFIX = + BYTESWAPIO = -fendian=big +-FCBASEOPTS_NO_G = -Wno=101,139,155,158 $(FORMAT_FREE) $(BYTESWAPIO) ++FCBASEOPTS_NO_G = -Wno=101,139,155,158 $(FORMAT_FREE) $(BYTESWAPIO) $(FFLAGS) + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = -fmod=$(WRF_SRC_ROOT_DIR)/main + TRADFLAG = CONFIGURE_TRADFLAG +@@ -161,7 +161,7 @@ + FORMAT_FREE = -Mfree + FCSUFFIX = + BYTESWAPIO = -byteswapio +-FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(OMP) # -Kieee -pc 64 -Ktrap=fp ++FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(OMP) $(FFLAGS) # -Kieee -pc 64 -Ktrap=fp + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = -module $(WRF_SRC_ROOT_DIR)/main + TRADFLAG = CONFIGURE_TRADFLAG +@@ -204,7 +204,7 @@ + FORMAT_FREE = -Mfree + FCSUFFIX = + BYTESWAPIO = -byteswapio +-FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(OMP) # -Kieee -pc 64 -Ktrap=fp ++FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(OMP) $(FFLAGS) # -Kieee -pc 64 -Ktrap=fp + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = -module $(WRF_SRC_ROOT_DIR)/main + TRADFLAG = CONFIGURE_TRADFLAG +@@ -323,7 +323,7 @@ + FCSUFFIX = + BYTESWAPIO = -convert big_endian + RECORDLENGTH = -assume byterecl +-FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common ++FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) $(FFLAGS) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = + TRADFLAG = CONFIGURE_TRADFLAG +@@ -370,7 +370,7 @@ + FCSUFFIX = + BYTESWAPIO = -convert big_endian + RECORDLENGTH = -assume byterecl +-FCBASEOPTS_NO_G = -w -qopenmp -auto -ftz -fno-alias -fp-model fast=1 -no-prec-div -no-prec-sqrt $(FORMAT_FREE) $(BYTESWAPIO) -auto -align array64byte #-vec-report6 ++FCBASEOPTS_NO_G = -w -qopenmp -auto -ftz -fno-alias -fp-model fast=1 -no-prec-div -no-prec-sqrt $(FORMAT_FREE) $(BYTESWAPIO) -auto -align array64byte $(FFLAGS) #-vec-report6 + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = + TRADFLAG = CONFIGURE_TRADFLAG +@@ -417,7 +417,7 @@ + FCSUFFIX = + BYTESWAPIO = -convert big_endian + RECORDLENGTH = -assume byterecl +-FCBASEOPTS_NO_G = -w $(OMP) -auto -ftz -fno-alias -fp-model fast=1 -no-prec-div -no-prec-sqrt $(FORMAT_FREE) $(BYTESWAPIO) -auto -align array64byte #-vec-report6 ++FCBASEOPTS_NO_G = -w $(OMP) -auto -ftz -fno-alias -fp-model fast=1 -no-prec-div -no-prec-sqrt $(FORMAT_FREE) $(BYTESWAPIO) -auto -align array64byte $(FFLAGS) #-vec-report6 + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = + TRADFLAG = CONFIGURE_TRADFLAG +@@ -488,7 +488,7 @@ + FCSUFFIX = + BYTESWAPIO = -convert big_endian + RECORDLENGTH = -assume byterecl +-FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common ++FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) $(FFLAGS) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = + TRADFLAG = CONFIGURE_TRADFLAG +@@ -537,7 +537,7 @@ + FCSUFFIX = + BYTESWAPIO = -convert big_endian + RECORDLENGTH = -assume byterecl +-FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common ++FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) $(FFLAGS) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + MODULE_SRCH_FLAG = + TRADFLAG = CONFIGURE_TRADFLAG +@@ -616,7 +616,7 @@ + FCSUFFIX = + BYTESWAPIO = -convert big_endian + RECORDLENGTH = -assume byterecl +-FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common ++FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) $(FFLAGS) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common + #FCBASEOPTS_NO_G = -w -ftz -align all -fno-alias -IPF-fp-relaxed $(FORMAT_FREE) $(BYTESWAPIO) + FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) + LIB_LOCAL = -L/usr/lib -lmpi +@@ -1602,7 +1602,8 @@ + + LIB_EXTERNAL = \ + ../external/io_netcdf/libwrfio_nf.a CONFIGURE_NETCDF_PATH/lib/libnetcdf.lib \ +- ../external/wavelet/libWavelet.a ../external/wavelet/lib_wavelet.a ++ ../external/wavelet/libWavelet.a ../external/wavelet/lib_wavelet.a \ ++ CONFIGURE_NETCDFF_PATH/lib/libnetcdff.lib + ESMF_IO_LIB = ../external/esmf_time_f90/libesmf_time.a + LIB_BUNDLED = \ + ../external/fftpack/fftpack5/libfftpack.a \ -- cgit v1.2.3-70-g09d2