Merge pull request #150 from ACME-Climate/cdat8

Cdat8

Author: zshaheen

README.md

@@ -1,8 +1,8 @@
 # E3SM Diagnostics Package
 
-[![Install](https://anaconda.org/acme/acme_diags/badges/installer/conda.svg)](https://anaconda.org/acme/acme_diags)
-[![Downloads](https://anaconda.org/acme/acme_diags/badges/downloads.svg)](https://anaconda.org/acme/acme_diags)
-[![Version](https://anaconda.org/acme/acme_diags/badges/version.svg)](https://anaconda.org/acme/acme_diags)
+[![Install](https://anaconda.org/e3sm/acme_diags/badges/installer/conda.svg)](https://anaconda.org/e3sm/acme_diags)
+[![Downloads](https://anaconda.org/e3sm/acme_diags/badges/downloads.svg)](https://anaconda.org/e3sm/acme_diags)
+[![Version](https://anaconda.org/e3sm/acme_diags/badges/version.svg)](https://anaconda.org/e3sm/acme_diags)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1009157.svg)](https://doi.org/10.5281/zenodo.1009157)
 
 
@@ -55,5 +55,3 @@ In addition to default model versus observation comparison, the package also pro
 
 <img src="misc/example_fig7.png" alt="Figure7" style="width: 280px;"/>
 <h5 align="center">Figure 7: An example of Taylor diagram summarizing metrics calculated based on lat-lon contour plots diagnostics of several key variables</h5>
-
-

acme_diags/acme_parameter.py

@@ -18,7 +18,7 @@ def __init__(self):
         self.seasons = []
         self.regions = ['global']
         self.regrid_tool = 'esmf'
-        self.regrid_method = 'conserve'
+        self.regrid_method = 'conservative'
         self.plevs = []
 
         # Plotting related

acme_diags/driver/lat_lon_driver.py

@@ -272,4 +272,4 @@ def run_diag(parameter):
                     "Dimensions of two variables are difference. Abort")
         f_obs.close()
         f_mod.close()
-    return parameter
+    return parameter

conda/acme_diags_env.yml

@@ -1,165 +1,162 @@
 name: acme_diags_env
 channels:
-  - acme
+  - e3sm
   - anaconda
   - conda-forge
-  - uvcdat
+  - cdat
   - defaults
 dependencies:
-  - acme_diags=1.3.0
-  - asn1crypto=0.22.0
+  - asn1crypto=0.24.0
   - backports=1.0
-  - backports.functools_lru_cache=1.4
+  - backports.functools_lru_cache=1.5
   - backports_abc=0.5
   - beautifulsoup4=4.6.0
-  - bokeh=0.12.9
+  - bokeh=0.12.15
   - bzip2=1.0.6
-  - ca-certificates=2017.7.27.1
-  - cartopy=0.15.1
-  - cdat_info=2.12
-  - cdms2=2.12=np113py27_0
-  - cdtime=2.12=np113py27_2
-  - cdutil=2.12
-  - certifi=2017.7.27.1
-  - cffi=1.10.0
+  - ca-certificates=2018.03.07
+  - cartopy=0.16.0
+  - certifi=2018.1.18
+  - cffi=1.11.5
   - chardet=3.0.4
-  - clapack=3.2.1
   - click=6.7
-  - cloudpickle=0.4.0
-  - cryptography=2.0.3
-  - curl=7.54.1
+  - cloudpickle=0.5.2
+  - cryptography=2.2.2
+  - curl=7.59.0
   - cycler=0.10.0
-  - dask=0.15.4
-  - dask-core=0.15.4
-  - dbus=1.10.22
-  - distarray=2.12.2
-  - distributed=1.19.3
+  - cytoolz=0.9.0.1
+  - dask=0.17.2
+  - dask-core=0.17.2
+  - dbus=1.13.2
+  - distributed=1.21.6
   - enum34=1.1.6
-  - esmf=7.0.0
-  - esmpy=7.0.0
-  - expat=2.2.1
-  - ffmpeg=3.2.4
-  - fontconfig=2.12.1
-  - freetype=2.7
+  - expat=2.2.5
+  - ffmpeg=3.4
+  - fontconfig=2.12.6
+  - freetype=2.8
   - functools32=3.2.3.2
   - future=0.16.0
-  - futures=3.0.5
+  - futures=3.2.0
   - g2clib=1.6.0
-  - genutil=2.12=np113py27_0
-  - geos=3.5.1
-  - gettext=0.19.7
-  - glib=2.53.5
-  - gmp=6.1.2
-  - gst-plugins-base=1.8.0
-  - gstreamer=1.8.0
-  - hdf4=4.2.12
-  - hdf5=1.8.18
+  - geos=3.6.2
+  - glib=2.53.6
+  - gst-plugins-base=1.12.4
+  - gstreamer=1.12.4
+  - hdf4=4.2.13
+  - hdf5=1.10.1
   - heapdict=1.0.0
-  - icu=58.1
+  - icu=58.2
   - idna=2.6
-  - ipaddress=1.0.18
+  - intel-openmp=2018.0.0
+  - ipaddress=1.0.19
   - jasper=1.900.1
-  - jinja2=2.9.6
+  - jinja2=2.10
   - jpeg=9b
-  - krb5=1.14.2
-  - lapack=3.6.1
-  - libcdms=2.12
-  - libcf=1.0.1
-  - libdrs=2.12
-  - libdrs_f=2.12
+  - kiwisolver=1.0.1
+  - libcurl=7.59.0
+  - libedit=3.1
   - libffi=3.2.1
-  - libiconv=1.14
+  - libgcc=7.2.0
+  - libgcc-ng=7.2.0
+  - libgfortran=3.0.0
+  - libgfortran-ng=7.2.0
   - libnetcdf=4.4.1.1
-  - libpng=1.6.28
+  - libopus=1.2.1
+  - libpng=1.6.34
   - libssh2=1.8.0
-  - libtiff=4.0.7
-  - libxcb=1.12
-  - libxml2=2.9.5
-  - libxslt=1.1.29
-  - llvmdev=4.0.0
+  - libstdcxx-ng=7.2.0
+  - libtiff=4.0.9
+  - libvpx=1.6.1
+  - libxcb=1.13
+  - libxml2=2.9.8
+  - libxslt=1.1.32
   - locket=0.2.0
-  - lxml=4.1.0
+  - lxml=4.2.1
   - markupsafe=1.0
-  - matplotlib=2.0.2
-  - mesalib=17.2.0
-  - mpc=1.0.3
-  - mpfr=3.1.5
-  - mpich=3.2
-  - msgpack-python=0.4.8
-  - ncurses=5.9
-  - netcdf-fortran=4.4.4
-  - olefile=0.44
-  - openssl=1.0.2l
-  - ossuuid=1.6.2
-  - owslib=0.15.0
-  - pandas=0.20.3
+  - matplotlib=2.2.2
+  - mkl=2018.0.2
+  - mkl_fft=1.0.1
+  - mkl_random=1.0.1
+  - msgpack-python=0.5.6
+  - ncurses=6.0
+  - numpy=1.14.2
+  - olefile=0.45.1
+  - openssl=1.0.2o
+  - owslib=0.16.0
+  - packaging=17.1
+  - pandas=0.22.0
   - partd=0.3.8
-  - pcre=8.39
-  - pillow=4.3.0
-  - pip=9.0.1
+  - pcre=8.41
+  - pillow=5.0.0
+  - pip=9.0.3
   - proj4=4.9.3
-  - psutil=5.3.1
+  - psutil=5.4.3
   - pthread-stubs=0.3
   - pycparser=2.18
   - pyepsg=0.3.2
-  - pyopenssl=17.2.0
+  - pyopenssl=17.5.0
   - pyparsing=2.2.0
   - pyproj=1.9.5.1
-  - pyqt=5.6.0
+  - pyqt=5.9.2
   - pyshp=1.2.12
-  - pysocks=1.6.7
+  - pysocks=1.6.8
   - python=2.7.14
-  - python-dateutil=2.6.1
-  - pytz=2017.2
+  - python-dateutil=2.7.2
+  - pytz=2018.3
   - pyyaml=3.12
-  - qt=5.6.2
-  - readline=6.2
+  - qt=5.9.4
+  - readline=7.0
   - requests=2.18.4
-  - setuptools=36.6.0
-  - shapely=1.6.1
+  - scipy=1.0.1
+  - setuptools=39.0.1
+  - shapely=1.6.4
   - singledispatch=3.4.0.3
-  - sip=4.18
+  - sip=4.19.8
   - six=1.11.0
-  - sortedcontainers=1.5.7
-  - sqlite=3.13.0
-  - ssl_match_hostname=3.5.0.1
+  - sortedcontainers=1.5.9
+  - sqlite=3.22.0
   - subprocess32=3.2.7
+  - system=5.8
   - tblib=1.3.2
-  - tk=8.5.19
-  - toolz=0.8.2
-  - tornado=4.5.2
-  - udunits2=2.2.23
+  - tk=8.6.7
+  - toolz=0.9.0
+  - tornado=5.0.1
+  - udunits2=2.2.25
   - urllib3=1.22
-  - wheel=0.30.0
-  - x264=20131217
-  - xorg-libxau=1.0.8
-  - xorg-libxdmcp=1.1.2
+  - wheel=0.31.0
   - xz=5.2.3
-  - yaml=0.1.6
+  - yaml=0.1.7
   - zict=0.1.3
-  - zlib=1.2.8
-  - cloog=0.18.0
-  - gcc=4.8.5
-  - isl=0.12.2
-  - libgcc=5.2.0
-  - libgfortran=3.0.0
-  - mkl=2017.0.3
-  - numpy=1.13.1
-  - scipy=0.19.1=np113py27_0
-  - system=5.8
+  - zlib=1.2.11
   - cdp=1.3.0
-  - dv3d=2.12
-  - output_viewer=1.2.2
-  - vcs=2.12
-  - vcsaddons=2.12
-  - vtk-cdat=7.1.0.2.12=py27_mesalibh6bab67e_0
+  - dv3d=8.0
+  - output_viewer=1.2.3
+  - vcs=8.0
+  - vcsaddons=8.0
+  - vtk-cdat=8.0.1.8.0
+  - cdat_info=8.0
+  - cdms2=3.0
+  - cdtime=3.0
+  - cdutil=8.0
+  - clapack=3.2.1
+  - distarray=2.12.2
+  - esmf=7.1.0r
+  - esmpy=7.1.0r
+  - genutil=8.0
+  - lapack=3.6.1
+  - libcdms=3.0
+  - libcf=1.0.1
+  - libdrs=3.0
+  - libdrs_f=3.0
+  - llvm-meta=6.0.0
+  - llvmdev=6.0.0
+  - mesalib=17.2.0
+  - mpi=1.0
+  - mpich=3.2.1
+  - netcdf-fortran=4.4.4
+  - ossuuid=1.6.2
+  - x264=20131217
   - pip:
-    - backports-abc==0.5
-    - backports.functools-lru-cache==1.4
-    - backports.ssl-match-hostname==3.5.0.1
-    - cdat-info==0.0.0
     - mv2==3.0.0
-    - output-viewer==1.2.2
     - regrid2==3.0.0
 prefix: /export/shaheen2/anaconda2/envs/acme_diags_env