Changeset 1915 for XIOS

Timestamp:

07/01/20 10:37:06 (4 years ago)

Author:

yushan

Message:

trunk : correct an error in reference match

Location:

XIOS/trunk/xios_test_suite/TEST_SUITE

Files:

• my_run.sh (modified) (2 diffs)
• step1.py (modified) (2 diffs)
• step2.py (modified) (1 diff)

XIOS/trunk/xios_test_suite/TEST_SUITE/my_run.sh

@@ -27 +27 @@
   while [ ! -z "$output" ]
   do
-    echo "job" $jobid "running for about" ${i} seconds
+    echo "job" $jobid "pending/running for about" ${i} seconds
     sleep 5
     ((i+=5))
@@ -43 +43 @@
   while [ ! -z "$output" ]
   do
-    echo "job" $jobid "running for about" ${i} seconds
+    echo "job" $jobid "pending/running for about" ${i} seconds
     sleep 5
     ((i+=5))

XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

@@ -197 +197 @@
             OSinfo("cp build_"+arch+"_"+mode+"/bin/generic_testcase.exe "+test_folder+"/CONFIG_"+mystr)
             OSinfo("cp iodef.xml "+test_folder+"/CONFIG_"+mystr+"/iodef.xml.tmp")
+            OSinfo("cp "+test_folder+"/context_atm.xml "+test_folder+"/CONFIG_"+mystr+"/context_atm.xml.tmp")
 
             with open(test_folder+"/CONFIG_"+mystr+"/iodef.xml.tmp", "r") as f:
@@ -209 +210 @@
                         g.write(line)
 
+            with open(test_folder+"/CONFIG_"+mystr+"/context_atm.xml.tmp", "r") as f:
+                lines = f.readlines()
+                for i in range(len(lines)):
+                    if "XIOS::" in lines[i]:
+                        config_keys = list(full_config.keys())
+                        for idx in range(len(config_keys)):
+                            lines[i] = lines[i].replace("XIOS::"+config_keys[idx], str(full_config[config_keys[idx]]))
+                with open(test_folder+"/CONFIG_"+mystr+"/context_atm.xml", "w") as g:
+                    for line in lines:
+                        g.write(line)
+
+
             OSinfo("rm -f "+test_folder+"/CONFIG_"+mystr+"/iodef.xml.tmp")
-            OSinfo("cp "+test_folder+"/context_atm.xml "+test_folder+"/CONFIG_"+mystr+"/")
+            OSinfo("rm -f "+test_folder+"/CONFIG_"+mystr+"/context_atm.xml.tmp")
             OSinfo("cp context_grid_dynamico.xml "+test_folder+"/CONFIG_"+mystr+"/")
             OSinfo("cp dynamico_grid.nc "+test_folder+"/CONFIG_"+mystr+"/")

XIOS/trunk/xios_test_suite/TEST_SUITE/step2.py

@@ -44 +44 @@
     for ref in ref_list:
         if int(svnr) >= ref :
-            ref_rev = str(rev)
+            ref_rev = str(ref)
+            print("corresponding reference = ", ref)
             break