-
Notifications
You must be signed in to change notification settings - Fork 773
{geo}[foss/2023a] WRF v4.5.1 w/ dmpar #18741
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.
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
bedroge
merged 9 commits into
easybuilders:develop
from
stefan-wolfsheimer:20230907184616_new_pr_WRF451
Jun 14, 2024
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
929f42a
adding easyconfigs: WRF-4.5.1-foss-2023a-dmpar.eb and patches: WRF-4.…
8105252
fixed patch file, enable tests
e5413f9
use None as checksum for WRF 4.5.1 source tarball
boegel ad2faf9
fix name of patch file for WRF 4.5.1
boegel 40e1983
use prepared source tarball for WRF 4.5.1 rather than creating our ow…
boegel b3870a1
Use release tarball
bedroge 0f0846d
use the checksum of the release tarball
bedroge 3f27cb9
add note about netcdf patch
bedroge 798f19a
add extra space
bedroge File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name = 'WRF' | ||
| version = '4.5.1' | ||
| buildtype = 'dmpar' | ||
| versionsuffix = '-%s' % buildtype | ||
|
|
||
| homepage = 'https://www.wrf-model.org' | ||
| description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale | ||
| numerical weather prediction system designed to serve both operational forecasting and atmospheric | ||
| research needs.""" | ||
|
|
||
| toolchain = {'name': 'foss', 'version': '2023a'} | ||
| toolchainopts = {'opt': False} # don't use agressive optimization, stick to -O2 | ||
|
|
||
| github_account = 'wrf-model' | ||
| source_urls = [GITHUB_RELEASE] | ||
| sources = ['v%(version)s.tar.gz'] | ||
| patches = [ | ||
| 'WRF-4.5.1_netCDF-Fortran_separate_path.patch', # note: no longer required for version 4.5.2 | ||
| ] | ||
| checksums = [ | ||
| {'v4.5.1.tar.gz': '9d557c34c105db4d41e727843ecb19199233c7cf82c5369b34a2ce8efe65e2d1'}, | ||
| {'WRF-4.5.1_netCDF-Fortran_separate_path.patch': | ||
| '951bff9a3fc651482b287cc03a9f3197979b7800d515fe61cc9c932d9e0dc62e'}, | ||
| ] | ||
|
|
||
| # csh is used by WRF install scripts | ||
| builddependencies = [ | ||
| ('Autotools', '20220317'), | ||
| ('tcsh', '6.24.10'), | ||
| ('time', '1.9'), | ||
| ('Perl', '5.36.1'), | ||
| ] | ||
|
|
||
| dependencies = [ | ||
| ('JasPer', '4.0.0'), | ||
| ('netCDF', '4.9.2'), | ||
| ('netCDF-Fortran', '4.6.1'), | ||
| ] | ||
|
|
||
| runtest = True | ||
|
|
||
| # limit parallel build to 20 | ||
| maxparallel = 20 | ||
|
|
||
| moduleclass = 'geo' | ||
300 changes: 300 additions & 0 deletions
300
easybuild/easyconfigs/w/WRF/WRF-4.5.1_netCDF-Fortran_separate_path.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,300 @@ | ||
| # Allow netCDF library with separate directories for C and Fortran | ||
| # ============================================================================ | ||
| # This patch has been around in EasyBuild since WRF3.5; it was committed by | ||
| # @boegel then. Adapted by @andreas-h to accomodate WRFv4 and foss toolchain | ||
| # | ||
| # updated for WPS v4.4 by Maxim Masterov (SURF) | ||
| # updated for WRF v4.5.1 by Stefan Wolfsheimer (SURF) | ||
|
|
||
|
|
||
| diff -Nru WRFV4.5.1.orig/arch/Config.pl WRFV4.5.1/arch/Config.pl | ||
| --- WRFV4.5.1.orig/arch/Config.pl 2023-07-25 23:14:55.214200451 +0200 | ||
| +++ WRFV4.5.1/arch/Config.pl 2023-09-07 18:29:05.423831752 +0200 | ||
| @@ -11,6 +11,7 @@ | ||
| select((select(STDOUT), $|=1)[0]); | ||
| $sw_perl_path = perl ; | ||
| $sw_netcdf_path = "" ; | ||
| +$sw_netcdff_path = "" ; | ||
| $sw_pnetcdf_path = "" ; | ||
| $sw_netcdfpar_path = "" ; | ||
| $sw_adios2_path = "" ; | ||
| @@ -96,6 +97,10 @@ | ||
| } | ||
| } | ||
| } | ||
| + if ( substr( $ARGV[0], 1, 8 ) eq "netcdff=" ) | ||
| + { | ||
| + $sw_netcdff_path = substr( $ARGV[0], 9 ) ; | ||
| + } | ||
| if ( substr( $ARGV[0], 1, 8 ) eq "pnetcdf=" ) | ||
| { | ||
| $sw_pnetcdf_path = substr( $ARGV[0], 9 ) ; | ||
| @@ -130,7 +135,8 @@ | ||
| } | ||
| if ( substr( $ARGV[0], 1, 11 ) eq "USENETCDFF=" ) | ||
| { | ||
| - $sw_usenetcdff = substr( $ARGV[0], 12 ) ; | ||
| + $sw_usenetcdff = substr( $ARGV[0], 12 ) ; | ||
| + $sw_usenetcdff =~ s/!/ /g ; | ||
| } | ||
| if ( substr( $ARGV[0], 1, 10 ) eq "USENETCDF=" ) | ||
| { | ||
| @@ -615,6 +621,7 @@ | ||
| { | ||
| $_ =~ s/CONFIGURE_PERL_PATH/$sw_perl_path/g ; | ||
| $_ =~ s/CONFIGURE_NETCDF_PATH/$sw_netcdf_path/g ; | ||
| + $_ =~ s/CONFIGURE_NETCDFF_PATH/$sw_netcdff_path/g ; | ||
| $_ =~ s/CONFIGURE_PNETCDF_PATH/$sw_pnetcdf_path/g ; | ||
| $_ =~ s/CONFIGURE_NETCDFPAR_PATH/$sw_netcdfpar_path/g ; | ||
| $_ =~ s/CONFIGURE_ADIOS2_PATH/$sw_adios2_path/g ; | ||
| @@ -666,7 +673,7 @@ | ||
| } elsif ( $sw_os eq "Interix" ) { | ||
| $_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar/libwrfio_nfpar.a -L$sw_netcdfpar_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| } else { | ||
| - $_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar -lwrfio_nfpar -L$sw_netcdfpar_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| + $_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar -lwrfio_nfpar -L$sw_netcdfpar_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| } | ||
| } | ||
| else | ||
| @@ -684,7 +691,7 @@ | ||
| } elsif ( $sw_os eq "Interix" ) { | ||
| $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a -L$sw_netcdf_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| } else { | ||
| - $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdf_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| + $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdff_path/lib -L$sw_netcdf_path/lib64 $sw_usenetcdff $sw_usenetcdf : ; | ||
| } | ||
| } | ||
| else | ||
| @@ -1072,7 +1079,7 @@ | ||
| } elsif ( $sw_os eq "Interix" ) { | ||
| $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a -L$sw_netcdf_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| } else { | ||
| - $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdf_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| + $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdff_path/lib -L$sw_netcdf_path/lib $sw_usenetcdff $sw_usenetcdf : ; | ||
| } | ||
| } | ||
| else | ||
| diff -Nru WRFV4.5.1.orig/arch/configure.defaults WRFV4.5.1/arch/configure.defaults | ||
| --- WRFV4.5.1.orig/arch/configure.defaults 2023-07-25 23:14:55.215890637 +0200 | ||
| +++ WRFV4.5.1/arch/configure.defaults 2023-09-07 14:20:06.651406753 +0200 | ||
| @@ -1638,6 +1638,7 @@ | ||
|
|
||
| LIB_EXTERNAL = \ | ||
| ../external/io_netcdf/libwrfio_nf.a CONFIGURE_NETCDF_PATH/lib/libnetcdf.lib \ | ||
| + CONFIGURE_NETCDFF_PATH/lib/libnetcdff.lib \ | ||
| ../external/wavelet/libWavelet.a ../external/wavelet/lib_wavelet.a | ||
| ESMF_IO_LIB = ../external/esmf_time_f90/libesmf_time.a | ||
| LIB_BUNDLED = \ | ||
| diff -Nru WRFV4.5.1.orig/arch/conf_tokens WRFV4.5.1/arch/conf_tokens | ||
| --- WRFV4.5.1.orig/arch/conf_tokens 2023-07-25 23:14:55.215165000 +0200 | ||
| +++ WRFV4.5.1/arch/conf_tokens 2023-09-07 14:20:50.194754577 +0200 | ||
| @@ -5,6 +5,7 @@ | ||
| CONFIGURE_DMPARALLEL | ||
| CONFIGURE_RWORDSIZE | ||
| CONFIGURE_NETCDF_FLAG | ||
| +CONFIGURE_NETCDFF_FLAG | ||
| CONFIGURE_GRIB2_FLAG | ||
| CONFIGURE_NETCDF_LIB_PATH | ||
| CONFIGURE_GRIB2_LIB | ||
| @@ -13,4 +14,5 @@ | ||
| CONFIGURE_WRFIO_NF | ||
| CONFIGURE_WRFIO_GRIB2 | ||
| CONFIGURE_NETCDF_PATH | ||
| +CONFIGURE_NETCDFF_PATH | ||
| CONFIGURE_GRIB2_INC | ||
| diff -Nru WRFV4.5.1.orig/arch/postamble WRFV4.5.1/arch/postamble | ||
| --- WRFV4.5.1.orig/arch/postamble 2023-07-25 23:14:55.219090000 +0200 | ||
| +++ WRFV4.5.1/arch/postamble 2023-09-07 16:01:17.500706228 +0200 | ||
| @@ -54,6 +54,7 @@ | ||
| -I$(WRF_SRC_ROOT_DIR)/phys \ | ||
| -I$(WRF_SRC_ROOT_DIR)/wrftladj \ | ||
| -I$(WRF_SRC_ROOT_DIR)/chem -I$(WRF_SRC_ROOT_DIR)/inc \ | ||
| + -I$(NETCDFPATH)/include -I$(NETCDFFPATH)/include \ | ||
| -I$(NETCDFPATH)/include \ | ||
| CONFIGURE_RTTOV_INC CONFIGURE_CTSM_INC | ||
| REGISTRY = Registry | ||
| @@ -64,6 +65,7 @@ | ||
| ENVCOMPDEFS = CONFIGURE_COMPILEFLAGS | ||
| CPPFLAGS = $(ARCHFLAGS) $(ENVCOMPDEFS) -I$(LIBINCLUDE) $(TRADFLAG) CONFIGURE_COMMS_INCLUDE | ||
| NETCDFPATH = CONFIGURE_NETCDF_PATH | ||
| +NETCDFFPATH = CONFIGURE_NETCDFF_PATH | ||
| HDF5PATH = CONFIGURE_HDF5_PATH | ||
| WRFPLUSPATH = CONFIGURE_WRFPLUS_PATH | ||
| RTTOVPATH = CONFIGURE_RTTOV_PATH | ||
| @@ -96,18 +98,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="$(PNETCDFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP) $(ARCHFLAGS)" \ | ||
| FC="$(FC) $(PROMOTION) $(OMP) $(FCFLAGS)" TRADFLAG="$(TRADFLAG)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) | ||
|
|
||
| wrfio_adios2 : | ||
| diff -Nru WRFV4.5.1.orig/configure WRFV4.5.1/configure | ||
| --- WRFV4.5.1.orig/configure 2023-07-25 23:14:55.692864209 +0200 | ||
| +++ WRFV4.5.1/configure 2023-09-08 11:40:15.875789587 +0200 | ||
| @@ -214,17 +214,19 @@ | ||
| unset NETCDF4 | ||
| fi | ||
|
|
||
| -USENETCDFF="" | ||
| +if [ -f "$NETCDFF/lib/libnetcdff.a" -o -f "$NETCDFF/lib/libnetcdff.so" -o -f "$NETCDFF/lib64/libnetcdff.so" -o -f "$NETCDFF/lib64/libnetcdff.so" ] ; then | ||
| + USENETCDFF="-L$NETCDFF/lib!-L$NETCDFF/lib64!-lnetcdff" # ! will be replaced with space | ||
| +else | ||
| + USENETCDFF=" " | ||
| +fi | ||
| USENETCDF="" | ||
| if [ -n "$NETCDF" ] ; then | ||
| echo "Will use NETCDF in dir: $NETCDF" | ||
| # 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 | ||
| USENETCDFF="-lnetcdff" | ||
| - else | ||
| - USENETCDFF=" " | ||
| fi | ||
| - if [ -f "$NETCDF/lib/libnetcdf.a" -o -f "$NETCDF/lib/libnetcdf.so" -o -f "$NETCDF/lib/libnetcdf.dll.a" ] ; then | ||
| + if [ -f "$NETCDF/lib/libnetcdf.a" -o -f "$NETCDF/lib/libnetcdf.so" -o -f "$NETCDF/lib64/libnetcdf.a" -o -f "$NETCDF/lib64/libnetcdf.so" ] ; then | ||
| USENETCDF="-lnetcdf" | ||
| else | ||
| USENETCDF=" " | ||
| @@ -572,7 +574,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 -adios2=$ADIOS2 -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" | ||
| @@ -654,14 +656,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:" | ||
| diff -Nru WRFV4.5.1.orig/external/io_netcdf/makefile WRFV4.5.1/external/io_netcdf/makefile | ||
| --- WRFV4.5.1.orig/external/io_netcdf/makefile 2023-07-25 23:14:55.935985000 +0200 | ||
| +++ WRFV4.5.1/external/io_netcdf/makefile 2023-09-07 14:33:23.630405047 +0200 | ||
| @@ -3,9 +3,9 @@ | ||
| OBJSL = wrf_io.o field_routines.o module_wrfsi_static.o | ||
| OBJS = $(OBJSL) | ||
| CODE = ext_ncd_get_dom_ti.code ext_ncd_get_var_td.code ext_ncd_get_var_ti.code ext_ncd_put_dom_ti.code ext_ncd_put_var_td.code ext_ncd_put_var_ti.code transpose.code | ||
| -FFLAGS = $(FCFLAGS) -I$(NETCDFPATH)/include -I../ioapi_share | ||
| -LIBS = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -lnetcdf | ||
| -LIBFFS = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -lnetcdff -lnetcdf $(NETCDF4_DEP_LIB) | ||
| +FFLAGS = $(FCFLAGS) -I$(NETCDFFPATH)/include -I../ioapi_share | ||
| +LIBS = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -L$(NETCDFPATH)/lib64 -lnetcdf | ||
| +LIBFFS = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -L$(NETCDFPATH)/lib64 -L$(NETCDFFPATH)/lib -L$(NETCDFFPATH)/lib64 -lnetcdff -lnetcdf $(NETCDF4_DEP_LIB) | ||
| CPP1 = $(CPP) -P $(TRADFLAG) | ||
| M4 = m4 -Uinclude -Uindex -Ulen | ||
| AR = ar | ||
| @@ -24,7 +24,7 @@ | ||
| $(RANLIB) $@ | ||
|
|
||
| wrf_io.o: wrf_io.F90 $(CODE) | ||
| - grep nf_format_64bit $(NETCDFPATH)/include/netcdf.inc ;\ | ||
| + grep nf_format_64bit $(NETCDFFPATH)/include/netcdf.inc ;\ | ||
| a=$$? ; export a ; \ | ||
| if [ $$a -a "$$WRFIO_NCD_LARGE_FILE_SUPPORT" = "1" ] ; then \ | ||
| $(CPP1) -DWRFIO_NCD_LARGE_FILE_SUPPORT -I../ioapi_share wrf_io.F90 | $(M4) - > wrf_io.f ; \ | ||
| @@ -43,14 +43,14 @@ | ||
| x=`echo "$(FC)" | awk '{print $$1}'` ; export x ; \ | ||
| if [ $$x = "gfortran" ] ; then \ | ||
| echo removing external declaration of iargc for gfortran ; \ | ||
| - $(CPP1) -I$(NETCDFPATH)/include -I../ioapi_share diffwrf.F90 | sed '/integer *, *external.*iargc/d' > diffwrf.f ;\ | ||
| + $(CPP1) -I$(NETCDFFPATH)/include -I../ioapi_share diffwrf.F90 | sed '/integer *, *external.*iargc/d' > diffwrf.f ;\ | ||
| else \ | ||
| - $(CPP1) -I$(NETCDFPATH)/include -I../ioapi_share diffwrf.F90 > diffwrf.f ; \ | ||
| + $(CPP1) -I$(NETCDFFPATH)/include -I../ioapi_share diffwrf.F90 > diffwrf.f ; \ | ||
| fi | ||
| $(FC) -c $(FFLAGS) diffwrf.f | ||
| @if [ \( -f ../../frame/wrf_debug.o \) -a \( -f ../../frame/module_wrf_error.o \) -a \( -f $(ESMF_MOD_DEPENDENCE) \) -a \( -f ../../frame/clog.o \) ] ; then \ | ||
| echo "diffwrf io_netcdf is being built now. " ; \ | ||
| - if [ \( -f $(NETCDFPATH)/lib/libnetcdff.a -o -f $(NETCDFPATH)/lib/libnetcdff.so -o -f $(NETCDFPATH)/lib/libnetcdff.dll.a \) ] ; then \ | ||
| + if [ \( -f $(NETCDFFPATH)/lib/libnetcdff.a -o -f $(NETCDFFPATH)/lib/libnetcdff.so -o -f $(NETCDFFPATH)/lib/libnetcdff.dll.a \) ] ; then \ | ||
| $(FC) $(FFLAGS) $(LDFLAGS) -o diffwrf diffwrf.o $(OBJSL) ../../frame/wrf_debug.o ../../frame/module_wrf_error.o ../../frame/clog.o $(ESMF_IO_LIB_EXT) $(LIBFFS) ;\ | ||
| else \ | ||
| $(FC) $(FFLAGS) $(LDFLAGS) -o diffwrf diffwrf.o $(OBJSL) ../../frame/wrf_debug.o ../../frame/module_wrf_error.o ../../frame/clog.o $(ESMF_IO_LIB_EXT) $(LIBS) ;\ | ||
| diff -Nru WRFV4.5.1.orig/external/io_pnetcdf/Makefile WRFV4.5.1/external/io_pnetcdf/Makefile | ||
| --- WRFV4.5.1.orig/external/io_pnetcdf/Makefile 2023-07-25 23:14:55.952757000 +0200 | ||
| +++ WRFV4.5.1/external/io_pnetcdf/Makefile 2023-09-07 14:34:31.077960575 +0200 | ||
| @@ -9,8 +9,8 @@ | ||
| ext_pnc_put_var_td.code \ | ||
| ext_pnc_put_var_ti.code \ | ||
| transpose.code | ||
| -FFLAGS = $(FCFLAGS) -I$(NETCDFPATH)/include -I../ioapi_share | ||
| -LIBS = -L$(NETCDFPATH)/lib -lpnetcdf | ||
| +FFLAGS = $(FCFLAGS) -I$(NETCDFFPATH)/include -I../ioapi_share | ||
| +LIBS = -L$(NETCDFFPATH)/lib -lpnetcdf | ||
| CPP1 = $(CPP) -P $(TRADFLAG) | ||
| M4 = m4 -Uinclude -Uindex -Ulen | ||
| AR = ar | ||
| @@ -25,15 +25,15 @@ | ||
| $(RANLIB) libwrfio_pnf.a | ||
|
|
||
| wrf_io.o: wrf_io.F90 $(CODE) | ||
| - $(CPP1) -I$(NETCDFPATH)/include -I../ioapi_share wrf_io.F90 | $(M4) - > wrf_io.f | ||
| + $(CPP1) -I$(NETCDFFPATH)/include -I../ioapi_share wrf_io.F90 | $(M4) - > wrf_io.f | ||
| $(FC) $(FFLAGS) -c wrf_io.f | ||
|
|
||
| module_wrfsi_static.o: module_wrfsi_static.F90 | ||
| - $(CPP1) -I$(NETCDFPATH)/include -I../ioapi_share module_wrfsi_static.F90 > module_wrfsi_static.f | ||
| + $(CPP1) -I$(NETCDFFPATH)/include -I../ioapi_share module_wrfsi_static.F90 > module_wrfsi_static.f | ||
| $(FC) $(FFLAGS) -c module_wrfsi_static.f | ||
|
|
||
| field_routines.o: field_routines.F90 wrf_io.o | ||
| - $(CPP1) -I$(NETCDFPATH)/include -I../ioapi_share field_routines.F90 > field_routines.f | ||
| + $(CPP1) -I$(NETCDFFPATH)/include -I../ioapi_share field_routines.F90 > field_routines.f | ||
| $(FC) $(FFLAGS) -c field_routines.f | ||
|
|
||
| superclean: | ||
| diff -Nru WRFV4.5.1.orig/Makefile WRFV4.5.1/Makefile | ||
| --- WRFV4.5.1.orig/Makefile 2023-07-25 23:14:55.185289891 +0200 | ||
| +++ WRFV4.5.1/Makefile 2023-09-07 14:36:58.707252929 +0200 | ||
| @@ -923,7 +923,7 @@ | ||
| @ echo '--------------------------------------' | ||
| ( cd frame ; $(MAKE) $(J) LLIST="$(LINKLIST)" framework ; \ | ||
| cd ../external/io_netcdf ; \ | ||
| - $(MAKE) NETCDFPATH="$(NETCDFPATH)" \ | ||
| + $(MAKE) NETCDFPATH="$(NETCDFPATH)" NETCDFFPATH="$(NETCDFFPATH)" \ | ||
| FC="$(FC) $(FCBASEOPTS) $(PROMOTION) $(FCDEBUG) $(OMP)" RANLIB="$(RANLIB)" \ | ||
| CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" TRADFLAG="$(TRADFLAG)" ESMF_IO_LIB_EXT="$(ESMF_IO_LIB_EXT)" \ | ||
| LIB_LOCAL="$(LIB_LOCAL)" \ | ||
| @@ -1070,9 +1070,9 @@ | ||
| # rule used by configure to test if this will compile with netcdf4 | ||
| nc4_test: | ||
| if [ $(USENETCDFPAR) -eq 0 ] ; then \ | ||
| - ( cd tools ; /bin/rm -f nc4_test.{exe,nc,o} ; $(SCC) -o nc4_test.exe nc4_test.c -I$(NETCDF)/include -L$(NETCDF)/lib -lnetcdf $(NETCDF4_DEP_LIB) ; cd .. ) ; \ | ||
| + ( cd tools ; /bin/rm -f nc4_test.{exe,nc,o} ; $(SCC) -o nc4_test.exe nc4_test.c -I$(NETCDF)/include -L$(NETCDF)/lib64 -lnetcdf $(NETCDF4_DEP_LIB) ; cd .. ) ; \ | ||
| else \ | ||
| - ( cd tools ; /bin/rm -f nc4_test.{exe,nc,o} ; $(DM_CC) -o nc4_test.exe nc4_test.c -I$(NETCDF)/include -L$(NETCDF)/lib -lnetcdf $(NETCDF4_DEP_LIB) ; cd .. ) ; \ | ||
| + ( cd tools ; /bin/rm -f nc4_test.{exe,nc,o} ; $(DM_CC) -o nc4_test.exe nc4_test.c -I$(NETCDF)/include -L$(NETCDF)/lib64 -lnetcdf $(NETCDF4_DEP_LIB) ; cd .. ) ; \ | ||
| fi | ||
|
|
||
| # rule used by configure to test if Fortran 2003 IEEE signaling is available |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.