From nobody Tue Jun 28 16:48:31 2022 X-Original-To: dev-commits-ports-all@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 AA8A7867192; Tue, 28 Jun 2022 16:48:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LXVsW3vghz4pGg; Tue, 28 Jun 2022 16:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656434911; 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=jUT5/bCnbHCDiCYXMzQjxW7fJAUWtGMIMqhDhCQr1zc=; b=a0WAhUF5HwEFYEFGL2PrLqQeoT67e86uEdzpMcPDWL9i0xCEbWnbzR1lJnIzSXPG8zVrmv 6uhfNylN7t6jSlnqwUVG6mV/Cqrne3tA84OW3I915Ns2UeUf5a2DZgqzCm0ux9lMZ7KD8K 104WmVOfmf0f3LlHO3NDkL+1tauzwE53FR0nUIFB4cr4Glgi/drrMFVCPvARwePsMv//g/ WCNlo0Vx0BpZP3a4UmUoZQGeZ56ir3L0PkJ6aGUNJrTUalElr/IxCbuU+0u0K2kCc2uiaa w+BhwzDnRLq4bkwG/fkPppbDqV4ytKEAMBv3zKnSUqDynYsMoruvFkeNBAicsg== 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 634CC20A2E; Tue, 28 Jun 2022 16:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25SGmViF046505; Tue, 28 Jun 2022 16:48:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25SGmVn9046504; Tue, 28 Jun 2022 16:48:31 GMT (envelope-from git) Date: Tue, 28 Jun 2022 16:48:31 GMT Message-Id: <202206281648.25SGmVn9046504@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: 7b6934683f3d - main - science/liggghts: Update 3.8.0-26 -> 3.8.0-45 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 7b6934683f3d485b9d731fee30c891a6c39b487f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656434911; 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=jUT5/bCnbHCDiCYXMzQjxW7fJAUWtGMIMqhDhCQr1zc=; b=K0rhw5iROKofnE17VIdgHAJiIbFmn6eSYH33iDW28xwdS3ZCKoh+W1+xdp3cYBonNk8Wq/ DxAL0Lgk/eYPF+YavqYC7wGd/q1v1bieuFWGWvnNgSTkAEJLNqMTMQFVBq64OOULJYyHGb X2QaRmCft8AnBKFgzR2EWkv8f9gTUse46z6nnwGHnCkP1VAknkK0LVugEEQjGICa2P5LiE hBMbTWysxgQLvgzyNxJZ12QIWN7u/poELN7RU4aXOOONINHA+wdt5G5DuvrGXMPpIcLUNU RZNt9TU/dfNKWlErSSulercN48PxKhhWHZ5ulEmNPh6WnHBaRRTve6TcS5Go2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656434911; a=rsa-sha256; cv=none; b=bgVavonHU89rSh22UAkV4DeGuKy/9XTUpG3mNL/NQlc7nfgxA2qikyYRuePTEu+5vOorAa PpWz/u8yLHASCWAgzp8I6v9cRBX1ZQkaylfYSaQp+kKZZEsx7hkaBzj+/KpWHy+bg0aGau C443Mi9KCRsNKFB5ObTxMM2EBlussMBUgzq910L7kGex4z+n4EhJQbGXkeADkfKBR/+cLP CHpyb6Txv8tiblnsM2lOiUyZ/PuESaK7EF623W3gVkNFYdZ556haPfAmSnLnaMhmB111up Rwd6Ff9+G9FoT3p1I+hyobkZ9xijmKcdTZoH1QybB0XtjvWn/FCkfpHtT46QMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b6934683f3d485b9d731fee30c891a6c39b487f commit 7b6934683f3d485b9d731fee30c891a6c39b487f Author: Yuri Victorovich AuthorDate: 2022-06-28 16:47:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-28 16:48:28 +0000 science/liggghts: Update 3.8.0-26 -> 3.8.0-45 Reported by: portscout --- science/liggghts/Makefile | 28 ++++++++++++--------- science/liggghts/distinfo | 6 ++--- science/liggghts/files/patch-finish.cpp | 11 --------- science/liggghts/files/patch-math__vector.h | 38 ----------------------------- science/liggghts/files/patch-pair.cpp | 20 --------------- science/liggghts/pkg-plist | 8 ++++++ 6 files changed, 27 insertions(+), 84 deletions(-) diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile index 63579b04ee75..d00e664f09b1 100644 --- a/science/liggghts/Makefile +++ b/science/liggghts/Makefile @@ -1,7 +1,6 @@ PORTNAME= liggghts -DISTVERSION= 3.8.0-26 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -g6e873439 +DISTVERSION= 3.8.0-45 +DISTVERSIONSUFFIX= -g86544c3f CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -13,26 +12,31 @@ LICENSE_FILE= ${WRKSRC}/../LICENSE BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ - libmpi.so:net/openmpi \ + libhdf5_hl.so:science/hdf5 \ + libmpi.so:net/mpich \ + libnetcdf.so:science/netcdf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkViewsCore-8.2.so:math/vtk8 + libvtkViewsCore-9.1.so:math/vtk9 + +USES= compiler:c++17-lang cmake fortran gl jpeg python qt:5 xorg +USE_XORG= ice sm x11 xext xt +USE_QT= core declarative gui network opengl sql widgets qmake_build buildtools_build +USE_GL= gl +USE_LDCONFIG= yes -USES= compiler:c++17-lang cmake fortran jpeg qt:5 xorg USE_GITHUB= yes GH_ACCOUNT= CFDEMproject GH_PROJECT= ${PORTNAME:tu}-PUBLIC -USE_XORG= ice sm x11 xext xt -USE_QT= core gui sql widgets qmake_build buildtools_build -USE_LDCONFIG= yes -CMAKE_ARGS= -DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicc" \ - -DMPI_CXX_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicxx" +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \ + -DPython3_EXECUTABLE=${PYTHON_CMD} WRKSRC_SUBDIR= src CFLAGS+= -fPIC -CXXFLAGS+= -fPIC +CXXFLAGS+= -fPIC \ + -I${LOCALBASE}/include/vtk-9.1 BINARY_ALIAS= sed=gsed diff --git a/science/liggghts/distinfo b/science/liggghts/distinfo index effa2e54e9f7..59bdf3cf1bef 100644 --- a/science/liggghts/distinfo +++ b/science/liggghts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1587928829 -SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-26-g6e873439_GH0.tar.gz) = ac2f9100d31c6a9dc92a7b30057e0e36a3505f437e33ac56055c67f864a09262 -SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-26-g6e873439_GH0.tar.gz) = 36209540 +TIMESTAMP = 1656427270 +SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-45-g86544c3f_GH0.tar.gz) = 98dd6e9dabfafabe2f3da66294e59b7cf5580ae9f7c07d797b9288a971b51607 +SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-45-g86544c3f_GH0.tar.gz) = 36278241 diff --git a/science/liggghts/files/patch-finish.cpp b/science/liggghts/files/patch-finish.cpp deleted file mode 100644 index fd27979c4b65..000000000000 --- a/science/liggghts/files/patch-finish.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- finish.cpp.orig 2018-11-02 06:42:25 UTC -+++ finish.cpp -@@ -719,7 +719,7 @@ void Finish::end(int flag) - - nneighfull = 0; - if (m < neighbor->old_nrequest) { -- if (neighbor->lists[m]->numneigh > 0) { -+ if (neighbor->lists[m]->numneigh) { // see https://www.cfdem.com/forums/error-non-const-lvalue-reference-type-basicostringstream-cannot-bind-temporary-type - int inum = neighbor->lists[m]->inum; - int *ilist = neighbor->lists[m]->ilist; - int *numneigh = neighbor->lists[m]->numneigh; diff --git a/science/liggghts/files/patch-math__vector.h b/science/liggghts/files/patch-math__vector.h deleted file mode 100644 index 4c96ce457e1a..000000000000 --- a/science/liggghts/files/patch-math__vector.h +++ /dev/null @@ -1,38 +0,0 @@ ---- math_vector.h.orig 2018-11-02 06:51:37 UTC -+++ math_vector.h -@@ -94,7 +94,7 @@ inline void vec_neg(vector &dest) { - dest[2] = -dest[2]; } - - inline void vec_norm(vector &dest) { // a/|a| -- register double f = sqrt(vec_dot(dest, dest)); -+ double f = sqrt(vec_dot(dest, dest)); - dest[0] /= f; - dest[1] /= f; - dest[2] /= f; } -@@ -222,7 +222,7 @@ inline void form_subtr(shape &dest, form - dest[3] -= src[3]; dest[4] -= src[4]; dest[5] -= src[5]; } - - inline int form_inv(form &m_inv, form &m) { // m^-1 -- register double det = form_det(m); -+ double det = form_det(m); - if (fzero(det)) return 0; - m_inv[0] = (m[1]*m[2]-m[3]*m[3])/det; - m_inv[1] = (m[0]*m[2]-m[4]*m[4])/det; -@@ -377,7 +377,7 @@ inline void form4_unit(form4 &dest) { - dest[0] = dest[1] = dest[2] = dest[3] = 1.0; } - - inline double form4_det(form4 &m) { -- register double f = m[6]*m[7]-m[5]*m[8]; -+ double f = m[6]*m[7]-m[5]*m[8]; - return m[0]*( - m[1]*(m[2]*m[3]-m[4]*m[4])+ - m[5]*(2.0*m[4]*m[7]-m[2]*m[5])-m[3]*m[7]*m[7])+f*f+ -@@ -387,7 +387,7 @@ inline double form4_det(form4 &m) { - m[9]*(m[4]*m[4]-m[2]*m[3])); } - - inline int form4_inv(form4 &m_inv, form4 &m) { -- register double det = form4_det(m); -+ double det = form4_det(m); - if (fzero(det)) return 0; - m_inv[0] = (m[1]*(m[2]*m[3]-m[4]*m[4])+ - m[5]*(2.0*m[4]*m[7]-m[2]*m[5])-m[3]*m[7]*m[7])/det; diff --git a/science/liggghts/files/patch-pair.cpp b/science/liggghts/files/patch-pair.cpp deleted file mode 100644 index 4e1a7db54aef..000000000000 --- a/science/liggghts/files/patch-pair.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- pair.cpp.orig 2018-11-02 06:56:59 UTC -+++ pair.cpp -@@ -566,7 +566,7 @@ void Pair::init_tables_disp(double cut_l - } - - rsq = rsq_lookup.f; -- register double x2 = g2*rsq, a2 = 1.0/x2; -+ double x2 = g2*rsq, a2 = 1.0/x2; - x2 = a2*exp(-x2); - - rdisptable[i] = rsq_lookup.f; -@@ -612,7 +612,7 @@ void Pair::init_tables_disp(double cut_l - if (rsq_lookup.f < (cut_lj_globalsq = cut_lj_global * cut_lj_global)) { - rsq_lookup.f = cut_lj_globalsq; - -- register double x2 = g2*rsq, a2 = 1.0/x2; -+ double x2 = g2*rsq, a2 = 1.0/x2; - x2 = a2*exp(-x2); - f_tmp = g8*(((6.0*a2+6.0)*a2+3.0)*a2+1.0)*x2*rsq; - e_tmp = g6*((a2+1.0)*a2+0.5)*x2; diff --git a/science/liggghts/pkg-plist b/science/liggghts/pkg-plist index b86a3b0abb72..b48b3b3b1e41 100644 --- a/science/liggghts/pkg-plist +++ b/science/liggghts/pkg-plist @@ -225,8 +225,12 @@ include/liggghts/fix_setforce.h include/liggghts/fix_sph.h include/liggghts/fix_sph_density_continuity.h include/liggghts/fix_sph_density_corr.h +include/liggghts/fix_sph_density_drift_corr.h include/liggghts/fix_sph_density_summation.h +include/liggghts/fix_sph_integrity.h +include/liggghts/fix_sph_mixidx.h include/liggghts/fix_sph_pressure.h +include/liggghts/fix_sph_velgrad.h include/liggghts/fix_spring.h include/liggghts/fix_spring_rg.h include/liggghts/fix_spring_self.h @@ -244,6 +248,9 @@ include/liggghts/fix_wall_gran_base.h include/liggghts/fix_wall_region.h include/liggghts/fix_wall_region_sph.h include/liggghts/fix_wall_sph.h +include/liggghts/fix_wall_sph_general.h +include/liggghts/fix_wall_sph_general_base.h +include/liggghts/fix_wall_sph_general_gap.h include/liggghts/force.h include/liggghts/general_container.h include/liggghts/general_container_I.h @@ -344,6 +351,7 @@ include/liggghts/pair_line_lj.h include/liggghts/pair_soft.h include/liggghts/pair_sph.h include/liggghts/pair_sph_artvisc_tenscorr.h +include/liggghts/pair_sph_morris_tenscorr.h include/liggghts/particleToInsert.h include/liggghts/particleToInsertSuperquadric.h include/liggghts/particleToInsert_multisphere.h