From d020cee5c57957b3110ab27289b30a9827e4b1af Mon Sep 17 00:00:00 2001
From: Ling <2277486684@qq.com>
Date: Thu, 29 Feb 2024 08:22:09 +0000
Subject: [PATCH 01/15] add
 templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config.

Signed-off-by: Ling <2277486684@qq.com>
---
 .../1906/data.openfoam.new.bisheng.cpu.config | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config

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 00000000..e36d0913
--- /dev/null
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -0,0 +1,45 @@
+[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 load
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
+
+[APP]
+app_name = OpenFOAM
+build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
+binary_dir =
+case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
+
+[BUILD]
+./Allwmake -j 64 -s -k -q
+
+[CLEAN]
+rm -rf build
+
+[RUN]
+run =
+binary =
+nodes = 1
\ No newline at end of file
-- 
Gitee


From 09529f6218578f1c247e77104b71612a0df27552 Mon Sep 17 00:00:00 2001
From: Ling <2277486684@qq.com>
Date: Fri, 1 Mar 2024 03:11:37 +0000
Subject: [PATCH 02/15] =?UTF-8?q?update=20templates/openfoam/1906/data.ope?=
 =?UTF-8?q?nfoam.new.bisheng.cpu.config.=20=E4=BF=AE=E6=94=B9=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BDhmpi=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ling <2277486684@qq.com>
---
 .../openfoam/1906/data.openfoam.new.bisheng.cpu.config      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index e36d0913..cd15cd0a 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -14,7 +14,8 @@ module use ./software/modulefiles
 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
+module use ./software/moduledeps
+module load bisheng3.2.0/hmpi/2.3.0
 #release zip files
 tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
 tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
@@ -24,7 +25,8 @@ tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
 module purge
 module use ./software/modulefiles
 module load bisheng/3.2.0-mini
-module load
+module use ./software/moduledeps
+module load bisheng3.2.0/hmpi/2.3.0
 source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
 
 [APP]
-- 
Gitee


From 917aa5dcb05566743c3744564c8897aa6ff1eb2c Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Thu, 7 Mar 2024 10:17:42 +0800
Subject: [PATCH 03/15] openfoam-patch

---
 IListStream.H.patch                  | 38 +++++++++++++++++++++
 List.H.patch                         | 40 ++++++++++++++++++++++
 data.openfoam.arm.cpu.config         | 43 +++++++++++++++++++++++
 data.openfoam.arm.cpu.opt.config     | 50 +++++++++++++++++++++++++++
 data.openfoam.new.bisheng.cpu.config | 51 ++++++++++++++++++++++++++++
 5 files changed, 222 insertions(+)
 create mode 100644 IListStream.H.patch
 create mode 100644 List.H.patch
 create mode 100644 data.openfoam.arm.cpu.config
 create mode 100644 data.openfoam.arm.cpu.opt.config
 create mode 100644 data.openfoam.new.bisheng.cpu.config

diff --git a/IListStream.H.patch b/IListStream.H.patch
new file mode 100644
index 00000000..f8c0f372
--- /dev/null
+++ b/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<char>& list)
+         {
+             List<char>::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<char>&& buffer,
++	    ::Foam::List<char>&& 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/List.H.patch b/List.H.patch
new file mode 100644
index 00000000..94288766
--- /dev/null
+++ b/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 T> class List;
+ template<class T, unsigned N> class FixedList;
+@@ -113,6 +112,12 @@
+ 
+ 
+ public:
++    //Related types
++
++    //-Declare type of subList
++
++    typedef SubList<T> subList;
++
+ 
+     // Static Member Functions
+ 
+@@ -199,14 +204,6 @@
+ 
+     //- Destructor
+     ~List();
+-
+-
+-    // Related types
+-
+-        //- Declare type of subList
+-        typedef SubList<T> subList;
+-
+-
+     // Member Functions
+ 
+         // Edit
diff --git a/data.openfoam.arm.cpu.config b/data.openfoam.arm.cpu.config
new file mode 100644
index 00000000..eaff4e28
--- /dev/null
+++ b/data.openfoam.arm.cpu.config
@@ -0,0 +1,43 @@
+[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 kgcc/9.3.1 com
+module load kgcc/9.3.1
+./jarvis -install hmpi/1.1.1 gcc
+#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 kgcc/9.3.1
+module load hmpi/1.1.1
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
+
+[APP]
+app_name = OpenFOAM
+build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
+binary_dir = 
+case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
+
+[BUILD]
+./Allwmake -j 64
+
+[CLEAN]
+rm -rf build
+
+[RUN]
+run = 
+binary = ./Allrun
+nodes = 1
\ No newline at end of file
diff --git a/data.openfoam.arm.cpu.opt.config b/data.openfoam.arm.cpu.opt.config
new file mode 100644
index 00000000..92ccb67c
--- /dev/null
+++ b/data.openfoam.arm.cpu.opt.config
@@ -0,0 +1,50 @@
+[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]
+./jarvis -install bisheng/2.5.0 com
+module use ./software/modulefiles
+module load bisheng/2.5.0
+./jarvis -install hmpi/1.2.0 clang
+module load hmpi/1.2.0
+#release zip files
+tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
+tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
+
+[ENV]
+module use ./software/modulefiles
+module load bisheng/2.5.0
+module load hmpi/1.2.0
+export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
+
+[APP]
+app_name = OpenFOAM
+build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
+binary_dir = 
+case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
+#case_dir = $JARVIS_ROOT/workloads/openfoam/audi/
+
+[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
+sed -i "/wmake $targetType/a\export WM_COMPILER_OPTION=Opt" ./src/OSspecific/POSIX/Allwmake
+#openFoam代码写错了，需要修正以适配clang
+sed -i "s| List<char>\&\& buffer,| ::Foam::List<char>\&\& buffer,|g" ./src/OpenFOAM/db/IOstreams/memory/IListStream.H
+source ./etc/bashrc
+./Allwmake -j 16 >&1 |tee -a build.log
+
+[CLEAN]
+source ./etc/bashrc
+./Allwmake clean
+
+[RUN]
+run = source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc && ./Allclean && ./Allrun
+#run = mpirun --allow-run-as-root -x PATH -x LD_LIBRARY_PATH -x WM_PROJECT_DIR -x WM_PROJECT_USER_DIR -np 128
+#binary = pisoFoam –parallel
+binary = 
+nodes = 1
diff --git a/data.openfoam.new.bisheng.cpu.config b/data.openfoam.new.bisheng.cpu.config
new file mode 100644
index 00000000..1330a2de
--- /dev/null
+++ b/data.openfoam.new.bisheng.cpu.config
@@ -0,0 +1,51 @@
+[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 load 
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
+
+[APP]
+app_name = OpenFOAM
+build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
+binary_dir = 
+case_dir = $JARVIS_ROOT/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 64 -s -k -q
+
+[CLEAN]
+rm -rf build
+
+[RUN]
+run = 
+binary = 
+nodes = 1
-- 
Gitee


From 0e6eb130202bb7fe7d07ec891d335e2dae2b92c8 Mon Sep 17 00:00:00 2001
From: Ling <2277486684@qq.com>
Date: Thu, 7 Mar 2024 03:03:52 +0000
Subject: [PATCH 04/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20da?=
 =?UTF-8?q?ta.openfoam.arm.cpu.config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.openfoam.arm.cpu.config | 43 ------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 data.openfoam.arm.cpu.config

diff --git a/data.openfoam.arm.cpu.config b/data.openfoam.arm.cpu.config
deleted file mode 100644
index eaff4e28..00000000
--- a/data.openfoam.arm.cpu.config
+++ /dev/null
@@ -1,43 +0,0 @@
-[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 kgcc/9.3.1 com
-module load kgcc/9.3.1
-./jarvis -install hmpi/1.1.1 gcc
-#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 kgcc/9.3.1
-module load hmpi/1.1.1
-source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
-
-[APP]
-app_name = OpenFOAM
-build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
-binary_dir = 
-case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
-
-[BUILD]
-./Allwmake -j 64
-
-[CLEAN]
-rm -rf build
-
-[RUN]
-run = 
-binary = ./Allrun
-nodes = 1
\ No newline at end of file
-- 
Gitee


From 5a9e682bc9aa61c2dde2de5d1e3df92317600b04 Mon Sep 17 00:00:00 2001
From: Ling <2277486684@qq.com>
Date: Thu, 7 Mar 2024 03:04:02 +0000
Subject: [PATCH 05/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20da?=
 =?UTF-8?q?ta.openfoam.arm.cpu.opt.config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.openfoam.arm.cpu.opt.config | 50 --------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 data.openfoam.arm.cpu.opt.config

diff --git a/data.openfoam.arm.cpu.opt.config b/data.openfoam.arm.cpu.opt.config
deleted file mode 100644
index 92ccb67c..00000000
--- a/data.openfoam.arm.cpu.opt.config
+++ /dev/null
@@ -1,50 +0,0 @@
-[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]
-./jarvis -install bisheng/2.5.0 com
-module use ./software/modulefiles
-module load bisheng/2.5.0
-./jarvis -install hmpi/1.2.0 clang
-module load hmpi/1.2.0
-#release zip files
-tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
-tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
-
-[ENV]
-module use ./software/modulefiles
-module load bisheng/2.5.0
-module load hmpi/1.2.0
-export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
-
-[APP]
-app_name = OpenFOAM
-build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
-binary_dir = 
-case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
-#case_dir = $JARVIS_ROOT/workloads/openfoam/audi/
-
-[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
-sed -i "/wmake $targetType/a\export WM_COMPILER_OPTION=Opt" ./src/OSspecific/POSIX/Allwmake
-#openFoam代码写错了，需要修正以适配clang
-sed -i "s| List<char>\&\& buffer,| ::Foam::List<char>\&\& buffer,|g" ./src/OpenFOAM/db/IOstreams/memory/IListStream.H
-source ./etc/bashrc
-./Allwmake -j 16 >&1 |tee -a build.log
-
-[CLEAN]
-source ./etc/bashrc
-./Allwmake clean
-
-[RUN]
-run = source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc && ./Allclean && ./Allrun
-#run = mpirun --allow-run-as-root -x PATH -x LD_LIBRARY_PATH -x WM_PROJECT_DIR -x WM_PROJECT_USER_DIR -np 128
-#binary = pisoFoam –parallel
-binary = 
-nodes = 1
-- 
Gitee


From 56c031281616733506b6b81aa83947b57ea45090 Mon Sep 17 00:00:00 2001
From: Ling <2277486684@qq.com>
Date: Thu, 7 Mar 2024 03:04:10 +0000
Subject: [PATCH 06/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20da?=
 =?UTF-8?q?ta.openfoam.new.bisheng.cpu.config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.openfoam.new.bisheng.cpu.config | 51 ----------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 data.openfoam.new.bisheng.cpu.config

diff --git a/data.openfoam.new.bisheng.cpu.config b/data.openfoam.new.bisheng.cpu.config
deleted file mode 100644
index 1330a2de..00000000
--- a/data.openfoam.new.bisheng.cpu.config
+++ /dev/null
@@ -1,51 +0,0 @@
-[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 load 
-source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
-
-[APP]
-app_name = OpenFOAM
-build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
-binary_dir = 
-case_dir = $JARVIS_ROOT/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 64 -s -k -q
-
-[CLEAN]
-rm -rf build
-
-[RUN]
-run = 
-binary = 
-nodes = 1
-- 
Gitee


From 278428240ae864da78775568009fec0485a79213 Mon Sep 17 00:00:00 2001
From: Ling <2277486684@qq.com>
Date: Thu, 7 Mar 2024 03:04:29 +0000
Subject: [PATCH 07/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20IL?=
 =?UTF-8?q?istStream.H.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IListStream.H.patch | 38 --------------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 IListStream.H.patch

diff --git a/IListStream.H.patch b/IListStream.H.patch
deleted file mode 100644
index f8c0f372..00000000
--- a/IListStream.H.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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<char>& list)
-         {
-             List<char>::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<char>&& buffer,
-+	    ::Foam::List<char>&& 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;
-- 
Gitee


From d77b963afaeed66a16823b8df9317b538bb69698 Mon Sep 17 00:00:00 2001
From: Ling <2277486684@qq.com>
Date: Thu, 7 Mar 2024 03:04:52 +0000
Subject: [PATCH 08/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20Li?=
 =?UTF-8?q?st.H.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 List.H.patch | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 List.H.patch

diff --git a/List.H.patch b/List.H.patch
deleted file mode 100644
index 94288766..00000000
--- a/List.H.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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 T> class List;
- template<class T, unsigned N> class FixedList;
-@@ -113,6 +112,12 @@
- 
- 
- public:
-+    //Related types
-+
-+    //-Declare type of subList
-+
-+    typedef SubList<T> subList;
-+
- 
-     // Static Member Functions
- 
-@@ -199,14 +204,6 @@
- 
-     //- Destructor
-     ~List();
--
--
--    // Related types
--
--        //- Declare type of subList
--        typedef SubList<T> subList;
--
--
-     // Member Functions
- 
-         // Edit
-- 
Gitee


From dcce656141e8d647b62a0935f2503cc02380117f Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Thu, 7 Mar 2024 11:08:14 +0800
Subject: [PATCH 09/15] openfoam-patch

---
 templates/openfoam/1906/IListStream.H.patch   | 38 +++++++
 templates/openfoam/1906/List.H.patch          | 40 ++++++++
 .../1906/data.openfoam.new.bisheng.cpu.config | 98 ++++++++++---------
 3 files changed, 129 insertions(+), 47 deletions(-)
 create mode 100644 templates/openfoam/1906/IListStream.H.patch
 create mode 100644 templates/openfoam/1906/List.H.patch

diff --git a/templates/openfoam/1906/IListStream.H.patch b/templates/openfoam/1906/IListStream.H.patch
new file mode 100644
index 00000000..f8c0f372
--- /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<char>& list)
+         {
+             List<char>::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<char>&& buffer,
++	    ::Foam::List<char>&& 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 00000000..94288766
--- /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 T> class List;
+ template<class T, unsigned N> class FixedList;
+@@ -113,6 +112,12 @@
+ 
+ 
+ public:
++    //Related types
++
++    //-Declare type of subList
++
++    typedef SubList<T> subList;
++
+ 
+     // Static Member Functions
+ 
+@@ -199,14 +204,6 @@
+ 
+     //- Destructor
+     ~List();
+-
+-
+-    // Related types
+-
+-        //- Declare type of subList
+-        typedef SubList<T> subList;
+-
+-
+     // Member Functions
+ 
+         // Edit
diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index cd15cd0a..1330a2de 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -1,47 +1,51 @@
-[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 use ./software/moduledeps
-module load bisheng3.2.0/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 $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
-
-[APP]
-app_name = OpenFOAM
-build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
-binary_dir =
-case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
-
-[BUILD]
-./Allwmake -j 64 -s -k -q
-
-[CLEAN]
-rm -rf build
-
-[RUN]
-run =
-binary =
-nodes = 1
\ No newline at end of file
+[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 load 
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
+
+[APP]
+app_name = OpenFOAM
+build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
+binary_dir = 
+case_dir = $JARVIS_ROOT/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 64 -s -k -q
+
+[CLEAN]
+rm -rf build
+
+[RUN]
+run = 
+binary = 
+nodes = 1
-- 
Gitee


From 0cc4b03c45027bdf7171f5be3bc7390c34958329 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Thu, 7 Mar 2024 14:37:07 +0800
Subject: [PATCH 10/15] chage module load

---
 .../openfoam/1906/data.openfoam.new.bisheng.cpu.config   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index 1330a2de..147383a9 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -24,14 +24,15 @@ tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
 module purge
 module use ./software/modulefiles
 module load bisheng/3.2.0-mini
-module load 
-source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
+module use ./software/moduledeps 
+module load bisheng3.2.0/hmpi/2.3.0
+source OpenFOAM-v1906/etc/bashrc
 
 [APP]
 app_name = OpenFOAM
-build_dir = $JARVIS_ROOT/OpenFOAM-v1906/
+build_dir = OpenFOAM-v1906/
 binary_dir = 
-case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
+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
-- 
Gitee


From 683c04d8ff6174d13b737dd96be86c4455b9647f Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Thu, 7 Mar 2024 19:06:37 +0800
Subject: [PATCH 11/15] modify source

---
 templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index 147383a9..5e034e9d 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -26,7 +26,7 @@ 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 OpenFOAM-v1906/etc/bashrc
+source ./OpenFOAM-v1906/etc/bashrc
 
 [APP]
 app_name = OpenFOAM
@@ -41,7 +41,7 @@ sed -i '2c c++OPT        = -O3 -lm -mllvm -unroll-indirect-loads-threshold=2 -ml
 patch -p1 < ../List.H.patch
 patch -p1 < ../IListStream.H.patch
 source ./etc/bashrc
-./Allwmake -j 64 -s -k -q
+./Allwmake -j -k
 
 [CLEAN]
 rm -rf build
-- 
Gitee


From 69e57f5a84b9923d3725ac43258359ce0a227e48 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Thu, 7 Mar 2024 19:25:36 +0800
Subject: [PATCH 12/15] modify tar

---
 .../openfoam/1906/data.openfoam.new.bisheng.cpu.config      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index 5e034e9d..67d3f2f6 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -19,6 +19,12 @@ module load hmpi/2.3.0
 tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
 tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
 
+rm -rf OpenFOAM-v1906
+rm -rf ThirdParty-v1906
+
+tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
+tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
+
 [ENV]
 # add kgcc/mpi
 module purge
-- 
Gitee


From 1b1e2c807a487f5c344738b4600d3f6c3d669880 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Thu, 7 Mar 2024 19:42:37 +0800
Subject: [PATCH 13/15] modify source

---
 .../openfoam/1906/data.openfoam.new.bisheng.cpu.config     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index 67d3f2f6..eb7bf7ee 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -19,11 +19,6 @@ module load hmpi/2.3.0
 tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
 tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
 
-rm -rf OpenFOAM-v1906
-rm -rf ThirdParty-v1906
-
-tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
-tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
 
 [ENV]
 # add kgcc/mpi
@@ -32,7 +27,7 @@ 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 ./OpenFOAM-v1906/etc/bashrc
+source /hpcrunner/OpenFOAM-v1906/etc/bashrc
 
 [APP]
 app_name = OpenFOAM
-- 
Gitee


From d50c88740132d9f91b4fa5845f1786cbb5fd2e65 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Mon, 11 Mar 2024 11:00:56 +0800
Subject: [PATCH 14/15] add 920b

---
 .../1906/data.openfoam.new.920B.cpu.config    | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 templates/openfoam/1906/data.openfoam.new.920B.cpu.config

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 00000000..3c5e8e01
--- /dev/null
+++ b/templates/openfoam/1906/data.openfoam.new.920B.cpu.config
@@ -0,0 +1,53 @@
+[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
+
+[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
-- 
Gitee


From f2726eafecdfadad510e2dea3b1795194f4599a0 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Mon, 11 Mar 2024 14:18:58 +0800
Subject: [PATCH 15/15] add export

---
 .../1906/data.openfoam.new.920B.cpu.config       | 14 +++++++++++++-
 .../1906/data.openfoam.new.bisheng.cpu.config    | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/templates/openfoam/1906/data.openfoam.new.920B.cpu.config b/templates/openfoam/1906/data.openfoam.new.920B.cpu.config
index 3c5e8e01..c278d7ae 100644
--- a/templates/openfoam/1906/data.openfoam.new.920B.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.920B.cpu.config
@@ -27,7 +27,19 @@ 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
diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
index eb7bf7ee..13958f6c 100644
--- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config
@@ -27,7 +27,21 @@ 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
+#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
-- 
Gitee