search

mrklein / openfoam-os-x

Patches for OpenFOAM(R) to build it on OS X
93 stars 33 forks source link

Patch for "commit" for 2.4.x #57

Closed aorourke123 closed 3 years ago

aorourke123 commented 3 years ago

Hello.

What is the proper patch "commit" number for 2.4.x?

Thank you, Aubrie

aorourke123 commented 3 years ago

Overall, I am having a hard time adding OpenFoam 2.3.x or 2.4.x to MacOS catalina. Any hints?

aorourke123 commented 3 years ago

I could only find the 2.3.x patch because I could not make the 2.4.x work, please see outcome when I applied the OpenFOAM-2.3.x-Mac.patch to

OpenFOAM-2.4.x: git apply OpenFOAM-2.3.x-Mac.patch

OpenFOAM-2.3.x-Mac.patch:753: trailing whitespace. handle = OpenFOAM-2.3.x-Mac.patch:1311: trailing whitespace.

OpenFOAM-2.3.x-Mac.patch:1340: trailing whitespace.

OpenFOAM-2.3.x-Mac.patch:1579: trailing whitespace. c++DBUG = OpenFOAM-2.3.x-Mac.patch:1605: trailing whitespace. cDBUG = error: patch failed: applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options:6 error: applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options: patch does not apply error: patch failed: applications/solvers/multiphase/multiphaseEulerFoam/Make/options:17 error: applications/solvers/multiphase/multiphaseEulerFoam/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options:5 error: applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/wall/wallShearStress/Make/options:7 error: applications/utilities/postProcessing/wall/wallShearStress/Make/options: patch does not apply error: patch failed: etc/config/scotch.sh:36 error: etc/config/scotch.sh: patch does not apply error: patch failed: etc/config/settings.sh:391 error: etc/config/settings.sh: patch does not apply error: patch failed: src/OSspecific/POSIX/printStack.C:53 error: src/OSspecific/POSIX/printStack.C: patch does not apply error: patch failed: src/parallel/decompose/ptscotchDecomp/Make/options:8 error: src/parallel/decompose/ptscotchDecomp/Make/options: patch does not apply

and then to OpenFoam-2.3.X: bash-3.2$ git apply OpenFOAM-2.3.x-Mac.patch OpenFOAM-2.3.x-Mac.patch:753: trailing whitespace. handle = OpenFOAM-2.3.x-Mac.patch:1311: trailing whitespace.

OpenFOAM-2.3.x-Mac.patch:1340: trailing whitespace.

OpenFOAM-2.3.x-Mac.patch:1579: trailing whitespace. c++DBUG = OpenFOAM-2.3.x-Mac.patch:1605: trailing whitespace. cDBUG = error: patch failed: applications/solvers/combustion/fireFoam/Make/options:36 error: applications/solvers/combustion/fireFoam/Make/options: patch does not apply error: patch failed: applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options:13 error: applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options: patch does not apply error: patch failed: applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options:21 error: applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options: patch does not apply error: patch failed: applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options:6 error: applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options: patch does not apply error: patch failed: applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options:11 error: applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options: patch does not apply error: patch failed: applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options:21 error: applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options: patch does not apply error: patch failed: applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options:27 error: applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options: patch does not apply error: patch failed: applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options:30 error: applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options: patch does not apply error: patch failed: applications/solvers/multiphase/multiphaseEulerFoam/Make/options:17 error: applications/solvers/multiphase/multiphaseEulerFoam/Make/options: patch does not apply error: patch failed: applications/utilities/mesh/generation/blockMesh/Make/options:6 error: applications/utilities/mesh/generation/blockMesh/Make/options: patch does not apply error: patch failed: applications/utilities/mesh/generation/foamyQuadMesh/Make/options:27 error: applications/utilities/mesh/generation/foamyQuadMesh/Make/options: patch does not apply error: patch failed: applications/utilities/mesh/generation/snappyHexMesh/Make/options:1 error: applications/utilities/mesh/generation/snappyHexMesh/Make/options: patch does not apply error: patch failed: applications/utilities/mesh/manipulation/renumberMesh/Make/options:1 error: applications/utilities/mesh/manipulation/renumberMesh/Make/options: patch does not apply error: patch failed: applications/utilities/miscellaneous/expandDictionary/Make/options:1 error: applications/utilities/miscellaneous/expandDictionary/Make/options: patch does not apply error: patch failed: applications/utilities/miscellaneous/foamDebugSwitches/Make/options:42 error: applications/utilities/miscellaneous/foamDebugSwitches/Make/options: patch does not apply error: patch failed: applications/utilities/parallelProcessing/reconstructParMesh/Make/options:4 error: applications/utilities/parallelProcessing/reconstructParMesh/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options:1 error: applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options:12 error: applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/turbulence/R/Make/options:8 error: applications/utilities/postProcessing/turbulence/R/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options:5 error: applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/velocityField/Pe/Make/options:12 error: applications/utilities/postProcessing/velocityField/Pe/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/wall/wallShearStress/Make/options:7 error: applications/utilities/postProcessing/wall/wallShearStress/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/wall/yPlusLES/Make/options:8 error: applications/utilities/postProcessing/wall/yPlusLES/Make/options: patch does not apply error: patch failed: applications/utilities/postProcessing/wall/yPlusRAS/Make/options:10 error: applications/utilities/postProcessing/wall/yPlusRAS/Make/options: patch does not apply error: patch failed: applications/utilities/preProcessing/applyBoundaryLayer/Make/options:8 error: applications/utilities/preProcessing/applyBoundaryLayer/Make/options: patch does not apply error: bin/addr2line4Mac.py: already exists in working directory error: patch failed: etc/bashrc:199 error: etc/bashrc: patch does not apply error: patch failed: etc/config/CGAL.sh:35 error: etc/config/CGAL.sh: patch does not apply error: patch failed: etc/config/metis.sh:36 error: etc/config/metis.sh: patch does not apply error: patch failed: etc/config/paraview.sh:144 error: etc/config/paraview.sh: patch does not apply error: patch failed: etc/config/scotch.sh:36 error: etc/config/scotch.sh: patch does not apply error: patch failed: etc/config/settings.sh:46 error: etc/config/settings.sh: patch does not apply error: patch failed: etc/controlDict:18 error: etc/controlDict: patch does not apply error: patch failed: src/OSspecific/POSIX/POSIX.C:53 error: src/OSspecific/POSIX/POSIX.C: patch does not apply error: patch failed: src/OSspecific/POSIX/clockTime/clockTime.H:37 error: src/OSspecific/POSIX/clockTime/clockTime.H: patch does not apply error: patch failed: src/OSspecific/POSIX/fileStat.C:29 error: src/OSspecific/POSIX/fileStat.C: patch does not apply error: patch failed: src/OSspecific/POSIX/printStack.C:33 error: src/OSspecific/POSIX/printStack.C: patch does not apply error: patch failed: src/OSspecific/POSIX/signals/sigFpe.C:42 error: src/OSspecific/POSIX/signals/sigFpe.C: patch does not apply error: patch failed: src/OSspecific/POSIX/signals/sigFpe.H:55 error: src/OSspecific/POSIX/signals/sigFpe.H: patch does not apply error: patch failed: src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C:30 error: src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C: patch does not apply error: patch failed: src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C:228 error: src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C: patch does not apply error: patch failed: src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C:50 error: src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C: patch does not apply error: patch failed: src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H:109 error: src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H: patch does not apply error: patch failed: src/OpenFOAM/primitives/Scalar/doubleFloat.H:31 error: src/OpenFOAM/primitives/Scalar/doubleFloat.H: patch does not apply error: patch failed: src/conversion/ensight/part/ensightPart.C:51 error: src/conversion/ensight/part/ensightPart.C: patch does not apply error: patch failed: src/conversion/ensight/part/ensightPartIO.C:63 error: src/conversion/ensight/part/ensightPartIO.C: patch does not apply error: patch failed: src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C:231 error: src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C: patch does not apply error: patch failed: src/dynamicMesh/meshCut/refineCell/refineCell.H:35 error: src/dynamicMesh/meshCut/refineCell/refineCell.H: patch does not apply error: patch failed: src/fvOptions/Make/options:13 error: src/fvOptions/Make/options: patch does not apply error: patch failed: src/meshTools/meshTools/meshTools.H:35 error: src/meshTools/meshTools/meshTools.H: patch does not apply error: patch failed: src/parallel/decompose/ptscotchDecomp/Make/options:8 error: src/parallel/decompose/ptscotchDecomp/Make/options: patch does not apply error: patch failed: src/parallel/decompose/scotchDecomp/Make/options:12 error: src/parallel/decompose/scotchDecomp/Make/options: patch does not apply error: patch failed: src/renumber/Allwmake:20 error: src/renumber/Allwmake: patch does not apply error: patch failed: src/renumber/SloanRenumber/Make/options:1 error: src/renumber/SloanRenumber/Make/options: patch does not apply error: patch failed: src/sampling/sampledSurface/writers/ensight/ensightPTraits.H:32 error: src/sampling/sampledSurface/writers/ensight/ensightPTraits.H: patch does not apply error: patch failed: wmake/Makefile:91 error: wmake/Makefile: patch does not apply error: wmake/rules/darwinIntel64Clang/c: already exists in working directory error: wmake/rules/darwinIntel64Clang/c++: already exists in working directory error: wmake/rules/darwinIntel64Clang/c++Debug: already exists in working directory error: wmake/rules/darwinIntel64Clang/c++Opt: already exists in working directory error: wmake/rules/darwinIntel64Clang/c++Prof: already exists in working directory error: wmake/rules/darwinIntel64Clang/cDebug: already exists in working directory error: wmake/rules/darwinIntel64Clang/cOpt: already exists in working directory error: wmake/rules/darwinIntel64Clang/cProf: already exists in working directory error: wmake/rules/darwinIntel64Clang/general: already exists in working directory error: wmake/rules/darwinIntel64Clang/mplib: already exists in working directory error: wmake/rules/darwinIntel64Clang/mplibMACPORTMPICH: already exists in working directory error: wmake/rules/darwinIntel64Clang/mplibMACPORTOPENMPI: already exists in working directory error: wmake/rules/darwinIntel64Clang/mplibOPENMPI: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/c: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/c++: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/c++Debug: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/c++Opt: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/c++Prof: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/cDebug: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/cOpt: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/cProf: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/general: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/mplib: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/mplibMACPORTMPICH: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/mplibMACPORTOPENMPI: already exists in working directory error: wmake/rules/darwinIntel64Dragonegg/mplibOPENMPI: already exists in working directory error: wmake/rules/darwinIntel64Gcc/c: already exists in working directory error: wmake/rules/darwinIntel64Gcc/c++: already exists in working directory error: wmake/rules/darwinIntel64Gcc/c++Debug: already exists in working directory error: wmake/rules/darwinIntel64Gcc/c++Opt: already exists in working directory error: wmake/rules/darwinIntel64Gcc/c++Prof: already exists in working directory error: wmake/rules/darwinIntel64Gcc/cDebug: already exists in working directory error: wmake/rules/darwinIntel64Gcc/cOpt: already exists in working directory error: wmake/rules/darwinIntel64Gcc/cProf: already exists in working directory error: wmake/rules/darwinIntel64Gcc/general: already exists in working directory error: wmake/rules/darwinIntel64Gcc/mplib: already exists in working directory error: wmake/rules/darwinIntel64Gcc/mplibMACPORTMPICH: already exists in working directory error: wmake/rules/darwinIntel64Gcc/mplibMACPORTOPENMPI: already exists in working directory error: wmake/rules/darwinIntel64Gcc/mplibOPENMPI: already exists in working directory

mrklein commented 3 years ago

Hi,

Commit SHA is a part of patch name: 2b147f4. Patch applies without any problems.

On Big Sur with clang 12.0.0 it is necessary to add more modifications due to outdated code in OpenFOAM and CGAL version change (library became header-only, so there is no need to link foamyHexMesh). I do not know yet, how to publish these changes: either as a separate patch, or as an update.

Could you describe your difficulties on Catalina?

Concerning your question about version 2.3.0, it seems you are trying to apply the patch twice.

aorourke123 commented 3 years ago

I will try again with the commit you have provided for the openfoam 2.3.X patch above. By Catalina difficulty was with macports and now it is with the git and homebrew version.

I was trying to see if the 2.3.X patch would apply to either openfoam version. That is why is looks like I am applying it twice. I was trying to show that both had failed.

mrklein commented 3 years ago

You CANNOT:

Either you clone 2.4.x repository, checkout specified commit, apply patch (from this repository) and compile OpenFOAM. OR you install Macports, clone 2.3.x repository and proceed with Bernhard Gschaider's patch.

Yet, either way you will need to resolve CGAL and PackedBoolList compilation problems. CGAL is not crucial, as it is used only in foamyHexMesh and can be disabled, but the problem with private inheritance in PackedBoolList halts compilation in the very beginning.

mrklein commented 3 years ago

It seems, bug is not relevant any more.