Changeset 1795

Timestamp:

12/16/19 19:30:56 (4 years ago)

Author:

yushan

Message:

dev_trunk_omp : corrections

Location:

XIOS/dev/dev_trunk_omp

Files:

• Compile/config_compile.py (modified) (2 diffs)
• Compile/job_compile_irene.sh (modified) (1 diff)
• GENERIC_TESTCASE/job_irene.sh (modified) (2 diffs)
• GENERIC_TESTCASE/job_jeanzay.sh (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/Compile/config_compile.py

@@ -42 +42 @@
                         configs_arg[1].append(word)
                                 
-    # print(configs_arg)
-
-    f=open("compile_script.sh", "w")
-    for i in range(len(configs_arg[0])):
-        for j in range(len(configs_arg[1])):
-            build_dir_name = "build_"+configs_arg[0][i]+"_"+configs_arg[1][j]
-            f.write("bash -c \"cd .. && ./make_xios --arch "+configs_arg[0][i]+" --"+configs_arg[1][j]+" --omp --job 4 --build_dir "+build_dir_name+" | tail -n 1 >> Compile/"+build_dir_name+"_compile_log.txt\"\n")
-    f.close()
 
 
@@ -68 +60 @@
     for i in range(len(configs_arg[0])):
         for j in range(len(configs_arg[1])):
-            build_dir_name = "build_"+revision+"_"+configs_arg[0][i]+"_"+configs_arg[1][j]
-            # os.system("rm -f "+build_dir_name+"_compile_log.txt")
+            build_dir_name = "build_"+configs_arg[0][i]+"_"+configs_arg[1][j]
             g=open(build_dir_name+"_compile_log.txt", "w")
             g.write("arch "+configs_arg[0][i]+"\n")

XIOS/dev/dev_trunk_omp/Compile/job_compile_irene.sh

@@ -40 +40 @@
 
 mkdir -p ../html
-mkdir -p ../html/build_irene
+mkdir -p ../html/build_${machine}
 
 mv build_*.txt ../html/build_${machine}/

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/job_irene.sh

@@ -23 +23 @@
 cd $BRIDGE_MSUB_PWD
 
+module load subversion
 export arch=X64_IRENE_intelmpi
 export mode=prod
@@ -147 +148 @@
 cd $BRIDGE_MSUB_PWD
 
+module load subversion
 export arch=X64_IRENE_intelmpi
 export mode=debug

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/job_jeanzay.sh

@@ -19 +19 @@
 #============================= X64_JEANZAY_prod =============================
 
+module load subversion
 export arch=X64_JEANZAY
 export mode=prod
@@ -130 +131 @@
 #============================= X64_JEANZAY_debug =============================
 
+module load subversion
 export arch=X64_JEANZAY
 export mode=debug