From 368c329d3fa7060a673ba1fa54f876c048e2ac33 Mon Sep 17 00:00:00 2001
From: Qiyu8 <fangchunlin@huawei.com>
Date: Thu, 30 Jun 2022 17:53:26 +0800
Subject: [PATCH 1/3] fix openfoam,jasper config error

---
 .../jasper/1.900.2/data.jasper.arm.cpu.config |  3 +-
 .../1906/data.openfoam.arm.cpu.config         | 43 +++++++++++++++++++
 .../data.openfoam.arm.cpu.opt.config          | 17 +++++---
 .../1960/data.openfoam.arm.cpu.config         | 26 -----------
 4 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 templates/openfoam/1906/data.openfoam.arm.cpu.config
 rename templates/openfoam/{1960 => 1906}/data.openfoam.arm.cpu.opt.config (48%)
 delete mode 100644 templates/openfoam/1960/data.openfoam.arm.cpu.config

diff --git a/templates/jasper/1.900.2/data.jasper.arm.cpu.config b/templates/jasper/1.900.2/data.jasper.arm.cpu.config
index a1d15ae..9883e15 100644
--- a/templates/jasper/1.900.2/data.jasper.arm.cpu.config
+++ b/templates/jasper/1.900.2/data.jasper.arm.cpu.config
@@ -3,11 +3,10 @@
 
 [DOWNLOAD]
 jasper/1.900.2 https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.2.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
 
 [DEPENDENCY]
-module use ./software/modulefiles
 module purge
+module use ./software/modulefiles
 ./jarvis -install bisheng/2.1.0 com
 
 [ENV]
diff --git a/templates/openfoam/1906/data.openfoam.arm.cpu.config b/templates/openfoam/1906/data.openfoam.arm.cpu.config
new file mode 100644
index 0000000..2e5b658
--- /dev/null
+++ b/templates/openfoam/1906/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 kgcc9/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 kgcc9/9.3.1
+module load hmpi1/1.1.1
+
+[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]
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
+./Allwmake -j 64
+
+[CLEAN]
+rm -rf build
+
+[RUN]
+run = 
+binary = ./Allrun
+nodes = 1
\ No newline at end of file
diff --git a/templates/openfoam/1960/data.openfoam.arm.cpu.opt.config b/templates/openfoam/1906/data.openfoam.arm.cpu.opt.config
similarity index 48%
rename from templates/openfoam/1960/data.openfoam.arm.cpu.opt.config
rename to templates/openfoam/1906/data.openfoam.arm.cpu.opt.config
index 25abc6f..c0b5fc9 100644
--- a/templates/openfoam/1960/data.openfoam.arm.cpu.opt.config
+++ b/templates/openfoam/1906/data.openfoam.arm.cpu.opt.config
@@ -1,28 +1,35 @@
 [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.1.0 com
 module use ./software/modulefiles
 module load bisheng2
 ./jarvis -install hmpi/1.1.1 clang
 module load hmpi1/1.1.1
+#release zip files
+tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz
+tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz
 
 [ENV]
 # add gcc/mpi
-source /home/Jarvis3-4/HPCRunner/opt-OpenFOAM/opt_codes/OpenFOAM-v1906/etc/bashrc
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
 module use ./software/modulefiles
 module load bisheng2
 module load hmpi1/1.1.1
 
 [APP]
 app_name = OpenFOAM
-build_dir = /home/Jarvis3-4/HPCRunner/opt-OpenFOAM/opt_codes/OpenFOAM-v1906/
+build_dir = $JARVIS_ROOT/OpenFOAM-v1906/OpenFOAM-v1906/
 binary_dir = 
-case_dir = /home/Jarvis3-4/HPCRunner/case/openfoam/audi/
+case_dir = $JARVIS_ROOT/workloads/openfoam/audi/
 
 [BUILD]
-source /home/Jarvis3-4/HPCRunner/opt-OpenFOAM/opt_codes/OpenFOAM-v1906/etc/bashrc
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
 ./Allwmake -j 64
 
 [CLEAN]
@@ -30,5 +37,5 @@ rm -rf build
 
 [RUN]
 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 2
+binary = pisoFoam –parallel
 nodes = 1
diff --git a/templates/openfoam/1960/data.openfoam.arm.cpu.config b/templates/openfoam/1960/data.openfoam.arm.cpu.config
deleted file mode 100644
index 5930755..0000000
--- a/templates/openfoam/1960/data.openfoam.arm.cpu.config
+++ /dev/null
@@ -1,26 +0,0 @@
-[SERVER]
-11.11.11.11
-
-[ENV]
-# add gcc/mpi
-module use modules
-module load compiler/kgcc-9.3
-module load gcc/openmpi
-
-[APP]
-app_name = OpenFOAM
-build_dir = /home/HPCRunner/OpenFOAM-v1906/
-binary_dir = 
-case_dir = /home/HPCRunner/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
-
-[BUILD]
-source /home/HPCRunner/OpenFOAM-v1906/etc/bashrc
-./Allwmake -j 64
-
-[CLEAN]
-rm -rf build
-
-[RUN]
-run = 
-binary = ./Allrun
-nodes = 1
\ No newline at end of file
-- 
Gitee


From d92f90b2b55e913828478705f6492f01260ba327 Mon Sep 17 00:00:00 2001
From: Qiyu8 <fangchunlin@huawei.com>
Date: Thu, 30 Jun 2022 19:58:55 +0800
Subject: [PATCH 2/3] openfoam build and run should add env

---
 templates/openfoam/1906/data.openfoam.arm.cpu.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/openfoam/1906/data.openfoam.arm.cpu.config b/templates/openfoam/1906/data.openfoam.arm.cpu.config
index 2e5b658..e7a9dc3 100644
--- a/templates/openfoam/1906/data.openfoam.arm.cpu.config
+++ b/templates/openfoam/1906/data.openfoam.arm.cpu.config
@@ -23,6 +23,7 @@ module purge
 module use ./software/modulefiles
 module load kgcc9/9.3.1
 module load hmpi1/1.1.1
+source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
 
 [APP]
 app_name = OpenFOAM
@@ -31,7 +32,6 @@ binary_dir =
 case_dir = $JARVIS_ROOT/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/
 
 [BUILD]
-source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
 ./Allwmake -j 64
 
 [CLEAN]
-- 
Gitee


From caf1bb8128c41991155a9f17bd4206f00be4478d Mon Sep 17 00:00:00 2001
From: Qiyu8 <fangchunlin@huawei.com>
Date: Thu, 30 Jun 2022 19:59:40 +0800
Subject: [PATCH 3/3] openfoam build and run should add env

---
 templates/openfoam/1906/data.openfoam.arm.cpu.opt.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/openfoam/1906/data.openfoam.arm.cpu.opt.config b/templates/openfoam/1906/data.openfoam.arm.cpu.opt.config
index c0b5fc9..7451eff 100644
--- a/templates/openfoam/1906/data.openfoam.arm.cpu.opt.config
+++ b/templates/openfoam/1906/data.openfoam.arm.cpu.opt.config
@@ -29,7 +29,6 @@ binary_dir =
 case_dir = $JARVIS_ROOT/workloads/openfoam/audi/
 
 [BUILD]
-source $JARVIS_ROOT/OpenFOAM-v1906/etc/bashrc
 ./Allwmake -j 64
 
 [CLEAN]
-- 
Gitee