From nobody Fri Jul 12 14:41:26 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WLDn31X6qz5QXN8; Fri, 12 Jul 2024 14:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WLDn316f6z4HTm; Fri, 12 Jul 2024 14:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720795287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wx872xrxc0y0FSxn4S05YdKrvNuodN+2rMN/rE80bks=; b=RTeRUEJbifqgOuTkTI8ozyOrdp85e6/PzeY5PXl59Y+yZOGToQy2zxpCK785C5nuNOxP1X CTK8pJaIndKO56Dnx1jeVQhleuD/SArcJKYplTIfokNAhbe2qVW9FhPSq8ye9cJxCMQT/m 1mTEaP7MkPo8RplZdeqRbABZr6Auqa6FGnc84ydXV0hmtd1ZHK3iOBaQ/ETf7jS9LmH+3W y5onGMHapBnKfmMPFgwO/6oku0jY07wSAqZ+JQHiXlZhxAD98HvBRN2CCwF5CxrGR88nnE jl5WCPs/hC7Z7tMlyeYLk9VlrUecemxiKLjGrzpJ/aspJumuM6zFMmSU9pZpfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720795287; a=rsa-sha256; cv=none; b=bLyc33w4RApwYmjoAi9pPAPWgIR20/QSmHb7j+e0vcH/yeMBmk2dOIR/CsWE8181KMp1sK Yday+CIlOdXgDQB3nkfL5gY70vZW6nvdM6dEEyRH5C1jHx4jIGKU4ejOclB6wpiPuQakfp 6t+lvC6iZ5wdAyzW6S5dTK7ZVDgwPAu06YUpgLPa7CGXxYqIyNRJSm5q5dKTFHXSG30KRt cZdCmeGnD/jdOHiYNVPV49TwCtQ6RccdPBrLs+HSqg9mLvxpLOA+JtBKWhr8n4frRWPy6T 3zjJzfy2+23fzBeJ7UbdZHDYrdUzpye3xvqOFVih2rECX/3TfoHVw71iRBXPMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720795287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wx872xrxc0y0FSxn4S05YdKrvNuodN+2rMN/rE80bks=; b=wh5uPh6gRf8q77d8SMNOSiEp25WB02TZisMc1/tGVD5Xy+PhgpL5SFGyZD10mkuO6mSI3w XsbgP8JA4mIr3bqQBq0lzGk2RQhBaoNUm0at2YutgcN+ZScb9GS8rftvDOjGsoHndhQzQe SzxNHAH96n8IpfaCz7n3/jMoVX2n8nSMaLfyJgxdsykTb6fS4t3RTOtoZrcbqILf4zofwW G0s+xcuLJpC2Zbc1yt9b4qfw2dlQiG6BYmYE6bTir89O2QxiPSL2kZ4CsWohvnSXfqZtrP qUHw4DQmFSCKzknS+TFpHysdfD+Ljx0Lr2iniwjfdRtWSeqLvM3gyTNzGxVsNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WLDn30jcFzmcR; Fri, 12 Jul 2024 14:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46CEfRFR028801; Fri, 12 Jul 2024 14:41:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46CEfQMn028798; Fri, 12 Jul 2024 14:41:26 GMT (envelope-from git) Date: Fri, 12 Jul 2024 14:41:26 GMT Message-Id: <202407121441.46CEfQMn028798@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: f9bdc64c4f6c - main - science/spheral: update 2024.01.1 =?utf-8?Q?=E2=86=92?= 2024.06.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9bdc64c4f6c491dd524fd4af32beac53403d0ad Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9bdc64c4f6c491dd524fd4af32beac53403d0ad commit f9bdc64c4f6c491dd524fd4af32beac53403d0ad Author: Yuri Victorovich AuthorDate: 2024-07-12 14:40:47 +0000 Commit: Yuri Victorovich CommitDate: 2024-07-12 14:41:23 +0000 science/spheral: update 2024.01.1 → 2024.06.1 Reported by: portscout --- science/spheral/Makefile | 6 ++++-- science/spheral/distinfo | 6 +++--- science/spheral/files/patch-cmake_SetupSpheral.cmake | 15 +++++++++++++-- science/spheral/pkg-plist | 11 ++++++++++- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/science/spheral/Makefile b/science/spheral/Makefile index 8cb64f7e45bd..953d8241b7a6 100644 --- a/science/spheral/Makefile +++ b/science/spheral/Makefile @@ -1,6 +1,6 @@ PORTNAME= spheral DISTVERSIONPREFIX= v -DISTVERSION= 2024.01.1 +DISTVERSION= 2024.06.1 CATEGORIES= science # physics MAINTAINER= yuri@FreeBSD.org @@ -45,7 +45,9 @@ CMAKE_ARGS= -Daneos_DIR=${LOCALBASE} \ -Dqhull_DIR=${LOCALBASE} \ -Dsilo_DIR=${LOCALBASE} \ -Dzlib_DIR=/usr -CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} +CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ + -DPython_EXECUTABLE=${PYTHON_CMD} \ + -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_OFF= ENABLE_TESTS ENABLE_DOCS \ ENABLE_ANEOS \ ENABLE_CUDA diff --git a/science/spheral/distinfo b/science/spheral/distinfo index fa5a70aa0e3b..9ce4e897f727 100644 --- a/science/spheral/distinfo +++ b/science/spheral/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1712538078 -SHA256 (LLNL-spheral-v2024.01.1_GH0.tar.gz) = ad1ec0e51cfb7c6d7610e96ed84ef6b5324de31187efe6aa37584431b03b3352 -SIZE (LLNL-spheral-v2024.01.1_GH0.tar.gz) = 6699022 +TIMESTAMP = 1720767460 +SHA256 (LLNL-spheral-v2024.06.1_GH0.tar.gz) = 18892ad49195157623b95c93d55b55bfea2602003726c00d789419f7bdfe0fc1 +SIZE (LLNL-spheral-v2024.06.1_GH0.tar.gz) = 6727017 SHA256 (LLNL-PolyClipper-e1fe47c_GH0.tar.gz) = 52b358f32f523e6030ed090411c90f0811db12046b6cb6fa8e4cafe4f8b3567e SIZE (LLNL-PolyClipper-e1fe47c_GH0.tar.gz) = 274184 SHA256 (LLNL-PYB11Generator-7160812_GH0.tar.gz) = 9f257b9a5b2503aaacdba48d785bd349c95849a282e1e181ccee2c0f319135cb diff --git a/science/spheral/files/patch-cmake_SetupSpheral.cmake b/science/spheral/files/patch-cmake_SetupSpheral.cmake index f61d586ddd96..6f422eff5c33 100644 --- a/science/spheral/files/patch-cmake_SetupSpheral.cmake +++ b/science/spheral/files/patch-cmake_SetupSpheral.cmake @@ -1,8 +1,19 @@ - eliminate the need to use git ---- cmake/SetupSpheral.cmake.orig 2024-01-20 00:52:15 UTC +--- cmake/SetupSpheral.cmake.orig 2024-07-11 14:54:59 UTC +++ cmake/SetupSpheral.cmake -@@ -169,7 +169,7 @@ if (ENABLE_TESTS) +@@ -21,8 +21,8 @@ include(Compilers) + #------------------------------------------------------------------------------- + + # Need to define Python paths here as BLT finds it's own Python package. +-set(Python_EXECUTABLE ${python_DIR}/bin/python3) +-set(Python3_EXECUTABLE ${python_DIR}/bin/python3) ++#set(Python_EXECUTABLE ${python_DIR}/bin/python3) ++#set(Python3_EXECUTABLE ${python_DIR}/bin/python3) + + set(ENABLE_MPI ON CACHE BOOL "") + set(ENABLE_OPENMP ON CACHE BOOL "") +@@ -167,7 +167,7 @@ if (ENABLE_TESTS) set(test_files1 "") if (EXISTS "${CMAKE_SOURCE_DIR}/.git") execute_process( diff --git a/science/spheral/pkg-plist b/science/spheral/pkg-plist index 3d5c87ce9739..48df7b1d08f8 100644 --- a/science/spheral/pkg-plist +++ b/science/spheral/pkg-plist @@ -75,6 +75,7 @@ include/CRKSPH/editMultimaterialSurfaceTopology.hh include/CRKSPH/volumeSpacing.hh include/CRKSPH/zerothOrderSurfaceCorrections.hh include/DEM/CircularPlaneSolidBoundary.hh +include/DEM/ClippedSphereSolidBoundary.hh include/DEM/ContactStorageLocation.hh include/DEM/CylinderSolidBoundary.hh include/DEM/DEMBase.hh @@ -133,6 +134,7 @@ include/DataBase/IncrementBoundedState.hh include/DataBase/IncrementBoundedStateInline.hh include/DataBase/IncrementState.hh include/DataBase/IncrementStateInline.hh +include/DataBase/MaxReplaceState.hh include/DataBase/PureReplaceBoundedState.hh include/DataBase/PureReplaceBoundedStateInline.hh include/DataBase/PureReplaceState.hh @@ -250,19 +252,25 @@ include/FileIO/SidreFileIO.hh include/FileIO/SiloFileIO.hh include/FileIO/vectorstringUtilities.hh include/GSPH/AcousticWaveSpeed.hh +include/GSPH/BarthJespersenLimiter.hh +include/GSPH/CompatibleMFVSpecificThermalEnergyPolicy.hh include/GSPH/DavisWaveSpeed.hh include/GSPH/EinfeldtWaveSpeed.hh -include/GSPH/GHLLC.hh include/GSPH/GSPHFieldNames.hh include/GSPH/GSPHHydroBase.hh include/GSPH/GenericRiemannHydro.hh include/GSPH/HLLC.hh include/GSPH/LimiterBase.hh include/GSPH/MFMHydroBase.hh +include/GSPH/MFVHydroBase.hh +include/GSPH/MFVIncrementSpecificThermalEnergyPolicy.hh +include/GSPH/MFVIncrementVelocityPolicy.hh +include/GSPH/MassFluxPolicy.hh include/GSPH/MinModLimiter.hh include/GSPH/OspreLimiter.hh include/GSPH/ReplaceWithRatioPolicy.hh include/GSPH/RiemannSolverBase.hh +include/GSPH/SecondOrderArtificialViscosity.hh include/GSPH/SuperbeeLimiter.hh include/GSPH/VanAlbaLimiter.hh include/GSPH/VanLeerLimiter.hh @@ -270,6 +278,7 @@ include/GSPH/WaveSpeedBase.hh include/GSPH/computeMFMDensity.hh include/GSPH/computeSPHVolume.hh include/GSPH/computeSumVolume.hh +include/GSPH/initializeGradients.hh include/Geometry/Box1d.hh include/Geometry/Box1dInline.hh include/Geometry/CellFaceFlag.hh