Skip to content

Commit

Permalink
use external EMSF instead of bundled binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
jfgrimm committed Feb 20, 2024
1 parent cb52fa9 commit 9254d38
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ versionsuffix = '-FLOW'
homepage = 'https://oss.deltares.nl/web/delft3d'
description = """
Simulation of multi-dimensional hydrodynamic flows and transport phenomena, including
sediments. Delft3D-FLOW is part of Delft3D 4.
sediments. Delft3D-FLOW is part of Delft3D 4.
"""

toolchain = {'name': 'foss', 'version': '2022a'}
Expand All @@ -21,8 +21,12 @@ There is no tarball provided; it needs to be created through an svn checkout:
""" % _revision

sources = [SOURCE_TGZ]
patches = ['Delft3D-4.04.01_use-external-esmf.patch']
checksums = [
# Delft3D-4.04.01.tgz
None,
# Delft3D-4.04.01_use-external-esmf.patch'
'86f127cf3193c6fc9256491d917051db91e695718631d1b221b111499e0f432b',
]

builddependencies = [
Expand All @@ -40,6 +44,7 @@ dependencies = [
('METIS', '5.1.0'),
('PETSc', '3.17.4'),
('expat', '2.4.8'),
('ESMF', '8.3.0'),
]

parallel = 1
Expand All @@ -54,8 +59,11 @@ preconfigopts += "sed -i 's/if (spec < 0)/if (spec == nullptr)/g' utils_lgpl/del
preconfigopts += "sed -i 's/if (has_umean \/= 0)/if (has_umean .neqv. .false.)/g' " # noqa: W605
preconfigopts += "engines_gpl/flow2d3d/packages/flow2d3d_io/src/input/restart_trim_flow.f90 && "
preconfigopts += "sed -i -e 's/-recursive/-frecursive/g' -e 's/-traceback/-fbacktrace/g' configure.ac && "
# remove esmf precompiled binaries
preconfigopts += "rm -r third_party_open/esmf && libtoolize && "
preconfigopts += './autogen.sh && '
preconfigopts += 'cd third_party_open/kdtree2 && ./autogen.sh && cd - && '

configopts = ' --with-netcdf'
configopts += ' --with-mpi --with-metis --with-petsc'

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
Author: Jasper Grimm <[email protected]>
Avoid installing the bundled ESMF, since this is compiled for CentOS 7 (and also fails
rpath sanity checks)
diff -Nru trunk.orig/src/configure.ac trunk/src/configure.ac
--- trunk.orig/src/configure.ac 2024-02-20 14:35:26.821778739 +0000
+++ trunk/src/configure.ac 2024-02-20 14:43:47.108090829 +0000
@@ -607,10 +607,6 @@
plugins_lgpl/plugin_delftflow_traform/src/Makefile
scripts_lgpl/linux/Makefile
scripts_lgpl/Makefile
-third_party_open/esmf/lnx64/bin/Makefile
-third_party_open/esmf/lnx64/Makefile
-third_party_open/esmf/lnx64/scripts/Makefile
-third_party_open/esmf/Makefile
third_party_open/Makefile
third_party_open/md5/Makefile
third_party_open/md5/md5digest/Makefile
diff -Nru trunk.orig/src/third_party_open/Makefile.am trunk/src/third_party_open/Makefile.am
--- trunk.orig/src/third_party_open/Makefile.am 2024-02-20 14:35:27.045777956 +0000
+++ trunk/src/third_party_open/Makefile.am 2024-02-20 14:43:31.552143270 +0000
@@ -19,7 +19,6 @@
endif

SUBDIRS = \
- esmf \
triangle \
version_number \
libsigwatch \
@@ -28,39 +27,3 @@
kdtree2 \
md5 \
$(MAYBE_FORTRANGIS)
-nobase_dist_pkgdata_DATA = \
- esmf/lnx64/bin/libcilkrts.so.5 \
- esmf/lnx64/bin/libdl.so.2 \
- esmf/lnx64/bin/libesmf.so \
- esmf/lnx64/bin/libgcc_s.so.1 \
- esmf/lnx64/bin/libhdf5.so.8 \
- esmf/lnx64/bin/libhdf5_hl.so.8 \
- esmf/lnx64/bin/libifcore.so.5 \
- esmf/lnx64/bin/libifport.so.5 \
- esmf/lnx64/bin/libimf.so \
- esmf/lnx64/bin/libintlc.so.5 \
- esmf/lnx64/bin/libiomp5.so \
- esmf/lnx64/bin/libirc.so \
- esmf/lnx64/bin/libirng.so \
- esmf/lnx64/bin/libm.so.6 \
- esmf/lnx64/bin/libnetcdf.so.7 \
- esmf/lnx64/bin/libnetcdff.so.6 \
- esmf/lnx64/bin/librt.so.1 \
- esmf/lnx64/bin/libsvml.so \
- esmf/lnx64/bin/libz.so.1 \
- esmf/lnx64/bin_COS7/libcilkrts.so.5 \
- esmf/lnx64/bin_COS7/libesmf.so \
- esmf/lnx64/bin_COS7/libhdf5.so.200 \
- esmf/lnx64/bin_COS7/libhdf5_hl.so.200 \
- esmf/lnx64/bin_COS7/libifcoremt.so.5 \
- esmf/lnx64/bin_COS7/libifport.so.5 \
- esmf/lnx64/bin_COS7/libimf.so \
- esmf/lnx64/bin_COS7/libintlc.so.5 \
- esmf/lnx64/bin_COS7/libiomp5.so \
- esmf/lnx64/bin_COS7/libirc.so \
- esmf/lnx64/bin_COS7/libirng.so \
- esmf/lnx64/bin_COS7/libnetcdf.so.7 \
- esmf/lnx64/bin_COS7/libnetcdf.so.18 \
- esmf/lnx64/bin_COS7/libnetcdff.so.6 \
- esmf/lnx64/bin_COS7/libsvml.so
-

0 comments on commit 9254d38

Please sign in to comment.