From 850cdd1587db8e160ffac5e2739ef77d4a888955 Mon Sep 17 00:00:00 2001 From: chrislxj Date: Thu, 23 Jan 2025 21:48:50 +0800 Subject: [PATCH] additional configuration files are added for scripts --- run/scripts/diffcasecode.bash | 188 +++++++++++++++++++++++++++ run/scripts/machine-baiduboat.config | 26 ++++ run/scripts/machine-github.config | 2 + run/scripts/machine-tianhexy.config | 26 ++++ 4 files changed, 242 insertions(+) create mode 100755 run/scripts/diffcasecode.bash create mode 100644 run/scripts/machine-baiduboat.config create mode 100644 run/scripts/machine-tianhexy.config diff --git a/run/scripts/diffcasecode.bash b/run/scripts/diffcasecode.bash new file mode 100755 index 00000000..0166bb23 --- /dev/null +++ b/run/scripts/diffcasecode.bash @@ -0,0 +1,188 @@ +ROOT=/share/home/dq010/CoLM202X-pre-release/ +if [ $# -eq 2 ];then + if [ "${1:0:1}" == '/' ];then + CASENAME1=`echo "${1##*/}"` + CASEPATH1=`echo "${1%/*}"` + echo $CASEPATH1 + echo $CASENAME1 + else + CASEPATHNAME1=$PWD/$1 + CASENAME1=`echo "${CASEPATHNAME1##*/}"` + CASEPATH1=`echo "${CASEPATHNAME1%/*}"` + echo $CASEPATH1 + echo $CASENAME1 + fi + if [ "${2:0:1}" == '/' ];then + CASENAME2=`echo "${2##*/}"` + CASEPATH2=`echo "${2%/*}"` + echo $CASEPATH2 + echo $CASENAME2 + else + CASEPATHNAME2=$PWD/$2 + CASENAME2=`echo "${CASEPATHNAME2##*/}"` + CASEPATH2=`echo "${CASEPATHNAME2%/*}"` + echo $CASEPATH2 + echo $CASENAME2 + fi + + echo diff between case $1 and $2 + cd $CASEPATH1/$CASENAME1/bld/main/ + for files in *F90 + do +# echo main/$files + tmp=`diff $files /$CASEPATH2/$CASENAME2/bld/main/` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!!!" main/$files + diff $files $CASEPATH2/$CASENAME2/bld/main/ + fi + done + + cd BGC + for files in *F90 + do +# echo main/BGC/$files + tmp=`diff $files $CASEPATH2/$CASENAME2/bld/main/BGC` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!!!" main/$files + diff $files $CASEPATH2/$CASENAME2/bld/main/BGC + fi + done + + cd ../HYDRO + for files in *F90 + do +# echo main/HYDRO/$files + tmp=`diff $files $CASEPATH2/$CASENAME2/bld/main/HYDRO` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!!!" main/$files + diff $files $CASEPATH2/$CASENAME2/bld/main/HYDRO + fi + done + + cd ../URBAN + for files in *F90 + do +# echo main/URBAN/$files + tmp=`diff $files $CASEPATH2/$CASENAME2/bld/main/URBAN` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!!!" main/$files + diff $files $CASEPATH2/$CASENAME2/bld/main/URBAN + fi + done + + cd ../../mksrfdata/ + for files in *F90 + do + tmp=`diff $files $CASEPATH2/$CASENAME2/bld/mksrfdata` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!!" mksrfdata/$files + diff $files $CASEPATH2/$CASENAME2/bld/mksrfdata + fi + done + + cd ../mkinidata/ + for files in *F90 + do + tmp=`diff $files $CASEPATH2/$CASENAME2/bld/mkinidata` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" mkinidata/$files + diff $files $CASEPATH2/$CASENAME2/bld/mkinidata + fi + done + + cd ../share/ + for files in *F90 + do + tmp=`diff $files $CASEPATH2/$CASENAME2/bld/share` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" share/$files + diff $files $CASEPATH2/$CASENAME2/bld/share + fi + done +fi + +if [ $# -eq 1 ];then + if [ "${1:0:1}" == '/' ];then + CASENAME1=`echo "${1##*/}"` + CASEPATH1=`echo "${1%/*}"` + echo $CASEPATH1 + echo $CASENAME1 + else + CASEPATHNAME1=$PWD/$1 + CASENAME1=`echo "${CASEPATHNAME1##*/}"` + CASEPATH1=`echo "${CASEPATHNAME1%/*}"` + echo $CASEPATH1 + echo $CASENAME1 + fi + + echo diff between case $1 and root + cd $CASEPATH1/$CASENAME1/bld/main + for files in *F90 + do + tmp=`diff $files $ROOT/main/` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" main/$files + diff $files $ROOT/main/ + fi + done + + cd BGC + for files in *F90 + do + tmp=`diff $files $ROOT/main/BGC` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" main/BGC/$files + diff $files $ROOT/main/BGC + fi + done + + cd ../HYDRO + for files in *F90 + do + tmp=`diff $files $ROOT/main/HYDRO` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" main/HYDRO/$files + diff $files $ROOT/main/HYDRO + fi + done + + cd ../URBAN + for files in *F90 + do + tmp=`diff $files $ROOT/main/URBAN` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" main/URBAN/$files + diff $files $ROOT/main/URBAN + fi + done + + cd ../../mksrfdata/ + for files in *F90 + do + tmp=`diff $files $ROOT/mksrfdata` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" mksrfdata/$files + diff $files $ROOT/mksrfdata + fi + done + + cd ../mkinidata/ + for files in *F90 + do + tmp=`diff $files $ROOT/mkinidata` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" mkinidata/$files + diff $files $ROOT/mkinidata + fi + done + + cd ../share/ + for files in *F90 + do + tmp=`diff $files $ROOT/share` + if [ ! -z "$tmp" ];then + echo "file differs !!!!!!!!" share/$files + diff $files $ROOT/share + fi + done +fi diff --git a/run/scripts/machine-baiduboat.config b/run/scripts/machine-baiduboat.config new file mode 100644 index 00000000..8e178e31 --- /dev/null +++ b/run/scripts/machine-baiduboat.config @@ -0,0 +1,26 @@ +NProcesses_mksrf 672 +NNodes_mksrf 14 +NTasksPerNode_mksrf 48 +Memory_mksrf 150G +Walltime_mksrf 24:00:00 +Queue_mksrf normal +NProcesses_mkini 48 +NNodes_mkini 1 +NTasksPerNode_mkini 48 +Memory_mkini 150G +Walltime_mkini 24:00:00 +Queue_mkini normal +NProcesses_case 240 +NNodes_case 5 +NTasksPerNode_case 48 +Memory_case 150G +Walltime_case 24:00:00 +Queue_case normal +Exe_command mpirun +Exe_opt -np +ROOT /share/home/dq010//CoLM202X-pre-release/ +RAWDATA /share/home/dq010/CoLM/data/rawdata/CROP-NITRIF/CLMrawdata_updating/ +RUNTIME /share/home/dq010/CoLM/data/rawdata/CROP-NITRIF/CoLMruntime// +MAKEOPTION Makeoptions.SYSU-BaiduBoat +FORCINGPATH /share/home/dq013/zhwei/colm/data/CoLM_Forcing/crujra_v2.5/ + diff --git a/run/scripts/machine-github.config b/run/scripts/machine-github.config index 02e3e282..8e178e31 100644 --- a/run/scripts/machine-github.config +++ b/run/scripts/machine-github.config @@ -16,6 +16,8 @@ NTasksPerNode_case 48 Memory_case 150G Walltime_case 24:00:00 Queue_case normal +Exe_command mpirun +Exe_opt -np ROOT /share/home/dq010//CoLM202X-pre-release/ RAWDATA /share/home/dq010/CoLM/data/rawdata/CROP-NITRIF/CLMrawdata_updating/ RUNTIME /share/home/dq010/CoLM/data/rawdata/CROP-NITRIF/CoLMruntime// diff --git a/run/scripts/machine-tianhexy.config b/run/scripts/machine-tianhexy.config new file mode 100644 index 00000000..8333d788 --- /dev/null +++ b/run/scripts/machine-tianhexy.config @@ -0,0 +1,26 @@ +NProcesses_mksrf 512 +NNodes_mksrf 8 +NTasksPerNode_mksrf 64 +Memory_mksrf 400G +Walltime_mksrf 24:00:00 +Queue_mksrf mars +NProcesses_mkini 64 +NNodes_mkini 1 +NTasksPerNode_mkini 64 +Memory_mkini 400G +Walltime_mkini 24:00:00 +Queue_mkini mars +NProcesses_case 384 +NNodes_case 6 +NTasksPerNode_case 64 +Memory_case 400G +Walltime_case 24:00:00 +Queue_case mars +Exe_command yhrun +Exe_opt -n +ROOT /XYFS01/HDD_POOL/sysu_yjdai2/sysu_yjdai2xy_5/CoLM2024-pre-release/ +RAWDATA /XYFS01/HDD_POOL/sysu_yjdai2/SHARE01/CoLMdata/CoLMrawdata/ +RUNTIME /XYFS01/HDD_POOL/sysu_yjdai2/SHARE01/CoLMdata/CoLMruntime/ +MAKEOPTION Makeoptions.Tianhe-XY +FORCINGPATH /XYFS01/HDD_POOL/sysu_yjdai2/SHARE01/CoLMdata/CoLM_Forcing/crujra_v2.5/ +