From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4BlxDbubFmUfCQAAG6o9tA:P1 (envelope-from ) for ; Fri, 29 Sep 2023 11:41:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4BlxDbubFmUfCQAAG6o9tA (envelope-from ) for ; Fri, 29 Sep 2023 11:41:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CC3444204F for ; Fri, 29 Sep 2023 11:41:14 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=housseini.me header.s=solmzk3ljecfoypi3q6x2mqs3bucnhjw header.b=LYY8x1IY; dkim=fail ("headers rsa verify failed") header.d=amazonses.com header.s=shh3fegwg5fppqsuzphvschd53n6ihuv header.b=dcLZTB2R; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695980475; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=5Z6DXmLLHkcTKuy/wf6vgbZ+3f7CZwZiYLIEsVc69P4=; b=lRYGyyIrHvf/5OeMAJER20ddJcnS06hEfIjD03aPKTypDAhPJ+FkPCPDAKwCi+33FQi2ts viIQ/I+IssDpvFIIx6alnIF8w4qw1PmDYB4MJKX4obwiMrhT+W1JguQaaQM/hwDMvMSJ4i 3IYW8fHq42SbYutwVrp+wWwuOyHv9jRhvaKZCigBGB1CjXcBeZQ5qEL0kxfH4XNRySKFUi Ox14SIJD1xJ+Hs+ZpVso0bFJ3isQQ/K+qF4tKuI2LGwMEo1uHV4jHADBCVE7FuvFYqbvUX fD/Au/OWObOyVedNkmSE8xAZTGDpgs8sw4Q1bwt0DbypsrMTOxdvjdZUZY5tOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=housseini.me header.s=solmzk3ljecfoypi3q6x2mqs3bucnhjw header.b=LYY8x1IY; dkim=fail ("headers rsa verify failed") header.d=amazonses.com header.s=shh3fegwg5fppqsuzphvschd53n6ihuv header.b=dcLZTB2R; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695980475; a=rsa-sha256; cv=none; b=KmIMmV47EY9GaN1U9nkdsr13MYEcAqBw1ESO/+wOEJBYjShog+H81tJW2BdF8xZPjO0Ndf NLBwK/9da5bH0Trj9Y8CQhJuMPmWqalWUI1R1elyIRhCtswSjvWuOJA8pi2G9t4uS+Gnv7 L66HzikO3owFVelYMMERpH4HAAK5KOwXk5ry75VeuNOLfpTfhWTZiauKNVO5Rpo/Sqn31l rBKgyPHJ0jbdC4kcAQ3kyoacrJkXQCyj7S8xfUDaoDGvQ4uRnoIl5PMQwW9X49+vJZy+jF 9+xzPUuIcgD1Hl6LQ+bdt2Ckh/GI87GYebAXm31M0bRquX855a+D6NpnoT919Q== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9zO-0002UL-IN; Fri, 29 Sep 2023 05:40:51 -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 1qm9zN-0002Tf-6N for guix-patches@gnu.org; Fri, 29 Sep 2023 05:40:49 -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 1qm9zM-0000bm-V6 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:40:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9zb-0005TN-KP for guix-patches@gnu.org; Fri, 29 Sep 2023 05:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v2 2/3] gnu: openfoam-org: Update to 11. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Sep 2023 09:41:03 +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.169598042520927 (code B ref 66262); Fri, 29 Sep 2023 09:41:03 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Sep 2023 09:40:25 +0000 Received: from localhost ([127.0.0.1]:55364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9yy-0005RT-E7 for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:40:25 -0400 Received: from a50-247.smtp-out.eu-west-1.amazonses.com ([54.240.50.247]:51701) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018ae04f1969-8ad09224-8477-4bfa-9a64-bc6caec1edef-000000@mail.housseini.me>) id 1qm9yw-0005Qw-Hk for 66262@debbugs.gnu.org; Fri, 29 Sep 2023 05:40:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1695980395; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=GuwCc+3LFfoYPexVUfeb3t8uNvlGFgUiIa5eE/DxFjs=; b=LYY8x1IY7xeigo6B6L6QP3EyKdcnWu/wDSe37kbsu3OgQtNxr4pa7SiPjjOL774C GWMzORhzPjJIg7473cLzLW0J8E/+kw2aPp7kv1AG4Qw/rZhCUaG7Mpoc5kUBTbqEc13 JRKRr/+ClTFX2QnT6gNAky8DDSTRGpD1t70CEduw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1695980395; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=GuwCc+3LFfoYPexVUfeb3t8uNvlGFgUiIa5eE/DxFjs=; b=dcLZTB2R96HO6Mhh1QQ0R4TyL0Y17CVbp8uu6C0gkmvAKjyYvATmNRBJJITKTS3m QC0okWcbOaRm0iGmzf3Y7H1l1rOdo7YKbCRcqU9Nn1tm9nwPUvNjxUvzlsxOHqQIUBt 6EighHoi5kG5lTHrWWq9TKf1RfKakEKozrz4ap9Y= Date: Fri, 29 Sep 2023 09:39:54 +0000 Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable In-Reply-To: References: X-Mailer: Amazon WorkMail Thread-Index: AQHZ8rjeLcEuk4eZQkmvQkUg1RLw8AAAAhKM Thread-Topic: [PATCH v2 2/3] gnu: openfoam-org: Update to 11. X-Wm-Sent-Timestamp: 1695980394 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018ae04f1969-8ad09224-8477-4bfa-9a64-bc6caec1edef-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.09.29-54.240.50.247 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 From: reza via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.19 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: CC3444204F X-Spam-Score: -3.19 X-TUID: a9hCXOgb0t+R * gnu/packages/simulation.scm (openfoam-org): Update to 11. Use=0D=0Aopen= foam-package factory function to create package.=0D=0A---=0D=0A gnu/packa= ges/simulation.scm | 382 +++++-------------------------------=0D=0A 1 fil= e changed, 54 insertions(+), 328 deletions(-)=0D=0A=0D=0Adiff --git a/gnu= /packages/simulation.scm b/gnu/packages/simulation.scm=0D=0Aindex ab4f7c1= 24f..4dc8c9e30e 100644=0D=0A--- a/gnu/packages/simulation.scm=0D=0A+++ b/= gnu/packages/simulation.scm=0D=0A@@ -88,334 +88,6 @@ (define-module (gnu = packages simulation)=0D=0A #:use-module (ice-9 regex)=0D=0A #:use-mod= ule (srfi srfi-1))=0D=0A=20=0D=0A-(define-public openfoam-org=0D=0A- (pa= ckage=0D=0A- (name "openfoam-org")=0D=0A- (version "10.20230119")=0D= =0A- (source (origin=0D=0A- (method git-fetch)=0D=0A- = (uri (git-reference=0D=0A- (url (string-appe= nd "https://github.com/OpenFOAM/OpenFOAM-"=0D=0A- = (version-major version)))=0D=0A- (comm= it (second (string-split version #\.)))))=0D=0A- (sha256=0D=0A= - (base32=0D=0A- "0icvwg7s6vnkgmdiczivia9pbr= gx8nanw9a4j080fzfvdv9vxhzp"))=0D=0A- (file-name (git-file-na= me name version))=0D=0A- (modules '((guix build utils)))=0D=0A= - (snippet `(begin=0D=0A- ;; patch = shell paths=0D=0A- (substitute* (list "wmake/src= /Makefile"=0D=0A- "wmake/make= files/general")=0D=0A- (("/bin/sh")=0D=0A- = "sh"))=0D=0A- (substitu= te* "etc/bashrc"=0D=0A- ;; only go back one fo= lder level=0D=0A- (("\\$\\(dirname \\$\\{BASH_= SOURCE:-\\$0\\}\\)/../..")=0D=0A- "$(dirname = ${BASH_SOURCE:-$0})/..")=0D=0A- ;; do not use = openfoam folder convention=0D=0A- (("^export W= M_PROJECT_DIR=3D.*$")=0D=0A- (string-append=0D= =0A- "export WM_PROJECT_DIR=3D$WM_PROJECT_IN= ST_DIR\n"))=0D=0A- ;; do not source bash_compl= etion (gives error)=0D=0A- (("^.*bash_completi= on.*$" all)=0D=0A- (string-append "#" all))=0D= =0A- ;; set same version as guix package=0D=0A= - (("^export WM_PROJECT_VERSION=3D.*$")=0D=0A-= (string-append "export WM_PROJECT_VERSION=3D= "=0D=0A- ,version "\n")))=0D=0A= - ;; add expand flag to RunFunctions=0D=0A- = (substitute* "bin/tools/RunFunctions"=0D=0A- = (("foamDictionary (.*)" all args)=0D=0A- = (string-append "foamDictionary -expand " args)))=0D=0A- = ;; disable failing test=0D=0A- = (substitute* "test/postProcessing/channel/Allrun"=0D=0A- = (("^.*getApplication.*$" all)=0D=0A- = (string-append "#" all "\n")))))))=0D=0A- (build-system gnu-= build-system)=0D=0A- (inputs (list boost=0D=0A- cgal=0D= =0A- git=0D=0A- gmp=0D=0A- = libxt=0D=0A- metis=0D=0A- mpfr=0D=0A= - ncurses=0D=0A- openmpi=0D=0A- = openssh=0D=0A- paraview=0D=0A- = pt-scotch32=0D=0A- readline=0D=0A- zl= ib))=0D=0A- (native-inputs (list bison=0D=0A- = flex=0D=0A- ;; paraview plugin dependencies=0D=0A= - cli11=0D=0A- cmake-mini= mal=0D=0A- cgns=0D=0A- cu= rl=0D=0A- double-conversion=0D=0A- = eigen=0D=0A- expat=0D=0A- = ffmpeg=0D=0A- fmt=0D=0A- = freetype=0D=0A- gdal=0D=0A- = gl2ps=0D=0A- glew=0D=0A- = gmsh=0D=0A- hdf5=0D=0A- = jsoncpp=0D=0A- libjpeg-turbo=0D=0A- = libogg=0D=0A- libpng=0D=0A= - libharu=0D=0A- libtheor= a=0D=0A- libtiff=0D=0A- l= ibx11=0D=0A- libxml2=0D=0A- = lz4=0D=0A- netcdf=0D=0A- = nlohmann-json=0D=0A- proj=0D=0A- = protobuf=0D=0A- pugixml=0D=0A- = python=0D=0A- python-mpi4py=0D=0A= - qtbase-5=0D=0A- qtsvg-5= =0D=0A- qttools-5=0D=0A- = qtwebengine-5=0D=0A- qtxmlpatterns=0D=0A- = utfcpp=0D=0A- vtk=0D=0A- = xz))=0D=0A- (propagated-inputs (list gnuplot))=0D=0A-= (outputs '("debug" ;~60MB=0D=0A- "out"))=0D=0A- (arg= uments=0D=0A- (list=0D=0A- ;; Executable files and shared librar= ies are located in the 'platforms'=0D=0A- ;; subdirectory.=0D=0A- = #:strip-directories=0D=0A- #~(list "share/OpenFOAM/platforms/linu= x64GccDPInt32Opt/bin"=0D=0A- "share/OpenFOAM/platforms/linux= 64GccDPInt32Opt/lib")=0D=0A-=0D=0A- #:modules=0D=0A- '((ice-9 f= tw)=0D=0A- (ice-9 regex)=0D=0A- (ice-9 string-fun)=0D=0A- = (srfi srfi-1)=0D=0A- (guix build gnu-build-system)=0D=0A- = (guix build utils))=0D=0A-=0D=0A- #:phases=0D=0A- #~(modif= y-phases %standard-phases=0D=0A- (add-before 'build 'patch-HOME-= path=0D=0A- (lambda _=0D=0A- (setenv "HOME" "/tmp= ")))=0D=0A- (add-before 'build 'rename-self=0D=0A- (l= ambda _=0D=0A- ;; The script 'bin/foamEtcFile' derives the v= ersion name based=0D=0A- ;; on the current directory name (!= ), so make sure to follow the=0D=0A- ;; expected naming conv= ention.=0D=0A- (let ((here (canonicalize-path "."))=0D=0A- = (target #$(string-append=0D=0A- = "OpenFOAM-"=0D=0A- (string-map (matc= h-lambda=0D=0A- (#\. #\-)=0D=0A= - (chr chr))=0D=0A- = (package-version this-package)))))=0D=0A= - (chdir "..")=0D=0A- (format #t "renaming = '~a' to '~a'~%"=0D=0A- here target)=0D=0A- = (rename-file here target)=0D=0A- (chdir target))))= =0D=0A- (add-before 'build 'patch-scotch=0D=0A- (lamb= da _=0D=0A- (substitute* "etc/config.sh/scotch"=0D=0A- = (("^export SCOTCH_VERSION=3Dscotch_.*$")=0D=0A- = (string-append "export SCOTCH_VERSION=3Dscotch_"=0D=0A- = #$(package-version pt-scotch32) "\n"))=0D=0A- = (("^export SCOTCH_ARCH_PATH=3D.*$")=0D=0A- (string-app= end "export SCOTCH_ARCH_PATH=3D"=0D=0A- (a= ssoc-ref %build-inputs "pt-scotch32")=0D=0A- = "\n"))) #t))=0D=0A- (add-before 'build 'patch-mpi=0D=0A- = (lambda _=0D=0A- (let* ((mpi-path (assoc-ref %build-i= nputs "openmpi"))=0D=0A- (mpi-version #$(package-vers= ion openmpi)))=0D=0A- ;; specify openmpi type=0D=0A- = (substitute* "etc/bashrc"=0D=0A- (("WM_MPLIB=3D= SYSTEMOPENMPI")=0D=0A- "WM_MPLIB=3DOPENMPI"))=0D=0A- = (substitute* "etc/config.sh/mpi"=0D=0A- (("= export FOAM_MPI=3Dopenmpi-.*$")=0D=0A- (string-append "= export FOAM_MPI=3Dopenmpi-"=0D=0A- mpi-v= ersion "\n"))=0D=0A- (("export MPI_ARCH_PATH=3D.*\\$FOAM= _MPI.*$")=0D=0A- (string-append "export MPI_ARCH_PATH=3D= " mpi-path=0D=0A- "\n")))) #t))=0D=0A- = (add-before 'build 'patch-paraview=0D=0A- (lambda _=0D= =0A- (substitute* "etc/config.sh/paraview"=0D=0A- = (("^export ParaView_VERSION=3D.*$")=0D=0A- (string-a= ppend "export ParaView_VERSION=3D"=0D=0A- = #$(package-version paraview) "\n"))=0D=0A- (("^export Para= View_DIR=3D.*$")=0D=0A- (string-append "export ParaView_D= IR=3D"=0D=0A- (assoc-ref %build-inputs "pa= raview")=0D=0A- "\n"))) #t))=0D=0A- = (add-before 'build 'add-rpaths=0D=0A- (lambda _=0D=0A- = (letrec* ((libraries '("boost" "cgal"=0D=0A- = "gmp"=0D=0A- "metis"= =0D=0A- "mpfr"=0D=0A- = "pt-scotch32"=0D=0A- = "openmpi"=0D=0A- "zlib"=0D=0A- = "paraview"))=0D=0A- = (rpaths=0D=0A- (fold-right (lambda (library = rpaths)=0D=0A- (string-append rpath= s=0D=0A- "-rpath=3D"= =0D=0A- (assoc-ref=0D= =0A- %build-inputs = library)=0D=0A- "/li= b,")) "" libraries))=0D=0A- (openfoam-lib=0D=0A- = (string-append #$output=0D=0A- = "/share/OpenFOAM/platforms/linux64GccDPInt32Opt/lib")= )=0D=0A- (ldflags=0D=0A- (= string-append "-Wl,"=0D=0A- rpaths= =0D=0A- "-rpath=3D"=0D=0A- = openfoam-lib=0D=0A- = ","=0D=0A- "-rpa= th=3D"=0D=0A- openfoam-lib=0D=0A- = "/dummy,"=0D=0A- = "-rpath=3D"=0D=0A- = openfoam-lib=0D=0A- "/parav= iew-"=0D=0A- #$(version-major+mino= r (package-version=0D=0A- = paraview)))))=0D=0A- (substitute* "wmake/r= ules/linux64Gcc/c++"=0D=0A- (("\\$\\(LIB_HEADER_DIRS\\) = -fPIC" all)=0D=0A- (string-append all " " ldflags)))) #= t))=0D=0A- (add-before 'build 'add-vtk-include-path=0D=0A- = (lambda _=0D=0A- (let* ((vtk-version #$(version-major+= minor=0D=0A- (package-version vtk)))=0D= =0A- (vtk-root (assoc-ref %build-inputs "vtk"))=0D=0A= - (vtk-inc (string-append vtk-root "/include/vtk-" vt= k-version))=0D=0A- (vtk-inc-flag (string-append "-I" = vtk-inc)))=0D=0A- (substitute* "wmake/rules/linux64Gcc/c++= "=0D=0A- (("\\$\\(LIB_HEADER_DIRS\\)" all)=0D=0A- = (string-append all " " vtk-inc-flag " "))))=0D=0A- = #t))=0D=0A- (delete 'configure) ;no configure phase=0D=0A- = (replace 'build=0D=0A- (lambda _=0D=0A- ;;= compile OpenFOAM libraries and applications=0D=0A- (invoke = "bash" "-c"=0D=0A- (format #f=0D=0A- = "source ./etc/bashrc && ./Allwmake -j~a"=0D=0A- = (parallel-job-count)))))=0D=0A- (add-after 'bu= ild 'cleanup=0D=0A- ;; Avoid unnecessary, voluminous object an= d dep files.=0D=0A- (lambda _=0D=0A- (when (file-= exists=3F "platforms/linux64GccDPInt32Opt/src")=0D=0A- (de= lete-file-recursively=0D=0A- "platforms/linux64GccDPInt32= Opt/src"))=0D=0A- (when (file-exists=3F=0D=0A- = "platforms/linux64GccDPInt32OptOPENMPI")=0D=0A- (de= lete-file-recursively=0D=0A- "platforms/linux64GccDPInt32= OptOPENMPI"))=0D=0A- (for-each delete-file=0D=0A- = (find-files "." "\\.o$")) #t))=0D=0A- (replace 'che= ck=0D=0A- (lambda* (#:key tests=3F #:allow-other-keys)=0D=0A- = (when tests=3F=0D=0A- (when (file-exists=3F "= test")=0D=0A- (with-directory-excursion "test"=0D=0A- = (invoke "bash" "-c"=0D=0A- (f= ormat #f=0D=0A- "source ../etc/bashrc = && ./Allrun -j~a"=0D=0A- (parallel-job= -count)))))=0D=0A- ;; too many tutorials are failing=0D=0A= - ;; (with-directory-excursion "tutorials"=0D=0A- = ;; (invoke "bash" "-c" "source ../etc/bashrc && ./Alltest"))=0D=0A= - ) #t))=0D=0A- (replace 'install=0D=0A- = (lambda _=0D=0A- (let ((install-dir (string-append #$outp= ut=0D=0A- "/share/OpenFOAM= ")))=0D=0A- (mkdir-p install-dir) ;create install director= y=0D=0A- ;; move contents of build directory to install di= rectory=0D=0A- (copy-recursively "." install-dir))))=0D=0A= - (add-after 'install 'add-symbolic-link=0D=0A- (lamb= da _=0D=0A- (let* ((bin (string-append #$output "/bin"))=0D=0A= - (lib (string-append #$output "/lib"))=0D=0A- = (openfoam (string-append #$output=0D=0A- = "/share/OpenFOAM"))=0D=0A- = (build-bin (string-append openfoam=0D=0A- = "/platforms/linux64GccDPInt32Opt/bin"))=0D=0A- = (build-lib (string-append openfoam=0D=0A- = "/platforms/linux64GccDPInt32Opt/lib"))=0D=0A- = (foam-bin (string-append openfoam "/bin")))=0D=0A- = ;; add symbolic links in standard 'bin' directory=0D=0A- = (mkdir-p bin)=0D=0A- (for-each (lambda (file)=0D= =0A- (unless (member file=0D=0A- = '("." ".."))=0D=0A- = (symlink (string-append build-bin "/"=0D=0A- = file)=0D=0A- = (string-append bin "/" file))))=0D=0A- = (scandir build-bin))=0D=0A- (for-each (lambda (file)=0D=0A= - (unless (member file=0D=0A- = '("." ".."))=0D=0A- = (symlink (string-append foam-bin "/"=0D=0A- = file)=0D=0A- = (string-append bin "/" file))))=0D=0A- (sca= ndir foam-bin))=0D=0A- ;; add symbolic link for standard '= lib' directory=0D=0A- (symlink build-lib lib)) #t)))))=0D=0A= - (native-search-paths=0D=0A- (list (search-path-specification=0D=0A= - (variable "WM_PROJECT_DIR")=0D=0A- (separator #f)= =0D=0A- (files '("share/OpenFOAM")))))=0D=0A- ;; Note:=0D=0A= - ;; Tutorial files are installed read-only in /gnu/store.=0D=0A- ;= ; To allow write permissions on files copied from the store a=0D=0A- ;= ; 'chmod' step is needed before running the applications. For=0D=0A- = ;; example, from a user's login:=0D=0A- ;; $ source $(dirname $(which = blockMesh))/../../../etc/bashrc=0D=0A- ;; $ mkdir -p $FOAM_RUN=0D=0A- = ;; $ cd $FOAM_RUN=0D=0A- ;; $ cp -r $FOAM_TUTORIALS/incompressible/= simpleFoam/pitzDaily .=0D=0A- ;; $ cd pitzDaily=0D=0A- ;; $ chmod -= R u+w .=0D=0A- ;; $ blockMesh=0D=0A- (synopsis "Framework for numer= ical simulation of fluid flow")=0D=0A- (description=0D=0A- "OpenFO= AM provides a set of solvers and methods for tackling=0D=0A-problems in t= he field of Computational Fluid Dynamics (CFD). It is written in=0D=0A-C= ++. Governing equations such as the Navier-Stokes equations can be solve= d in=0D=0A-integral form. Physical processes such as phase change, dropl= et transport and=0D=0A-chemical reaction can be modelled. Numerical meth= ods are included to deal with=0D=0A-sharp gradients, such as those encoun= tered in flows with shock waves and flows=0D=0A-with gas/liquid interface= s. Large problems may be split into smaller, connected=0D=0A-problems fo= r efficient solution on parallel systems.")=0D=0A- (license license:gp= l3+)=0D=0A- (home-page "https://openfoam.org")))=0D=0A-=0D=0A-(define-= public openfoam=0D=0A- (deprecated-package "openfoam" openfoam-org))=0D=0A= -=0D=0A (define-public openfoam-com=0D=0A ;; This is a fork of 'openfoa= m-org', maintained separately.=0D=0A (package=0D=0A@@ -745,6 +417,60 @@= (define* (openfoam-package source version name home-page synopsis)=0D=0A= (license license:gpl3+)=0D=0A (home-page home-page))))=0D=0A= =20=0D=0A+(define-public openfoam-org=0D=0A+ (let* ((version "11")=0D=0A= + (name "openfoam-org")=0D=0A+ (source (origin=0D=0A+ = (method url-fetch)=0D=0A+ (uri (string-a= ppend "https://github.com/OpenFOAM/OpenFOAM-"=0D=0A+ = (version-major version)=0D=0A+ = "/archive/"=0D=0A+ "v= ersion-"=0D=0A+ (version-major vers= ion)=0D=0A+ ".tar.gz"))=0D=0A+ = (sha256 (base32=0D=0A+ "1h70a5ni= 2psx7bcx2xg6aqraj2kkbfn8mflh2akbp6k9mmpgih7b"))=0D=0A+ = (modules '((guix build utils)))=0D=0A+ (snippet `(begin= =0D=0A+ ;; patch shell paths=0D=0A+ = (substitute* (list "wmake/src/Makefile"=0D=0A+ = "wmake/makefiles/general")=0D= =0A+ (("/bin/sh")=0D=0A+ = "sh"))=0D=0A+ (substitute*= "etc/bashrc"=0D=0A+ ;; only go back one = folder level=0D=0A+ (("\\$\\(dirname \\$\= \{BASH_SOURCE:-\\$0\\}\\)/../..")=0D=0A+ = "$(dirname ${BASH_SOURCE:-$0})/..")=0D=0A+ = ;; do not use openfoam folder convention=0D=0A+ = (("^export WM_PROJECT_DIR=3D.*$")=0D=0A+ = (string-append=0D=0A+ "expor= t WM_PROJECT_DIR=3D$WM_PROJECT_INST_DIR=0D=0A+"))=0D=0A+ = ;; do not source bash_completion (gives error)=0D=0A+ = (("^.*bash_completion.*$" all)=0D=0A+ = (string-append "#" all))=0D=0A+ = ;; set same version as guix package=0D=0A+ = (("^export WM_PROJECT_VERSION=3D.*$")=0D=0A+ = (string-append "export WM_PROJECT_VERSION=3D"=0D= =0A+ ,version "\n")))=0D=0A= + ;; add expand flag to RunFunctions=0D=0A+= (substitute* "bin/tools/RunFunctions"=0D=0A= + (("foamDictionary (.*)" all args)=0D=0A= + (string-append "foamDictionary -expand= "=0D=0A+ args)))=0D=0A+ = ;; disable failing test=0D=0A+ = (substitute* "test/postProcessing/channel/Allrun"=0D=0A= + (("^.*getApplication.*$" all)=0D=0A+ = (string-append "#" all "\n")))))))=0D=0A+ = (home-page "https://openfoam.org")=0D=0A+ (synopsis "Fram= ework for numerical simulation of fluid flow")=0D=0A+ (template (= openfoam-package source version name home-page synopsis)))=0D=0A+ (pac= kage=0D=0A+ (inherit template))))=0D=0A+=0D=0A+(define-public openfo= am=0D=0A+ (deprecated-package "openfoam" openfoam-org))=0D=0A+=0D=0A (de= fine-public open-simulation-interface=0D=0A (package=0D=0A (name "o= pen-simulation-interface")=0D=0A--=20=0D=0A2.41.0=0D=0A=0D=0A