Merge branch 'master' into Brunner_etal_2020_ESD

README.md

@@ -23,7 +23,7 @@ Key Publications
 
 Brunner, L. et al. (2020): A weighting scheme to constrain global temperature change from CMIP6 accounting for model independence and performance _Earth Syst. Dynam. Diss._ DOI:  <a href="https://doi.org/10.5194/esd-2020-23">10.5194/esd-2020-23</a>
 
-Merrifield, A. L. et al. (2019): A weighting scheme to incorporate large ensembles in multi-model ensemble projections. _Earth Syst. Dynam. Diss._ DOI: <a href="https://doi.org/10.5194/esd-2019-69">10.5194/esd-2019-69</a>
+Merrifield, A. L. et al. (2020): A weighting scheme to incorporate large ensembles in multi-model ensemble projections. _Earth Syst. Dynam._, 11, 807-834, DOI: <a href="https://doi.org/10.5194/esd-11-807-2020">10.5194/esd-11-807-2020</a>
 
 Brunner, L. et al. (2019): Quantifying uncertainty in European climate projections using combined performance-independence weighting. _Eniron. Res. Lett._ DOI: <a href="https://doi.org/10.1088/1748-9326/ab492f">10.1088/1748-9326/ab492f</a>
 

environment.yml

@@ -1,18 +1,20 @@
-name: ClimWIP
+name: /net/h2o/climphys/lukbrunn/Data/Conda/ClimWIP
 channels:
   - conda-forge
   - defaults
 dependencies:
-  - _libgcc_mutex=0.1=main
+  - _libgcc_mutex=0.1=conda_forge
+  - _openmp_mutex=4.5=1_gnu
   - asn1crypto=0.24.0=py37_1003
   - attrs=19.1.0=py_0
+  - backcall=0.1.0=py_0
   - boost-cpp=1.70.0=ha2d47e9_0
   - bzip2=1.0.6=h14c3975_1002
-  - ca-certificates=2019.6.16=hecc5488_0
+  - ca-certificates=2020.6.20=hecda079_0
   - cairo=1.16.0=h18b612c_1001
   - cartopy=0.17.0=py37h0aa2c8f_1004
   - cdo=1.9.6=hd104f1c_1006
-  - certifi=2019.6.16=py37_0
+  - certifi=2020.6.20=py37hc8dfbb8_0
   - cffi=1.12.3=py37h8022711_0
   - cfitsio=3.430=h0bd2449_1002
   - cftime=1.0.3.4=py37hd352d35_1001
@@ -24,6 +26,7 @@ dependencies:
   - curl=7.64.1=hf8cf82a_0
   - cycler=0.10.0=py_1
   - dbus=1.13.6=he372182_0
+  - decorator=4.4.0=py_0
   - deprecated=1.2.5=py_0
   - descartes=1.1.0=py_3
   - eccodes=2.12.3=h1ba12e4_2
@@ -46,7 +49,11 @@ dependencies:
   - hdf5=1.10.5=nompi_h3c11f04_1100
   - icu=58.2=hf484d3e_1000
   - idna=2.8=py37_1000
+  - ipdb=0.12.2=py_0
+  - ipython=7.8.0=py37h5ca1d4c_0
+  - ipython_genutils=0.2.0=py_1
   - jasper=1.900.1=h07fcdf6_1006
+  - jedi=0.15.1=py37_0
   - joblib=0.13.2=py_0
   - jpeg=9c=h14c3975_1001
   - json-c=0.13.1=h14c3975_1001
@@ -60,9 +67,10 @@ dependencies:
   - libdap4=3.19.1=hd48c02d_1000
   - libedit=3.1.20170329=hf8c457e_1001
   - libffi=3.2.1=he1b5a44_1006
-  - libgcc-ng=9.1.0=hdf63c60_0
+  - libgcc-ng=9.3.0=h24d8f2e_16
   - libgdal=2.4.1=h677e3de_5
-  - libgfortran-ng=7.3.0=hdf63c60_0
+  - libgfortran-ng=7.5.0=hdf63c60_16
+  - libgomp=9.3.0=h24d8f2e_16
   - libiconv=1.15=h516909a_1005
   - libkml=1.3.0=h4fcabce_1010
   - liblapack=3.8.0=7_openblas
@@ -72,7 +80,7 @@ dependencies:
   - libspatialindex=1.9.0=he1b5a44_1
   - libspatialite=4.3.0a=hb5ec416_1026
   - libssh2=1.8.2=h22169c7_2
-  - libstdcxx-ng=9.1.0=hdf63c60_0
+  - libstdcxx-ng=9.3.0=hdf63c60_16
   - libtiff=4.0.10=h57b8799_1003
   - libuuid=2.32.1=h14c3975_1000
   - libxcb=1.13=h14c3975_1002
@@ -82,27 +90,35 @@ dependencies:
   - matplotlib=3.1.0=py37_1
   - matplotlib-base=3.1.0=py37hfd891ef_1
   - munch=2.3.2=py_0
+  - natsort=7.0.1=py_0
   - ncurses=6.1=hf484d3e_1002
   - netcdf4=1.5.1.2=py37h73a1b54_1
-  - numpy=1.16.4=py37h95a1406_0
+  - numpy=1.19.1=py37h7ea13bd_2
   - olefile=0.46=py_0
   - openblas=0.3.5=h9ac9557_1001
   - openjpeg=2.3.1=h58a6597_0
-  - openssl=1.1.1b=h14c3975_1
+  - openssl=1.1.1h=h516909a_0
   - ossuuid=1.6.2=hf484d3e_1000
   - owslib=0.18.0=py_0
-  - pandas=0.24.2=py37hb3f55d8_0
+  - pandas=1.0.5=py37h0da4684_0
+  - parso=0.5.1=py_0
+  - patsy=0.5.1=py_0
   - pcre=8.41=hf484d3e_1003
+  - pexpect=4.7.0=py37_0
+  - pickleshare=0.7.5=py37_1000
   - pillow=6.0.0=py37he7afcd5_0
   - pip=19.1.1=py37_0
   - pixman=0.38.0=h516909a_1003
   - poppler=0.67.0=h2ad7f00_6
   - poppler-data=0.4.9=1
   - postgresql=11.3=hbeee2d4_0
   - proj4=5.2.0=he1b5a44_1003
+  - prompt_toolkit=2.0.9=py_0
   - pthread-stubs=0.4=h14c3975_1001
+  - ptyprocess=0.6.0=py_1001
   - pycparser=2.19=py37_1
   - pyepsg=0.4.0=py_0
+  - pygments=2.4.2=py_0
   - pykdtree=1.3.1=py37h3010b51_1002
   - pyopenssl=19.0.0=py37_0
   - pyparsing=2.4.0=py_0
@@ -113,6 +129,7 @@ dependencies:
   - python=3.7.3=h5b0a415_0
   - python-cdo=1.5.3=py_0
   - python-dateutil=2.8.0=py_0
+  - python_abi=3.7=1_cp37m
   - pytz=2019.1=py_0
   - qt=5.9.7=h52cfd70_2
   - readline=7.0=hf8c457e_1001
@@ -126,14 +143,17 @@ dependencies:
   - sip=4.19.8=py37hf484d3e_1000
   - six=1.12.0=py37_1000
   - sqlite=3.28.0=h8b20d00_0
+  - statsmodels=0.10.1=py37hc1659b7_0
   - tk=8.6.9=hed695b0_1002
   - tornado=6.0.3=py37h516909a_0
+  - traitlets=4.3.2=py37_1000
   - tzcode=2019a=h516909a_1002
   - udunits2=2.2.27.6=h4e0c4b3_1001
   - urllib3=1.24.3=py37_0
+  - wcwidth=0.1.7=py_1
   - wheel=0.33.4=py37_0
   - wrapt=1.11.2=py37h516909a_0
-  - xarray=0.12.2=py_0
+  - xarray=0.16.1=py_0
   - xerces-c=3.2.2=hac72e42_1001
   - xorg-kbproto=1.0.7=h14c3975_1002
   - xorg-libice=1.0.9=h516909a_1004
@@ -149,3 +169,6 @@ dependencies:
   - xz=5.2.4=h14c3975_1001
   - zlib=1.2.11=h14c3975_1004
   - zstd=1.4.0=h3b9ef0a_0
+  - pip:
+    - salem==0.2.4
+prefix: /net/h2o/climphys/lukbrunn/Data/Conda/ClimWIP