From 6059d3b2920f47c7ed8aa5e6ad7d8f59add6ba53 Mon Sep 17 00:00:00 2001
From: yyyaaa111 <2393110978@qq.com>
Date: Tue, 16 Dec 2025 15:07:01 +0800
Subject: [PATCH 1/5] update wrf-4.3.3

---
 package/pnetcdf/1.9.0/install.sh   |  2 +-
 templates/wrf/4.3.3/wrf.4.3.config | 31 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/package/pnetcdf/1.9.0/install.sh b/package/pnetcdf/1.9.0/install.sh
index af2df9d5..22c600c2 100644
--- a/package/pnetcdf/1.9.0/install.sh
+++ b/package/pnetcdf/1.9.0/install.sh
@@ -26,4 +26,4 @@ if [ "$use_gcc" -eq "1" ]; then
 fi
 ./configure --prefix=$1 --enable-shared --enable-fortran --enable-large-file-test FFLAGS="$FFLAGS" FCFLAGS="$FCFLAGS"
 make -j16
-make install
\ No newline at end of file
+make install
diff --git a/templates/wrf/4.3.3/wrf.4.3.config b/templates/wrf/4.3.3/wrf.4.3.config
index 57dab855..91461dfd 100644
--- a/templates/wrf/4.3.3/wrf.4.3.config
+++ b/templates/wrf/4.3.3/wrf.4.3.config
@@ -3,9 +3,10 @@
 
 [DOWNLOAD]
 wrf/4.3.3 $JARVIS_PROXY/wrf-model/WRF/archive/refs/tags/v4.3.3.tar.gz wrf-4.3.3.tar.gz
+conus12km https://www2.mmm.ucar.edu/wrf/src/conus12km.tar.gz
 
 [DEPENDENCY]
-
+set -e
 module purge
 module use ./software/modulefiles
 ./jarvis -install kgcc/10.3.1 com
@@ -14,15 +15,16 @@ export CC=gcc CXX=g++ FC=gfortran
 
 ./jarvis -install hmpi/1.1.1 gcc
 module load ./software/moduledeps/kgcc10.3.1/hmpi/1.1.1
-
+module use ${JARVIS_ROOT}/software/moduledeps/kgcc10.3.1-hmpi1.1.1/
 export CC=mpicc CXX=mpicxx FC=mpifort
 ./jarvis -install hdf5/1.10.1 gcc+mpi
+module load hdf5/1.10.1
 ./jarvis -install package/pnetcdf/1.9.0 gcc+mpi
-module load ./software/moduledeps/gcc10.3.1-hmpi1.1.1/pnetcdf/1.9.0
+module load pnetcdf/1.9.0 
 ./jarvis -install package/netcdf/4.7.0 gcc+mpi
 
 ./jarvis -install optimized-routines/20.02 gcc
-cd ${JARVIS_TMP}
+cd ${JARVIS_ROOT}
 
 tar -zxvf $JARVIS_DOWNLOAD/wrf-4.3.3.tar.gz
 
@@ -32,6 +34,7 @@ module use ./software/modulefiles
 module load kgcc/10.3.1
 module load hmpi/1.1.1
 export CC=mpicc CXX=mpicxx FC=mpifort
+module load hdf5/1.10.1
 module load pnetcdf/1.9.0
 module load netcdf/4.7.0
 module load optimized-routines/20.02
@@ -39,12 +42,12 @@ module load optimized-routines/20.02
 
 [APP]
 app_name = WRF
-build_dir = ${WRF_DIR}
-binary_dir = 
-case_dir = ${JARVIS_ROOT}/workloads/test_wrf
+build_dir = ${JARVIS_ROOT}/WRF-4.3.3
+binary_dir =
+case_dir = ${JARVIS_ROOT}/conus12km
 
 [BUILD]
-cd ${JARVIS_TMP}
+cd ${JARVIS_ROOT}
 cd WRF-4.3.3
 
 export HDF5=`which h5diff`
@@ -108,14 +111,20 @@ EOF
 
 echo 4 | ./configure
 
-./compile em_real 2>&1 | tee -a compile.log 
-
+./compile em_real 2>&1 | tee -a compile.log
+ 
+cd ${JARVIS_ROOT}
+rm -rf conus12km
+tar -vxf ${JARVIS_DOWNLOAD}/conus12km.tar.gz
+rsync -av --exclude='namelist.input' $JARVIS_ROOT/WRF-4.3.3/run/* conus12km/
+cd conus12km
+ln -sf $JARVIS_ROOT/WRF-4.3.3/main/*.exe ./
 
 [CLEAN]
 ./clean
 
 [RUN]
-run = dsub -s run.sh
+run = mpirun --allow-run-as-root -n $(nproc) -x OMP_NUM_THREADS=1 -bind-to core ./wrf.exe
 binary = 
 nodes = 1
 
-- 
Gitee


From 0e1cd13e326857454fa471ce32589b7d59824f7f Mon Sep 17 00:00:00 2001
From: yyyaaa111 <2393110978@qq.com>
Date: Tue, 16 Dec 2025 15:07:42 +0800
Subject: [PATCH 2/5] update pnetcdf

---
 package/pnetcdf/1.9.0/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pnetcdf/1.9.0/install.sh b/package/pnetcdf/1.9.0/install.sh
index 22c600c2..036f413e 100644
--- a/package/pnetcdf/1.9.0/install.sh
+++ b/package/pnetcdf/1.9.0/install.sh
@@ -24,6 +24,6 @@ if [ "$use_gcc" -eq "1" ]; then
                 FCFLAGS="-fallow-argument-mismatch"
         fi
 fi
-./configure --prefix=$1 --enable-shared --enable-fortran --enable-large-file-test FFLAGS="$FFLAGS" FCFLAGS="$FCFLAGS"
+./configure --prefix=$1 --enable-relax-coord-bound --enable-shared --enable-fortran --enable-large-file-test FFLAGS="$FFLAGS" FCFLAGS="$FCFLAGS"
 make -j16
 make install
-- 
Gitee


From eb68f85184f0e6de22549be38dc6085b800243f6 Mon Sep 17 00:00:00 2001
From: yyyaaa111 <2393110978@qq.com>
Date: Tue, 16 Dec 2025 16:15:18 +0800
Subject: [PATCH 3/5] update
 templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config

---
 templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config b/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config
index bd32165c..6ec058f1 100644
--- a/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config
+++ b/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config
@@ -3,6 +3,7 @@
 
 [DOWNLOAD]
 wrf/4.3.3 $JARVIS_PROXY/wrf-model/WRF/archive/refs/tags/v4.3.3.tar.gz wrf-4.3.3.tar.gz
+conus12km https://www2.mmm.ucar.edu/wrf/src/conus12km.tar.gz
 
 [DEPENDENCY]
 set -e
@@ -56,7 +57,7 @@ export WRFIO_NCD_LARGE_FILE_SUPPORT=1
 app_name = WRF
 build_dir = ${WRF_DIR}
 binary_dir =
-case_dir = ${JARVIS_ROOT}/workloads/test_wrf
+case_dir = ${JARVIS_ROOT}/conus12km
 
 [BUILD]
 cat << \EOF > ./arch/configure.defaults
@@ -112,10 +113,17 @@ EOF
 echo 4 | ./configure
 ./compile -j 16 em_real 2>&1 | tee compile.log
 
+cd ${JARVIS_ROOT}
+rm -rf conus12km
+tar -xvf $JARVIS_DOWNLOAD/conus12km.tar.gz
+rsync -av --exclude='namelist.input' $JARVIS_ROOT/WRF-4.3.3/run/* conus12km/
+cd conus12km
+ln -sf $JARVIS_ROOT/WRF-4.3.3/main/*.exe ./
+
 [CLEAN]
 ./clean
 
 [RUN]
-run = dsub -s run.sh
+run = mpirun --allow-run-as-root -n $(nproc) -x OMP_NUM_THREADS=1 -bind-to core ./wrf.exe
 binary =
 nodes = 1
-- 
Gitee


From a16dbfec19c8f2e588f40f6ce2fdb0e293272699 Mon Sep 17 00:00:00 2001
From: yyyaaa111 <2393110978@qq.com>
Date: Tue, 16 Dec 2025 16:18:00 +0800
Subject: [PATCH 4/5] update

---
 templates/wrf/4.3.3/wrf.4.3.config | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/wrf/4.3.3/wrf.4.3.config b/templates/wrf/4.3.3/wrf.4.3.config
index 91461dfd..a3cfbe88 100644
--- a/templates/wrf/4.3.3/wrf.4.3.config
+++ b/templates/wrf/4.3.3/wrf.4.3.config
@@ -24,7 +24,7 @@ module load pnetcdf/1.9.0
 ./jarvis -install package/netcdf/4.7.0 gcc+mpi
 
 ./jarvis -install optimized-routines/20.02 gcc
-cd ${JARVIS_ROOT}
+cd ${JARVIS_TMP}
 
 tar -zxvf $JARVIS_DOWNLOAD/wrf-4.3.3.tar.gz
 
@@ -42,12 +42,12 @@ module load optimized-routines/20.02
 
 [APP]
 app_name = WRF
-build_dir = ${JARVIS_ROOT}/WRF-4.3.3
+build_dir = ${JARVIS_TMP}/WRF-4.3.3
 binary_dir =
 case_dir = ${JARVIS_ROOT}/conus12km
 
 [BUILD]
-cd ${JARVIS_ROOT}
+cd ${JARVIS_TMP}
 cd WRF-4.3.3
 
 export HDF5=`which h5diff`
@@ -116,9 +116,9 @@ echo 4 | ./configure
 cd ${JARVIS_ROOT}
 rm -rf conus12km
 tar -vxf ${JARVIS_DOWNLOAD}/conus12km.tar.gz
-rsync -av --exclude='namelist.input' $JARVIS_ROOT/WRF-4.3.3/run/* conus12km/
+rsync -av --exclude='namelist.input' $JARVIS_TMP/WRF-4.3.3/run/* conus12km/
 cd conus12km
-ln -sf $JARVIS_ROOT/WRF-4.3.3/main/*.exe ./
+ln -sf $JARVIS_TMP/WRF-4.3.3/main/*.exe ./
 
 [CLEAN]
 ./clean
-- 
Gitee


From fa60714db677288ae8ea7134b7a9ac78ff9ff427 Mon Sep 17 00:00:00 2001
From: yyyaaa111 <2393110978@qq.com>
Date: Tue, 16 Dec 2025 16:20:29 +0800
Subject: [PATCH 5/5] update

---
 templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config b/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config
index 6ec058f1..ece39722 100644
--- a/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config
+++ b/templates/wrf/4.3.3/bisheng/data.wrf.arm.cpu.config
@@ -47,7 +47,7 @@ export JASPREINC=$$JASPER_PATH/include
 export CPPFLAGS="-I$HDF5/include -I$PNETCDF/include -I$NETCDF/include"
 export LDFLAGS="-L$HDF5/lib -L$PNETCDF/lib -L$NETCDF/lib -lnetcdf -lnetcdff -lpnetcdf -lhdf5_hl -lhdf5 -lz"
 export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 F90=mpif90
-export WRF_DIR=$JARVIS_ROOT/WRF-4.3.3
+export WRF_DIR=$JARVIS_TMP/WRF-4.3.3
 export MPI_LIB="-L$MPI_LIB -lmpi -lomp"
 export INCLUDE=$WRF_DIR/include:$INCLUDE
 export WRFIO_NCD_LARGE_FILE_SUPPORT=1
@@ -116,9 +116,9 @@ echo 4 | ./configure
 cd ${JARVIS_ROOT}
 rm -rf conus12km
 tar -xvf $JARVIS_DOWNLOAD/conus12km.tar.gz
-rsync -av --exclude='namelist.input' $JARVIS_ROOT/WRF-4.3.3/run/* conus12km/
+rsync -av --exclude='namelist.input' $JARVIS_TMP/WRF-4.3.3/run/* conus12km/
 cd conus12km
-ln -sf $JARVIS_ROOT/WRF-4.3.3/main/*.exe ./
+ln -sf $JARVIS_TMP/WRF-4.3.3/main/*.exe ./
 
 [CLEAN]
 ./clean
-- 
Gitee