From patchwork Tue Oct 10 06:25:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 54705 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8E2127BBE9; Tue, 10 Oct 2023 07:26:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9A06127BBE2 for ; Tue, 10 Oct 2023 07:26:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qq6CZ-00024U-DA; Tue, 10 Oct 2023 02:26:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qq6CX-00023i-CF for guix-patches@gnu.org; Tue, 10 Oct 2023 02:26:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qq6CX-0002hm-44 for guix-patches@gnu.org; Tue, 10 Oct 2023 02:26:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qq6Cs-00070a-4A for guix-patches@gnu.org; Tue, 10 Oct 2023 02:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v3 2/3] gnu: openfoam-org: Update to 11. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Oct 2023 06:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66262@debbugs.gnu.org <66262@debbugs.gnu.org> Cc: reza Received: via spool by 66262-submit@debbugs.gnu.org id=B66262.169691916626840 (code B ref 66262); Tue, 10 Oct 2023 06:27:02 +0000 Received: (at 66262) by debbugs.gnu.org; 10 Oct 2023 06:26:06 +0000 Received: from localhost ([127.0.0.1]:33848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq6Bx-0006yl-0h for submit@debbugs.gnu.org; Tue, 10 Oct 2023 02:26:06 -0400 Received: from a5-160.smtp-out.eu-west-1.amazonses.com ([54.240.5.160]:40305) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018b18430da9-37594e16-03cb-4c0b-86dd-76aa61c88050-000000@mail.housseini.me>) id 1qq6Bt-0006xp-VI for 66262@debbugs.gnu.org; Tue, 10 Oct 2023 02:26:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1696919129; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=a1Zfz3Hzrca9eNfIrwrDO/MEmRxXuPUBQKuPBjbgOhE=; b=CIdQAcIfI1e03Ml4pQdK3mWvgpCECG7Fy5/yJOwOwGox9FTJZTbjm/CBnENxY7F5 0ekFBiak09o4HIN4iBWDacD+jZjwAFIX0Sb0Uq86CSYTqozAX7IyPCGcHun6LhcHIv4 Mm18tNk0D6tGXDj+JhOw+0twV6tlwQM8+xkstD44= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1696919129; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=a1Zfz3Hzrca9eNfIrwrDO/MEmRxXuPUBQKuPBjbgOhE=; b=F6EwccylQihNTKkISk74UDFfgN09uoebkcjMCuH+Gl5keV4p76DPBoar2UGdzmaN m4FNZgIcJA27GEFnnTyFEl1gZ/aTW2yl+bDBEBKgJPo8h+IWehzppmW1y5p8/LAOdAD BKJpBFs4AExs8k3uLFEogsDqLRBoTWVaiPS59TiI= Date: Tue, 10 Oct 2023 06:25:29 +0000 Mime-Version: 1.0 In-Reply-To: References: X-Mailer: Amazon WorkMail Thread-Index: AQHZ+0KLumvKmCKhSmOZLKw0EepbNQAAAS/2 Thread-Topic: [PATCH v3 2/3] gnu: openfoam-org: Update to 11. X-Wm-Sent-Timestamp: 1696919128 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018b18430da9-37594e16-03cb-4c0b-86dd-76aa61c88050-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.10.10-54.240.5.160 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (openfoam-org): Update to 11. Use openfoam-package factory function to create package. --- gnu/packages/simulation.scm | 372 +++++------------------------------- 1 file changed, 49 insertions(+), 323 deletions(-) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 4b95688e33..6ce15a2c2d 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -374,329 +374,55 @@ (define* (openfoam-package source version name home-page synopsis) (home-page home-page)))) (define-public openfoam-org - (package - (name "openfoam-org") - (version "10.20230119") - (source (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/OpenFOAM/OpenFOAM-" - (version-major version))) - (commit (second (string-split version #\.))))) - (sha256 - (base32 - "0icvwg7s6vnkgmdiczivia9pbrgx8nanw9a4j080fzfvdv9vxhzp")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet `(begin - ;; patch shell paths - (substitute* (list "wmake/src/Makefile" - "wmake/makefiles/general") - (("/bin/sh") - "sh")) - (substitute* "etc/bashrc" - ;; only go back one folder level - (("\\$\\(dirname \\$\\{BASH_SOURCE:-\\$0\\}\\)/../..") - "$(dirname ${BASH_SOURCE:-$0})/..") - ;; do not use openfoam folder convention - (("^export WM_PROJECT_DIR=.*$") - (string-append - "export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR\n")) - ;; do not source bash_completion (gives error) - (("^.*bash_completion.*$" all) - (string-append "#" all)) - ;; set same version as guix package - (("^export WM_PROJECT_VERSION=.*$") - (string-append "export WM_PROJECT_VERSION=" - ,version "\n"))) - ;; add expand flag to RunFunctions - (substitute* "bin/tools/RunFunctions" - (("foamDictionary (.*)" all args) - (string-append "foamDictionary -expand " args))) - ;; disable failing test - (substitute* "test/postProcessing/channel/Allrun" - (("^.*getApplication.*$" all) - (string-append "#" all "\n"))))))) - (build-system gnu-build-system) - (inputs (list boost - cgal - git - gmp - libxt - metis - mpfr - ncurses - openmpi - openssh - paraview - pt-scotch32 - readline - zlib)) - (native-inputs (list bison - flex - ;; paraview plugin dependencies - cli11 - cmake-minimal - cgns - curl - double-conversion - eigen - expat - ffmpeg - fmt - freetype - gdal - gl2ps - glew - gmsh - hdf5 - jsoncpp - libjpeg-turbo - libogg - libpng - libharu - libtheora - libtiff - libx11 - libxml2 - lz4 - netcdf - nlohmann-json - proj - protobuf - pugixml - python - python-mpi4py - qtbase-5 - qtsvg-5 - qttools-5 - qtwebengine-5 - qtxmlpatterns - utfcpp - vtk - xz)) - (propagated-inputs (list gnuplot)) - (outputs '("debug" ;~60MB - "out")) - (arguments - (list - ;; Executable files and shared libraries are located in the 'platforms' - ;; subdirectory. - #:strip-directories - #~(list "share/OpenFOAM/platforms/linux64GccDPInt32Opt/bin" - "share/OpenFOAM/platforms/linux64GccDPInt32Opt/lib") - - #:modules - '((ice-9 ftw) - (ice-9 regex) - (ice-9 string-fun) - (srfi srfi-1) - (guix build gnu-build-system) - (guix build utils)) - - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'patch-HOME-path - (lambda _ - (setenv "HOME" "/tmp"))) - (add-before 'build 'rename-self - (lambda _ - ;; The script 'bin/foamEtcFile' derives the version name based - ;; on the current directory name (!), so make sure to follow the - ;; expected naming convention. - (let ((here (canonicalize-path ".")) - (target #$(string-append - "OpenFOAM-" - (string-map (match-lambda - (#\. #\-) - (chr chr)) - (package-version this-package))))) - (chdir "..") - (format #t "renaming '~a' to '~a'~%" - here target) - (rename-file here target) - (chdir target)))) - (add-before 'build 'patch-scotch - (lambda _ - (substitute* "etc/config.sh/scotch" - (("^export SCOTCH_VERSION=scotch_.*$") - (string-append "export SCOTCH_VERSION=scotch_" - #$(package-version pt-scotch32) "\n")) - (("^export SCOTCH_ARCH_PATH=.*$") - (string-append "export SCOTCH_ARCH_PATH=" - (assoc-ref %build-inputs "pt-scotch32") - "\n"))) #t)) - (add-before 'build 'patch-mpi - (lambda _ - (let* ((mpi-path (assoc-ref %build-inputs "openmpi")) - (mpi-version #$(package-version openmpi))) - ;; specify openmpi type - (substitute* "etc/bashrc" - (("WM_MPLIB=SYSTEMOPENMPI") - "WM_MPLIB=OPENMPI")) - (substitute* "etc/config.sh/mpi" - (("export FOAM_MPI=openmpi-.*$") - (string-append "export FOAM_MPI=openmpi-" - mpi-version "\n")) - (("export MPI_ARCH_PATH=.*\\$FOAM_MPI.*$") - (string-append "export MPI_ARCH_PATH=" mpi-path - "\n")))) #t)) - (add-before 'build 'patch-paraview - (lambda _ - (substitute* "etc/config.sh/paraview" - (("^export ParaView_VERSION=.*$") - (string-append "export ParaView_VERSION=" - #$(package-version paraview) "\n")) - (("^export ParaView_DIR=.*$") - (string-append "export ParaView_DIR=" - (assoc-ref %build-inputs "paraview") - "\n"))) #t)) - (add-before 'build 'add-rpaths - (lambda _ - (letrec* ((libraries '("boost" "cgal" - "gmp" - "metis" - "mpfr" - "pt-scotch32" - "openmpi" - "zlib" - "paraview")) - (rpaths - (fold-right (lambda (library rpaths) - (string-append rpaths - "-rpath=" - (assoc-ref - %build-inputs library) - "/lib,")) "" libraries)) - (openfoam-lib - (string-append #$output - "/share/OpenFOAM/platforms/linux64GccDPInt32Opt/lib")) - (ldflags - (string-append "-Wl," - rpaths - "-rpath=" - openfoam-lib - "," - "-rpath=" - openfoam-lib - "/dummy," - "-rpath=" - openfoam-lib - "/paraview-" - #$(version-major+minor (package-version - paraview))))) - (substitute* "wmake/rules/linux64Gcc/c++" - (("\\$\\(LIB_HEADER_DIRS\\) -fPIC" all) - (string-append all " " ldflags)))) #t)) - (add-before 'build 'add-vtk-include-path - (lambda _ - (let* ((vtk-version #$(version-major+minor - (package-version vtk))) - (vtk-root (assoc-ref %build-inputs "vtk")) - (vtk-inc (string-append vtk-root "/include/vtk-" vtk-version)) - (vtk-inc-flag (string-append "-I" vtk-inc))) - (substitute* "wmake/rules/linux64Gcc/c++" - (("\\$\\(LIB_HEADER_DIRS\\)" all) - (string-append all " " vtk-inc-flag " ")))) - #t)) - (delete 'configure) ;no configure phase - (replace 'build - (lambda _ - ;; compile OpenFOAM libraries and applications - (invoke "bash" "-c" - (format #f - "source ./etc/bashrc && ./Allwmake -j~a" - (parallel-job-count))))) - (add-after 'build 'cleanup - ;; Avoid unnecessary, voluminous object and dep files. - (lambda _ - (when (file-exists? "platforms/linux64GccDPInt32Opt/src") - (delete-file-recursively - "platforms/linux64GccDPInt32Opt/src")) - (when (file-exists? - "platforms/linux64GccDPInt32OptOPENMPI") - (delete-file-recursively - "platforms/linux64GccDPInt32OptOPENMPI")) - (for-each delete-file - (find-files "." "\\.o$")) #t)) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (when (file-exists? "test") - (with-directory-excursion "test" - (invoke "bash" "-c" - (format #f - "source ../etc/bashrc && ./Allrun -j~a" - (parallel-job-count))))) - ;; too many tutorials are failing - ;; (with-directory-excursion "tutorials" - ;; (invoke "bash" "-c" "source ../etc/bashrc && ./Alltest")) - ) #t)) - (replace 'install - (lambda _ - (let ((install-dir (string-append #$output - "/share/OpenFOAM"))) - (mkdir-p install-dir) ;create install directory - ;; move contents of build directory to install directory - (copy-recursively "." install-dir)))) - (add-after 'install 'add-symbolic-link - (lambda _ - (let* ((bin (string-append #$output "/bin")) - (lib (string-append #$output "/lib")) - (openfoam (string-append #$output - "/share/OpenFOAM")) - (build-bin (string-append openfoam - "/platforms/linux64GccDPInt32Opt/bin")) - (build-lib (string-append openfoam - "/platforms/linux64GccDPInt32Opt/lib")) - (foam-bin (string-append openfoam "/bin"))) - ;; add symbolic links in standard 'bin' directory - (mkdir-p bin) - (for-each (lambda (file) - (unless (member file - '("." "..")) - (symlink (string-append build-bin "/" - file) - (string-append bin "/" file)))) - (scandir build-bin)) - (for-each (lambda (file) - (unless (member file - '("." "..")) - (symlink (string-append foam-bin "/" - file) - (string-append bin "/" file)))) - (scandir foam-bin)) - ;; add symbolic link for standard 'lib' directory - (symlink build-lib lib)) #t))))) - (native-search-paths - (list (search-path-specification - (variable "WM_PROJECT_DIR") - (separator #f) - (files '("share/OpenFOAM"))))) - ;; Note: - ;; Tutorial files are installed read-only in /gnu/store. - ;; To allow write permissions on files copied from the store a - ;; 'chmod' step is needed before running the applications. For - ;; example, from a user's login: - ;; $ source $(dirname $(which blockMesh))/../../../etc/bashrc - ;; $ mkdir -p $FOAM_RUN - ;; $ cd $FOAM_RUN - ;; $ cp -r $FOAM_TUTORIALS/incompressible/simpleFoam/pitzDaily . - ;; $ cd pitzDaily - ;; $ chmod -R u+w . - ;; $ blockMesh - (synopsis "Framework for numerical simulation of fluid flow") - (description - "OpenFOAM provides a set of solvers and methods for tackling -problems in the field of Computational Fluid Dynamics (CFD). It is written in -C++. Governing equations such as the Navier-Stokes equations can be solved in -integral form. Physical processes such as phase change, droplet transport and -chemical reaction can be modelled. Numerical methods are included to deal with -sharp gradients, such as those encountered in flows with shock waves and flows -with gas/liquid interfaces. Large problems may be split into smaller, connected -problems for efficient solution on parallel systems.") - (license license:gpl3+) - (home-page "https://openfoam.org"))) + (let* ((version "11") + (name "openfoam-org") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/OpenFOAM/OpenFOAM-" + (version-major version) + "/archive/" + "version-" + (version-major version) + ".tar.gz")) + (sha256 (base32 + "1h70a5ni2psx7bcx2xg6aqraj2kkbfn8mflh2akbp6k9mmpgih7b")) + (modules '((guix build utils))) + (snippet `(begin + ;; patch shell paths + (substitute* (list "wmake/src/Makefile" + "wmake/makefiles/general") + (("/bin/sh") + "sh")) + (substitute* "etc/bashrc" + ;; only go back one folder level + (("\\$\\(dirname \\$\\{BASH_SOURCE:-\\$0\\}\\)/../..") + "$(dirname ${BASH_SOURCE:-$0})/..") + ;; do not use openfoam folder convention + (("^export WM_PROJECT_DIR=.*$") + (string-append + "export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR +")) + ;; do not source bash_completion (gives error) + (("^.*bash_completion.*$" all) + (string-append "#" all)) + ;; set same version as guix package + (("^export WM_PROJECT_VERSION=.*$") + (string-append "export WM_PROJECT_VERSION=" + ,version "\n"))) + ;; add expand flag to RunFunctions + (substitute* "bin/tools/RunFunctions" + (("foamDictionary (.*)" all args) + (string-append "foamDictionary -expand " + args))) + ;; disable failing test + (substitute* "test/postProcessing/channel/Allrun" + (("^.*getApplication.*$" all) + (string-append "#" all "\n"))))))) + (home-page "https://openfoam.org") + (synopsis "Framework for numerical simulation of fluid flow") + (template (openfoam-package source version name home-page synopsis))) + (package + (inherit template)))) (define-public openfoam (deprecated-package "openfoam" openfoam-org))