diff --git a/templates/openfoam/1906/IListStream.H.patch b/templates/openfoam/1906/IListStream.H.patch new file mode 100644 index 0000000000000000000000000000000000000000..f8c0f37251cf7c352ccd3d82cb0849b6a995afa3 --- /dev/null +++ b/templates/openfoam/1906/IListStream.H.patch @@ -0,0 +1,38 @@ +--- OpenFOAM-v1906.bak/src/OpenFOAM/db/IOstreams/memory/IListStream.H 2019-11-08 01:12:53.000000000 +0800 ++++ OpenFOAM-v1906/src/OpenFOAM/db/IOstreams/memory/IListStream.H 2024-01-16 14:31:40.575241000 +0800 +@@ -115,7 +115,7 @@ + reset_gbuffer(); + } + +- //- Transfer contents to other list ++ //- Transfer contents to other List + inline void swap(List& list) + { + List::swap(list); +@@ -128,7 +128,7 @@ + + /*---------------------------------------------------------------------------*\ + Class IListStream Declaration +-\*----------------------------------------------d-----------------------------*/ ++\*---------------------------------------------------------------------------*/ + + //- An ISstream with internal List storage + class IListStream +@@ -158,7 +158,7 @@ + //- Move construct from List + IListStream + ( +- List&& buffer, ++ ::Foam::List&& buffer, // Fully qualify (issue #1521) + streamFormat format=ASCII, + versionNumber version=currentVersion, + const Foam::string& name="input" +@@ -184,7 +184,7 @@ + {} + + +- // Member functions ++ // Member Functions + + //- The current get position in the buffer + using allocator_type::size; diff --git a/templates/openfoam/1906/List.H.patch b/templates/openfoam/1906/List.H.patch new file mode 100644 index 0000000000000000000000000000000000000000..942887669e3ffbff18fa18dae7e6e5c2ba58a864 --- /dev/null +++ b/templates/openfoam/1906/List.H.patch @@ -0,0 +1,40 @@ +--- OpenFOAM-v1906.bak/src/OpenFOAM/containers/Lists/List/List.H 2019-11-08 01:12:53.000000000 +0800 ++++ OpenFOAM-v1906/src/OpenFOAM/containers/Lists/List/List.H 2024-01-16 14:34:55.953900000 +0800 +@@ -58,8 +58,7 @@ + + // Forward declarations + +-class Istream; +-class Ostream; ++ + + template class List; + template class FixedList; +@@ -113,6 +112,12 @@ + + + public: ++ //Related types ++ ++ //-Declare type of subList ++ ++ typedef SubList subList; ++ + + // Static Member Functions + +@@ -199,14 +204,6 @@ + + //- Destructor + ~List(); +- +- +- // Related types +- +- //- Declare type of subList +- typedef SubList subList; +- +- + // Member Functions + + // Edit diff --git a/templates/openfoam/1906/data.openfoam.new.920B.cpu.config b/templates/openfoam/1906/data.openfoam.new.920B.cpu.config new file mode 100644 index 0000000000000000000000000000000000000000..c278d7ae0af6af1cd743f661149551a6abaa615f --- /dev/null +++ b/templates/openfoam/1906/data.openfoam.new.920B.cpu.config @@ -0,0 +1,65 @@ +[SERVER] +11.11.11.11 + +[DOWNLOAD] +openfoam/v1906 https://sourceforge.net/projects/openfoam/files/v1906/OpenFOAM-v1906.tgz +ThirdParty/v1906 https://sourceforge.net/projects/openfoam/files/v1906/ThirdParty-v1906.tgz + +[DEPENDENCY] +set -x +set -e +module purge +module use ./software/modulefiles +./jarvis -install bisheng/3.2.0-mini com +module load bisheng/3.2.0-mini +export CC=clang CXX=clang++ FC=flang +./jarvis -install hmpi/2.3.0 clang +module load hmpi/2.3.0 +#release zip files +tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz +tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz + + +[ENV] +# add kgcc/mpi +module purge +module use ./software/modulefiles +module load bisheng/3.2.0-mini +module use ./software/moduledeps +module load bisheng3.2.0/hmpi/2.3.0 +export JARVIS_ROOT=/hpcrunner +export PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/bin:$PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/dummy:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/openmpi-system:$LD_LIBRARY_PATH + + +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/fftw-3.3.7/lib64:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/boost_1_64_0/lib64:$LD_LIBRARY_PATH + +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib:$LD_LIBRARY_PATH + +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib/openmpi-system:$LD_LIBRARY_PATH + +[APP] +app_name = OpenFOAM +build_dir = OpenFOAM-v1906/ +binary_dir = +case_dir = OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/ + +[BUILD] +sed -i "s|export WM_COMPILER=Gcc|export WM_COMPILER=Clang|g" ./etc/bashrc +sed -i '2c cOPT = -O3 -lm -mllvm -unroll-indirect-loads-threshold=2 -mllvm -unroll-indirect-loads-default-runtime-unroll-count=8 -mcpu=linxicore9100 -mllvm -force-customized-pipeline=true -fno-range-check -fveclib=MATHLIB -lmathlib -finline-functions -ftree-vectorize -falign-functions -march=armv8-a -mllvm -min-prefetch-stride=2' ./wmake/rules/linuxARM64Clang/cOpt +sed -i '2c c++OPT = -O3 -lm -mllvm -unroll-indirect-loads-threshold=2 -mllvm -unroll-indirect-loads-default-runtime-unroll-count=8 -mcpu=linxicore9100 -mllvm -force-customized-pipeline=true -fno-range-check -fveclib=MATHLIB -lmathlib -finline-functions -ftree-vectorize -falign-functions -march=armv8-a -mllvm -min-prefetch-stride=2' ./wmake/rules/linuxARM64Clang/c++Opt +patch -p1 < ../List.H.patch +patch -p1 < ../IListStream.H.patch +source ./etc/bashrc +./Allwmake -j -k + +[CLEAN] +rm -rf build + +[RUN] +run = +binary = +nodes = 1 diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config new file mode 100644 index 0000000000000000000000000000000000000000..13958f6cae94495d22a289e220814b038f8b77fd --- /dev/null +++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config @@ -0,0 +1,67 @@ +[SERVER] +11.11.11.11 + +[DOWNLOAD] +openfoam/v1906 https://sourceforge.net/projects/openfoam/files/v1906/OpenFOAM-v1906.tgz +ThirdParty/v1906 https://sourceforge.net/projects/openfoam/files/v1906/ThirdParty-v1906.tgz + +[DEPENDENCY] +set -x +set -e +module purge +module use ./software/modulefiles +./jarvis -install bisheng/3.2.0-mini com +module load bisheng/3.2.0-mini +export CC=clang CXX=clang++ FC=flang +./jarvis -install hmpi/2.3.0 clang +module load hmpi/2.3.0 +#release zip files +tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz +tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz + + +[ENV] +# add kgcc/mpi +module purge +module use ./software/modulefiles +module load bisheng/3.2.0-mini +module use ./software/moduledeps +module load bisheng3.2.0/hmpi/2.3.0 +#source /hpcrunner/OpenFOAM-v1906/etc/bashrc +export JARVIS_ROOT=/hpcrunner +export PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/bin:$PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/dummy:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/openmpi-system:$LD_LIBRARY_PATH + + +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/fftw-3.3.7/lib64:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/boost_1_64_0/lib64:$LD_LIBRARY_PATH + +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib:$LD_LIBRARY_PATH + +export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib/openmpi-system:$LD_LIBRARY_PATH + + +[APP] +app_name = OpenFOAM +build_dir = OpenFOAM-v1906/ +binary_dir = +case_dir = OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/ + +[BUILD] +sed -i "s|export WM_COMPILER=Gcc|export WM_COMPILER=Clang|g" ./etc/bashrc +sed -i '2c cOPT = -O3 -lm -mllvm -unroll-indirect-loads-threshold=2 -mllvm -unroll-indirect-loads-default-runtime-unroll-count=8 -mcpu=tsv110 -fno-range-check -fveclib=MATHLIB -lmathlib -finline-functions -ftree-vectorize -falign-functions -march=armv8-a -mllvm -min-prefetch-stride=2' ./wmake/rules/linuxARM64Clang/cOpt +sed -i '2c c++OPT = -O3 -lm -mllvm -unroll-indirect-loads-threshold=2 -mllvm -unroll-indirect-loads-default-runtime-unroll-count=8 -mcpu=tsv110 -fno-range-check -fveclib=MATHLIB -lmathlib -finline-functions -ftree-vectorize -falign-functions -march=armv8-a -mllvm -min-prefetch-stride=2' ./wmake/rules/linuxARM64Clang/c++Opt +patch -p1 < ../List.H.patch +patch -p1 < ../IListStream.H.patch +source ./etc/bashrc +./Allwmake -j -k + +[CLEAN] +rm -rf build + +[RUN] +run = +binary = +nodes = 1