Changeset ee5ff31 in flexpart.git

Timestamp:

May 11, 2016, 12:11:11 PM (8 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Children:

8884540

Parents:

260023b (diff), 0631490 (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 master into master_in_yosemite

Files:

• .gitignore (modified) (1 diff)
• tests/NILU/run_test (modified) (3 diffs)
• tests/NILU/run_tests (modified) (3 diffs)
• src/makefile.laptop (added)
• src/par_mod.f90 (modified) (3 diffs)
• src/par_mod.f90-mac (added)

.gitignore

@@ -1 +1 @@
 FP_ecmwf_gfortran*
 *.o
-*_mod.mod
+*.mod
 .DS_Store
 output
+src/FLEXPART_*
+fort.*
+CONVERT2
 FLEXPART_laptop

tests/NILU/run_test

@@ -6 +6 @@
 base_dir=$3  # base for the output
 options_default=$4
+
+echo run test '>' input
+echo $1
+echo $2
+echo $3
+echo $4
+
+#  echo name= $name
+#  echo working dir= $path_tests/test_$name
+#  echo executable= $FP_exec 
+#  echo default options from $options_default 
  
 #echo FP_exec=$FP_exec
-echo $FLEXOUT_TMP
+echo env var FLEXOUT_TMP=$FLEXOUT_TP
 
 #suffix=$(date "+%y-%m-%d_%H%M%S")
@@ -18 +29 @@
 mkdir $test_tmp
 
-echo copy default options $options_default  to temp dir $test_tmp/options
+echo run test '>' copy default options to temp dir
+echo from  $options_default  to $test_tmp/options
 cp -r $options_default $test_tmp/options
 #override default options
-echo copy this test option files to temp dir
-cp  ${test_dir}/options/* $test_tmp/options/
-echo copy SPECIES from ${test_dir}/options/SPECIES/* to $test_tmp/options/SPECIES/
-cp  ${test_dir}/options/SPECIES/* $test_tmp/options/SPECIES/
+echo copy test options files to temp dir
+echo ${test_dir}/options/* $test_tmp/options/
+cp   ${test_dir}/options/* $test_tmp/options/
+echo copy test options/SPECIES to temp dir if needed
+
+if [ -d "${test_dir}/options/SPECIES" ]; then
+echo from ${test_dir}/options/SPECIES/* to $test_tmp/options/SPECIES/
+cp        ${test_dir}/options/SPECIES/*    $test_tmp/options/SPECIES/
+fi
+
 # copy paths form repo source exec tmp dir 
+echo copy test pathnames to temp dir
 cp ${test_dir}/pathnames $test_tmp
+echo create output dir ${test_tmp}/output
 mkdir ${test_tmp}/output
 
@@ -37 +57 @@
 #echo run $FP_exec   to  out.log #&
 #$FP_exec   &> out.log #&
+echo execute test
 $FP_exec > stdout.log 2> stderr.log #&
+echo flexpart terminated
 
 

tests/NILU/run_tests

@@ -37 +37 @@
 #declare -a test_names=('1' 'HelloWorld' 'Fwd1' 'Fwd2' 'Bwd1' 'Volc' '2')
 
-#blabla
 #Print the Whole Bash Array
 s_test_names=${test_names[@]}
@@ -43 +42 @@
 n_tests=${#test_names[@]}
 #echo n_tests=$n_tests
-echo run $n_tests  tests:  $s_test_names
-
+echo run $s_test_names
+echo total $n_tests tests
 #test
 #tests_dir='tests_15-08-19_113139/'
@@ -57 +56 @@
   let j=i+1
   name=${test_names[i]};
-  echo test no. $j name= $name
-  echo in $path_tests/test_$name
+  echo run test no. $j  
+#  echo name= $name
+#  echo working dir= $path_tests/test_$name
+#  echo executable= $FP_exec 
+#  echo default options from $options_default 
   ./run_test test_$name  $FP_exec $path_tests $options_default
-  echo terminated
+  echo test $name terminated
   success="$(cat $path_tests/test_$name/$outlog  | grep CONGRATULATIONS  | wc -l)"
   echo success=$success

src/par_mod.f90

@@ -121 +121 @@
   !*********************************************
   
-  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL XF
+  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF 91 levels
+  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 137 levels
+  !integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 0.5 137 levels
+  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL
+
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=152,nwzmax=152,nzmax=152 !ECMWF new 
-  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=26,nwzmax=26,nzmax=26
   !integer,parameter :: nxmax=721,nymax=361,nuvzmax=64,nwzmax=64,nzmax=64
-  integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138 !ECMWF 0.5
   !integer,parameter :: nxmax=1201,nymax=235,nuvzmax=58,nwzmax=58,nzmax=58
 
@@ -156 +158 @@
   !*********************************************
 
-  !integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
-  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=351 !ECMWF
+  integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
+  !integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=351 !ECMWF
   !integer,parameter :: maxnests=1, nxmaxn=201, nymaxn=161 ! FNL XF
   ! maxnests                maximum number of nested grids
@@ -200 +202 @@
   !**************************************************
 
-  integer,parameter :: maxpart=4000000
-  integer,parameter :: maxspec=6
+  integer,parameter :: maxpart=1000000
+  integer,parameter :: maxspec=1