Changeset 1907 for XIOS

Timestamp:

06/17/20 20:17:39 (4 years ago)

Author:

yushan

Message:

trunk : cleanup

Location:

XIOS/trunk/xios_test_suite

Files:

• ENV/irene.env (modified) (2 diffs)
• ENV/jeanzay.env (modified) (1 diff)
• TEST_SUITE/my_run.sh (modified) (3 diffs)
• TEST_SUITE/step1.py (modified) (2 diffs)

XIOS/trunk/xios_test_suite/ENV/irene.env

@@ -1 +1 @@
 module load subversion
 module load cmake
-module load python3
+module load python3/3.7.5
 
 CHMOD() { chmod --quiet ug+rwX,o+rX "$@" ;}
@@ -13 +13 @@
 export ref_file=reference.tar.gz
 
+export PYTHON=python3
+
 mkdir -p $xios_test_suite_repository ; CHMOD $xios_test_suite_repository
 mkdir -p $xios_thredds_dir ; CHMOD $xios_thredds_dir

XIOS/trunk/xios_test_suite/ENV/jeanzay.env

@@ -14 +14 @@
 export ref_file=reference.tar.gz
 
+export PYTHON=python
 
 mkdir -p $xios_test_suite_repository ; CHMOD $xios_test_suite_repository

XIOS/trunk/xios_test_suite/TEST_SUITE/my_run.sh

@@ -1 @@
-#!/bin/bash
+#!/bin/bash 
 
 echo "running my_run.sh"
@@ -15 +15 @@
 echo "#mode" $mode >> ${fn}
 
-python step1.py
+
+${PYTHON} step1.py
 
 
@@ -50 +51 @@
 
 
-python step2.py
+${PYTHON} step2.py

XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

@@ -151 +151 @@
 
     default_param = get_default_param()
-    # print(default_param)
+    #print(default_param)
 
     for test_folder in test_folder_list:
@@ -178 +178 @@
             mystr = mystr.replace(",", "")
             mystr = mystr.replace(":", "")
+            mystr = mystr.replace("u'", "")
             mystr = mystr.replace("'", "")
-            mystr = mystr.replace("b'", "")
             mystr = mystr.replace(" ", "_")
             for j in range(len(param_list)):