From 7e87c208baf14a4d583a3f8d3ad8ddac75fed257 Mon Sep 17 00:00:00 2001 From: Timothy Brown Date: Tue, 23 Aug 2022 14:47:23 -0600 Subject: [WRF] Version update to 4.4 (#32046) * [WRF] Update to version 4.4. * [WRF] Patches for v4.4. * Fixing style. * [@spackbot] updating style on behalf of t-brown --- var/spack/repos/builtin/packages/wrf/package.py | 12 +++++-- .../packages/wrf/patches/4.4/arch.postamble.patch | 32 +++++++++++++++++ .../packages/wrf/patches/4.4/configure.patch | 42 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/wrf/patches/4.4/arch.postamble.patch create mode 100644 var/spack/repos/builtin/packages/wrf/patches/4.4/configure.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index 8444d9d24b..c17d3879a5 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -70,6 +70,11 @@ class Wrf(Package): url = "https://github.com/wrf-model/WRF/archive/v4.2.tar.gz" maintainers = ["MichaelLaufer", "ptooley"] + version( + "4.4", + sha256="6b649e5ac5532f74d74ab913950b632777ce349d26ebfb7f0042b80f9f4ee83e", + url="https://github.com/wrf-model/WRF/releases/download/v4.4/v4.4.tar.gz", + ) version("4.3.3", sha256="1b98b8673513f95716c7fc54e950dfebdb582516e22758cd94bc442bccfc0b86") version("4.3.2", sha256="2c682da0cd0fd13f57d5125eef331f9871ec6a43d860d13b0c94a07fa64348ec") version("4.3.1", sha256="6c9a69d05ee17d2c80b3699da173cfe6fdf65487db7587c8cc96bfa9ceafce87") @@ -141,7 +146,7 @@ class Wrf(Package): patch("patches/4.2/arch.configure.defaults.patch", when="@4.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:") + patch("patches/4.2/configure.patch", when="@4.2:4.3.3") patch("patches/4.2/external.io_netcdf.makefile.patch", when="@4.2:") patch("patches/4.2/var.gen_be.Makefile.patch", when="@4.2:") patch("patches/4.2/Makefile.patch", when="@4.2") @@ -151,6 +156,9 @@ class Wrf(Package): patch("patches/4.2/configure_aocc_3.0.patch", when="@4.2: %aocc@3.0.0:3.2.0") patch("patches/4.2/hdf5_fix.patch", when="@4.2: %aocc") patch("patches/4.2/derf_fix.patch", when="@4.2 %aocc") + + patch("patches/4.4/arch.postamble.patch", when="@4.4:") + patch("patches/4.4/configure.patch", when="@4.4:") # Various syntax fixes found by FPT tool patch( "https://github.com/wrf-model/WRF/commit/6502d5d9c15f5f9a652dec244cc12434af737c3c.patch?full_index=1", @@ -160,7 +168,7 @@ class Wrf(Package): patch("patches/4.2/configure_fujitsu.patch", when="@4 %fj") patch("patches/4.3/Makefile.patch", when="@4.3:") - patch("patches/4.3/arch.postamble.patch", when="@4.3:") + patch("patches/4.3/arch.postamble.patch", when="@4.3:4.3.3") patch("patches/4.3/fujitsu.patch", when="@4.3: %fj") # Syntax errors in physics routines patch( diff --git a/var/spack/repos/builtin/packages/wrf/patches/4.4/arch.postamble.patch b/var/spack/repos/builtin/packages/wrf/patches/4.4/arch.postamble.patch new file mode 100644 index 0000000000..7a9a3de061 --- /dev/null +++ b/var/spack/repos/builtin/packages/wrf/patches/4.4/arch.postamble.patch @@ -0,0 +1,32 @@ +--- a/arch/postamble 2022-04-26 19:33:44.000000000 +0000 ++++ b/arch/postamble 2022-08-10 20:09:45.000000000 +0000 +@@ -54,6 +54,7 @@ + -I$(WRF_SRC_ROOT_DIR)/wrftladj \ + -I$(WRF_SRC_ROOT_DIR)/chem -I$(WRF_SRC_ROOT_DIR)/inc \ + -I$(NETCDFPATH)/include \ ++ -I$(NETCDFFPATH)/include \ + CONFIGURE_RTTOV_INC CONFIGURE_CTSM_INC + REGISTRY = Registry + CC_TOOLS_CFLAGS = CONFIGURE_NMM_CORE +@@ -94,18 +95,18 @@ + + wrfio_nf : + ( cd $(WRF_SRC_ROOT_DIR)/external/io_netcdf ; \ +- make $(J) NETCDFPATH="$(NETCDFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP)" \ ++ make $(J) NETCDFPATH="$(NETCDFPATH)" NETCDFFPATH="$(NETCDFFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP)" \ + CC="$(SCC)" CFLAGS="$(CFLAGS)" \ + FC="$(SFC) $(PROMOTION) $(OMP) $(FCFLAGS)" TRADFLAG="$(TRADFLAG)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) + + wrfio_nfpar : + ( cd $(WRF_SRC_ROOT_DIR)/external/io_netcdfpar ; \ +- make $(J) NETCDFPARPATH="$(NETCDFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP) $(ARCHFLAGS)" \ ++ make $(J) NETCDFPARPATH="$(NETCDFPATH)" NETCDFFPATH="$(NETCDFFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP) $(ARCHFLAGS)" \ + FC="$(FC) $(PROMOTION) $(OMP) $(FCFLAGS)" TRADFLAG="$(TRADFLAG)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) + + wrfio_pnf : + ( cd $(WRF_SRC_ROOT_DIR)/external/io_pnetcdf ; \ +- make $(J) NETCDFPATH="$(PNETCDFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP) $(ARCHFLAGS)" \ ++ make $(J) NETCDFPATH="$(PNETCDFPATH)" NETCDFFPATH="$(NETCDFFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP) $(ARCHFLAGS)" \ + FC="$(FC) $(PROMOTION) $(OMP) $(FCFLAGS)" TRADFLAG="$(TRADFLAG)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) + + wrfio_grib_share : diff --git a/var/spack/repos/builtin/packages/wrf/patches/4.4/configure.patch b/var/spack/repos/builtin/packages/wrf/patches/4.4/configure.patch new file mode 100644 index 0000000000..ae162c722f --- /dev/null +++ b/var/spack/repos/builtin/packages/wrf/patches/4.4/configure.patch @@ -0,0 +1,42 @@ +--- a/configure 2022-08-10 17:57:19.000000000 +0000 ++++ b/configure 2022-08-10 18:01:41.000000000 +0000 +@@ -217,9 +217,9 @@ + USENETCDFF="" + USENETCDF="" + if [ -n "$NETCDF" ] ; then +- echo "Will use NETCDF in dir: $NETCDF" ++ echo "Will use NETCDFF in dir: $NETCDFF" + # Oh UNIDATA, why make it so hard ... +- if [ -f "$NETCDF/lib/libnetcdff.a" -o -f "$NETCDF/lib/libnetcdff.so" -o -f "$NETCDF/lib/libnetcdff.dll.a" ] ; then ++ if [ -f "$NETCDFF/lib/libnetcdff.a" -o -f "$NETCDFF/lib/libnetcdff.so" -o -f "$NETCDFF/lib/libnetcdff.dll.a" ] ; then + USENETCDFF="-lnetcdff" + else + USENETCDFF=" " +@@ -566,7 +566,7 @@ + srch=`grep -i "^#ARCH.*$os" arch/configure.defaults | grep -i "$mach"` + if [ -n "$srch" ] ; then + $PERL arch/Config.pl -dmparallel=$COMMLIB -ompparallel=$OMP -perl=$PERL \ +- -netcdf=$NETCDF -pnetcdf=$PNETCDF -netcdfpar=$NETCDFPAR -hdf5=$HDF5 -phdf5=$PHDF5 -os=$os -mach=$mach -ldflags=$ldflags \ ++ -netcdf=$NETCDF -netcdff=$NETCDFF -pnetcdf=$PNETCDF -netcdfpar=$NETCDFPAR -hdf5=$HDF5 -phdf5=$PHDF5 -os=$os -mach=$mach -ldflags=$ldflags \ + -compileflags=$compileflags -opt_level=$opt_level -USENETCDFF=$USENETCDFF -USENETCDF=$USENETCDF \ + -time=$FORTRAN_COMPILER_TIMER -tfl="$TFL" -cfl="$CFL" -config_line="$config_line" \ + -wrf_core=$wrf_core -gpfs=$GPFS_PATH -curl=$CURL_PATH -dep_lib_path="$DEP_LIB_PATH" +@@ -648,14 +648,14 @@ + echo "If you wish to change the default options, edit the file:" + echo " arch/configure.defaults" + +-if test -n "$NETCDF" ; then +- if [ ! -f $NETCDF/include/netcdf.inc ] ; then ++if test -n "$NETCDFF" ; then ++ if [ ! -f $NETCDFF/include/netcdf.inc ] ; then + echo +- echo "Error : Not found $NETCDF/include/netcdf.inc" ++ echo "Error : Not found $NETCDFF/include/netcdf.inc" + echo " Please check this installation of NetCDF and re-run this configure script" + exit -1 + fi +- grep nf_format_64bit $NETCDF/include/netcdf.inc > /dev/null ++ grep nf_format_64bit $NETCDFF/include/netcdf.inc > /dev/null + configure_aaaa=$? ; export configure_aaaa + if [ $configure_aaaa -a -z "$WRFIO_NCD_NO_LARGE_FILE_SUPPORT" ] ; then + echo "NetCDF users note:" -- cgit v1.2.3-70-g09d2