Skip to content
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

Jump to bottom

Remove unneeded redundant HDF5 linking #1935

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Remove unneeded redundant HDF5 linking #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e05cf1f
Remove unneeded redundant HDF5 linking
islas Nov 7, 2023
569fb07
Remove an emply line in preamble to trigger a Jenkins test.
weiwangncar Dec 6, 2023
3d4b8f7
Typo slipped past rebase, fixing to current develop changes
islas Jan 24, 2024
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
6 changes: 1 addition & 5 deletions arch/Config.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
$sw_usenetcdf = "" ;
$sw_time = "" ; # name of a timer to time fortran compiles, e.g. timex or time
$sw_ifort_r8 = 0 ;
$sw_hdf5 = "-lhdf5_hl -lhdf5";
$sw_hdf5_hl_fortran="-lhdf5_hl_fortran";
$sw_zlib = "-lz";
$sw_netcdf4_dep_lib = "";
Expand Down Expand Up @@ -1181,10 +1180,7 @@
}
}
if ( $sw_netcdf4_dep_lib ne "" )
{ if (/^HDF5.*=/)
{ $_ =~ s/\r|\n//g;
$_ .= " " . $sw_hdf5 . "\n" ;
}
{
if (/^ZLIB.*=/)
{ $_ =~ s/\r|\n//g;
$_ .= " " . $sw_zlib . "\n" ;
Expand Down
2 changes: 0 additions & 2 deletions arch/preamble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ ESMF_TARGET = ESMFTARGET
NETCDF4_IO_OPTS = -DUSE_NETCDF4_FEATURES -DWRFIO_NCD_LARGE_FILE_SUPPORT
GPFS =
CURL =
HDF5 =
ZLIB =
NETCDF4_DEP_LIB = CONFIGURE_NETCDF4_DEP_LIB

Expand Down Expand Up @@ -121,4 +120,3 @@ LIBWRFLIB = libwrflib.a


#### Architecture specific settings ####