Changeset 1838 for XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/job_jeanzay.sh

Timestamp:

01/02/20 16:07:39 (4 years ago)

Author:

yushan

Message:

dev_trunk_omp : add hierarchical inputs(user_param.json). simplify post-processing scripts

File:

• XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/job_jeanzay.sh (modified) (12 diffs)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/job_jeanzay.sh

@@ -34 +34 @@
 
 source ../arch/arch-${arch}.env
+source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt
 module load cmake
 module load cdo
@@ -58 +59 @@
 
 
-rm -f plein_report.txt
-
-echo "#revision" ${xios_revision} >> plein_report.txt
-echo "#relurl" ${relurl} >> plein_report.txt
-echo "#machine" ${machine_name} >> plein_report.txt
-echo "#build_dir" ${xios_dir}/${build_dir} >> plein_report.txt
-echo "#arch" ${arch} >> plein_report.txt
-echo "#mode" ${mode} >> plein_report.txt
+rm -f plain_report.txt
+
+echo "#revision" ${xios_revision} >> plain_report.txt
+echo "#relurl" ${relurl} >> plain_report.txt
+echo "#machine" ${machine_name} >> plain_report.txt
+echo "#build_dir" ${xios_dir}/${build_dir} >> plain_report.txt
+echo "#arch" ${arch} >> plain_report.txt
+echo "#mode" ${mode} >> plain_report.txt
 
 
@@ -74 +75 @@
 do
   cp setup.py ${i%%/}      
+  cp default_param.json ${i%%/}  
+  cp param_list.py ${i%%/}      
   cp run_sub_test.sh ${i%%/}    
   echo "bash -c \"cd " ${i%%/} " && python setup.py\" ">> setup.sh
@@ -107 +110 @@
 mkdir -p ../html
 mkdir -p ../html/test_${machine_name}
-cp plein_report.txt ../html/test_${machine_name}/test_${xios_revision}_${machine_name}_${arch}_${mode}.txt
+cp plain_report.txt ../html/test_${machine_name}/test_${xios_revision}_${machine_name}_${arch}_${mode}.txt
 
 
@@ -116 +119 @@
 do
   mkdir -p ../html/def_files/${xios_revision}/${i%%}
-  cp ${i%%}/user_params.def ../html/def_files/${xios_revision}/${i%%}      
+  cp ${i%%/}/param.json ../html/def_files/${xios_revision}/${i%%}      
   for j in $(ls -d ${i%%/}/config_*)
   do
@@ -126 +129 @@
 
 bash -c "cd ../html && python generate_test.py"
-
-
 
 #============================= X64_JEANZAY_debug =============================
@@ -146 +147 @@
 
 source ../arch/arch-${arch}.env
+source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt
 module load cmake
 module load cdo
@@ -170 +172 @@
 
 
-rm -f plein_report.txt
-
-echo "#revision" ${xios_revision} >> plein_report.txt
-echo "#relurl" ${relurl} >> plein_report.txt
-echo "#machine" ${machine_name} >> plein_report.txt
-echo "#build_dir" ${xios_dir}/${build_dir} >> plein_report.txt
-echo "#arch" ${arch} >> plein_report.txt
-echo "#mode" ${mode} >> plein_report.txt
+rm -f plain_report.txt
+
+echo "#revision" ${xios_revision} >> plain_report.txt
+echo "#relurl" ${relurl} >> plain_report.txt
+echo "#machine" ${machine_name} >> plain_report.txt
+echo "#build_dir" ${xios_dir}/${build_dir} >> plain_report.txt
+echo "#arch" ${arch} >> plain_report.txt
+echo "#mode" ${mode} >> plain_report.txt
 
 
@@ -186 +188 @@
 do
   cp setup.py ${i%%/}      
+  cp default_param.json ${i%%/}  
+  cp param_list.py ${i%%/}      
   cp run_sub_test.sh ${i%%/}    
   echo "bash -c \"cd " ${i%%/} " && python setup.py\" ">> setup.sh
@@ -219 +223 @@
 mkdir -p ../html
 mkdir -p ../html/test_${machine_name}
-
-cp plein_report.txt ../html/test_${machine_name}/test_${xios_revision}_${machine_name}_${arch}_${mode}.txt
+cp plain_report.txt ../html/test_${machine_name}/test_${xios_revision}_${machine_name}_${arch}_${mode}.txt
+
 
 mkdir -p ../html/def_files
@@ -228 +232 @@
 do
   mkdir -p ../html/def_files/${xios_revision}/${i%%}
-  cp ${i%%}/user_params.def ../html/def_files/${xios_revision}/${i%%}      
+  cp ${i%%/}/param.json ../html/def_files/${xios_revision}/${i%%}      
   for j in $(ls -d ${i%%/}/config_*)
   do
@@ -239 +243 @@
 bash -c "cd ../html && python generate_test.py"
 
-