Changeset 62293e5 in flexpart.git


Ignore:
Timestamp:
May 11, 2016, 9:29:49 AM (8 years ago)
Author:
Ignacio Pisso <Ignacio.Pisso@…>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug
Children:
0631490
Parents:
e973e0e (diff), 21e8feb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://git.nilu.no/flexpart/flexpart
only modifs to tests and .gitignore

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • tests/NILU/run_test

    r1be76d8 ra5ef7ec  
    66base_dir=$3  # base for the output
    77options_default=$4
     8
     9echo run test '>' input
     10echo $1
     11echo $2
     12echo $3
     13echo $4
     14
     15#  echo name= $name
     16#  echo working dir= $path_tests/test_$name
     17#  echo executable= $FP_exec
     18#  echo default options from $options_default
    819 
    920#echo FP_exec=$FP_exec
    10 echo $FLEXOUT_TMP
     21echo env var FLEXOUT_TMP=$FLEXOUT_TP
    1122
    1223#suffix=$(date "+%y-%m-%d_%H%M%S")
     
    1829mkdir $test_tmp
    1930
    20 echo copy default options $options_default  to temp dir $test_tmp/options
     31echo run test '>' copy default options to temp dir
     32echo from  $options_default  to $test_tmp/options
    2133cp -r $options_default $test_tmp/options
    2234#override default options
    23 echo copy this test option files to temp dir
    24 cp  ${test_dir}/options/* $test_tmp/options/
    25 echo copy SPECIES from ${test_dir}/options/SPECIES/* to $test_tmp/options/SPECIES/
    26 cp  ${test_dir}/options/SPECIES/* $test_tmp/options/SPECIES/
     35echo copy test options files to temp dir
     36echo ${test_dir}/options/* $test_tmp/options/
     37cp   ${test_dir}/options/* $test_tmp/options/
     38echo copy test options/SPECIES to temp dir if needed
     39
     40if [ -d "${test_dir}/options/SPECIES" ]; then
     41echo from ${test_dir}/options/SPECIES/* to $test_tmp/options/SPECIES/
     42cp        ${test_dir}/options/SPECIES/*    $test_tmp/options/SPECIES/
     43fi
     44
    2745# copy paths form repo source exec tmp dir
     46echo copy test pathnames to temp dir
    2847cp ${test_dir}/pathnames $test_tmp
     48echo create output dir ${test_tmp}/output
    2949mkdir ${test_tmp}/output
    3050
     
    3757#echo run $FP_exec   to  out.log #&
    3858#$FP_exec   &> out.log #&
     59echo execute test
    3960$FP_exec > stdout.log 2> stderr.log #&
     61echo flexpart terminated
    4062
    4163
  • tests/NILU/run_tests

    r17bfbe1 ra5ef7ec  
    3737#declare -a test_names=('1' 'HelloWorld' 'Fwd1' 'Fwd2' 'Bwd1' 'Volc' '2')
    3838
    39 #blabla
    4039#Print the Whole Bash Array
    4140s_test_names=${test_names[@]}
     
    4342n_tests=${#test_names[@]}
    4443#echo n_tests=$n_tests
    45 echo run $n_tests  tests:  $s_test_names
    46 
     44echo run $s_test_names
     45echo total $n_tests tests
    4746#test
    4847#tests_dir='tests_15-08-19_113139/'
     
    5756  let j=i+1
    5857  name=${test_names[i]};
    59   echo test no. $j name= $name
    60   echo in $path_tests/test_$name
     58  echo run test no. $j 
     59#  echo name= $name
     60#  echo working dir= $path_tests/test_$name
     61#  echo executable= $FP_exec
     62#  echo default options from $options_default
    6163  ./run_test test_$name  $FP_exec $path_tests $options_default
    62   echo terminated
     64  echo test $name terminated
    6365  success="$(cat $path_tests/test_$name/$outlog  | grep CONGRATULATIONS  | wc -l)"
    6466  echo success=$success
  • .gitignore

    r21e8feb re973e0e  
    44.DS_Store
    55output
     6src/FLEXPART_*
     7fort.*
     8CONVERT2
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG