update param all and trying better travis

.travis.yml

@@ -5,27 +5,22 @@ language: python
  - "2.7"
 
 before_install:
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y gfortran xvfb; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y gfortran ; fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ] && ! [ -d ${HOME}/miniconda] ; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; fi 
- - if [ "$TRAVIS_OS_NAME" = "osx" ] && ! [ -d ${HOME}/miniconda ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
+# - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; fi 
+# - if [ "$TRAVIS_OS_NAME" = "osx" ] && ! [ -d ${HOME}/miniconda ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
  - if [ "$TRAVIS_OS_NAME" = "osx" ] && ! [ -d /usr/local/gfortran ]; then wget https://github.com/UV-CDAT/uvcdat/releases/download/v2.4.1/gfortran-4.9.2-Mac.tar.gz -O ~/gfortran-4.9.2-Mac.tar.gz ; pushd / ; sudo tar xzvf ~/gfortran-4.9.2-Mac.tar.gz ; pushd ; fi
  - export PATH="$HOME/miniconda/bin:$PATH"
- - if [ ! -d ${HOME}/miniconda ]; then bash miniconda.sh -b -p $HOME/miniconda ; conda install --yes --channel uvcdat python=2.7 setuptools cdms2 cdutil genutil unidata cdtime vcs ; fi
+ - if [ ! -d ${HOME}/miniconda ]; then bash miniconda.sh -b -p $HOME/miniconda ; conda install --yes --channel uvcdat/label/nightly -c uvcdat uvcdat-nox  ; fi
  - hash -r
  - conda config --set always_yes yes --set changeps1 no
  - conda update -q conda
- - conda update -q cdms2 cdutil genutil unidata cdtime vcs -c uvcdat
  - conda install openssl=1.0.2d
- - conda update -f -c doutriaux1/label/doutriaux1 -c cdoutrix -c uvcdat --show-channel-urls -q -y vtk
  # Useful for debugging any issues with conda
  - conda info -a
 
 install:
  - python setup.py install
 
-before_script:
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 ; sh -e /etc/init.d/xvfb start ; sleep 3 ; fi
-
 script:
  - python test/test_suite.py # --no-graphics

doc/parameter_files/input_parameter_file_all_options.py

@@ -75,6 +75,23 @@
 # metrics calculations)
 save_mod_clims = True
 
+
+# REGIONAL STUDIES
+# USER CAN CREATE CUSTOM REGIONS
+import cdutil
+regions_specs = {"Nino34":
+ {"value":0.,
+ "domain":cdutil.region.domain(latitude=(-5.,5.,"ccb"), longitude=(190.,240.,"ccb"))},
+ "NAM": { "value":0.,
+ "domain": {'latitude':(0.,45.), 'longitude':(210.,310.)},
+ }
+ }
+# REGIONS ON WHICH WE WANT TO RUN METRICS (var specific)
+# Here we run "all" default regions (glb, NHEX, SHEX, TROP) for both
+# but also ocean and user defined Nino34 and NAME for tas (only)
+regions = {"tas": [None, "ocean","Nino34","NAM"],"tos":None}
+
+
 # DATA LOCATION: MODELS, OBS AND METRICS OUTPUT - AND TEMPLATES FOR MODEL OUTPUT CLIMATOLOGY FILES
 # Following are custom keys specific to your local system
 # it is a python dictionary