Changeset 1841 for XIOS/trunk/xios_test_suite/TEST_SUITE/generate_test.py

Timestamp:

01/02/20 19:10:21 (4 years ago)

Author:

yushan

Message:

XIOS test suite : update to hierarchical inputs

File:

• XIOS/trunk/xios_test_suite/TEST_SUITE/generate_test.py (modified) (1 diff)

XIOS/trunk/xios_test_suite/TEST_SUITE/generate_test.py

@@ -130 +130 @@
             tmp_algo = l.split("/")
             f.write("var test_"+machine+"_"+revision+"_"+tmp_algo[len(tmp_algo)-1]+"_user_params = [\n")
-            g=open(l+"/user_params.def","r")
-            for line in g:
-                if not line=="\n" and not line.startswith("#"):
-                    f.write("        \'"+line.replace("\n","").replace("'","\\\'")+"\',\n")
-            g.close()
+            if os.path.exists(l+"/user_param.json"):
+                g=open(l+"/user_param.json","r")
+                for line in g:
+                    if not line=="\n" and not line.startswith("#"):
+                        f.write("        \'"+line.replace("\n","").replace("'","\\\'")+"\',\n")
+                g.close()
+            else :
+                g=open(l+"/user_params.def","r")
+                for line in g:
+                    if not line=="\n" and not line.startswith("#"):
+                        f.write("        \'"+line.replace("\n","").replace("'","\\\'")+"\',\n")
+                g.close()
             f.write("        ]\n\n")