git: f9bdc64c4f6c - main - science/spheral: update 2024.01.1 → 2024.06.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 12 Jul 2024 14:41:26 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f9bdc64c4f6c491dd524fd4af32beac53403d0ad

commit f9bdc64c4f6c491dd524fd4af32beac53403d0ad
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-07-12 14:40:47 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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