Changeset 1915


Ignore:
Timestamp:
07/01/20 10:37:06 (2 years ago)
Author:
yushan
Message:

trunk : correct an error in reference match

Location:
XIOS/trunk/xios_test_suite/TEST_SUITE
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/xios_test_suite/TEST_SUITE/my_run.sh

    r1907 r1915  
    2727  while [ ! -z "$output" ] 
    2828  do 
    29     echo "job" $jobid "running for about" ${i} seconds 
     29    echo "job" $jobid "pending/running for about" ${i} seconds 
    3030    sleep 5 
    3131    ((i+=5)) 
     
    4343  while [ ! -z "$output" ] 
    4444  do 
    45     echo "job" $jobid "running for about" ${i} seconds 
     45    echo "job" $jobid "pending/running for about" ${i} seconds 
    4646    sleep 5 
    4747    ((i+=5)) 
  • XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

    r1909 r1915  
    197197            OSinfo("cp build_"+arch+"_"+mode+"/bin/generic_testcase.exe "+test_folder+"/CONFIG_"+mystr) 
    198198            OSinfo("cp iodef.xml "+test_folder+"/CONFIG_"+mystr+"/iodef.xml.tmp") 
     199            OSinfo("cp "+test_folder+"/context_atm.xml "+test_folder+"/CONFIG_"+mystr+"/context_atm.xml.tmp") 
    199200 
    200201            with open(test_folder+"/CONFIG_"+mystr+"/iodef.xml.tmp", "r") as f: 
     
    209210                        g.write(line) 
    210211 
     212            with open(test_folder+"/CONFIG_"+mystr+"/context_atm.xml.tmp", "r") as f: 
     213                lines = f.readlines() 
     214                for i in range(len(lines)): 
     215                    if "XIOS::" in lines[i]: 
     216                        config_keys = list(full_config.keys()) 
     217                        for idx in range(len(config_keys)): 
     218                            lines[i] = lines[i].replace("XIOS::"+config_keys[idx], str(full_config[config_keys[idx]])) 
     219                with open(test_folder+"/CONFIG_"+mystr+"/context_atm.xml", "w") as g: 
     220                    for line in lines: 
     221                        g.write(line) 
     222 
     223 
    211224            OSinfo("rm -f "+test_folder+"/CONFIG_"+mystr+"/iodef.xml.tmp") 
    212             OSinfo("cp "+test_folder+"/context_atm.xml "+test_folder+"/CONFIG_"+mystr+"/") 
     225            OSinfo("rm -f "+test_folder+"/CONFIG_"+mystr+"/context_atm.xml.tmp") 
    213226            OSinfo("cp context_grid_dynamico.xml "+test_folder+"/CONFIG_"+mystr+"/") 
    214227            OSinfo("cp dynamico_grid.nc "+test_folder+"/CONFIG_"+mystr+"/") 
  • XIOS/trunk/xios_test_suite/TEST_SUITE/step2.py

    r1910 r1915  
    4444    for ref in ref_list: 
    4545        if int(svnr) >= ref : 
    46             ref_rev = str(rev) 
     46            ref_rev = str(ref) 
     47            print("corresponding reference = ", ref) 
    4748            break 
    4849         
Note: See TracChangeset for help on using the changeset viewer.