Skip to content

Commit

Permalink
merge PCMDI/master
Browse files Browse the repository at this point in the history
  • Loading branch information
durack1 committed Dec 8, 2016
2 parents 9e4c191 + 7f94a08 commit 75ad09c
Show file tree
Hide file tree
Showing 156 changed files with 74,180 additions and 87,858 deletions.
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
*.pyc
build
*.pyo
*~
*swp*
*.o
test_portrait
PCMDI_METRICS
obs_info_dictionary.json
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export UVCDAT_FEATURE="-nox"; 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
- export PATH="$HOME/miniconda/bin:$PATH"
- if [ ! -d ${HOME}/miniconda ]; then bash miniconda.sh -b -p $HOME/miniconda ; conda install --yes --channel uvcdat/label/nightly -c uvcdat uvcdat${UVCDAT_FEATURE} hdf5==1.8.16 ; fi
- if [ ! -d ${HOME}/miniconda ]; then bash miniconda.sh -b -p $HOME/miniconda ; conda install --show-channel-urls --yes -c conda-forge -c uvcdat cdp uvcdat${UVCDAT_FEATURE} flake8 ; fi
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda install openssl=1.0.2d
# - conda install openssl=1.0.2d
# Useful for debugging any issues with conda
- conda info -a

install:
- python setup.py install

script:
- export HDF5_DISABLE_VERSION_CHECK=1
- python test/test_suite.py # --no-graphics
- export HDF5_DISABLE_VERSION_CHECK=1
- python test/test_suite.py # --no-graphics

after_success:
- test $TRAVIS_BRANCH = "master" && conda install conda-build && conda install anaconda-client && bash conda-recipes/pcmdi_metrics/conda_upload.sh
7 changes: 0 additions & 7 deletions cmake_check_version.cmake

This file was deleted.

11 changes: 11 additions & 0 deletions conda-recipes/pcmdi_metrics/conda_upload.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
PKG_NAME=pcmdi_metrics
USER=PCMDI
OS=linux-64

mkdir ~/conda-bld
conda config --set anaconda_upload no
export CONDA_BLD_PATH=~/conda-bld
export VERSION=`date +%Y.%m.%d`
conda build .
anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-0.tar.bz2 --force

24 changes: 13 additions & 11 deletions conda-recipes/pcmdi_metrics/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
package:
name: pcmdi_metrics
version: 1.1
version: {{ environ['VERSION'] }}

source:
git_rev: 1.1
git_url: git:https://github.com/PCMDI/pcmdi_metrics

build:
string: PMP
script: python setup.py install

number: 0
script: python setup.py install
script_env:
- VERSION
- CONDA_BLD_PATH


requirements:
build:
- python
- setuptools
- numpy <=1.9.2
- numpy
run:
- vcs >=2.6
- vcsaddons
- cdms2 >=2.6
- cdms2 >2.6
- genutil
- cdutil
- unidata

- cdp
- matplotlib
- numpy

about:
home: http:https://gitub.com/PCMDI/pcmdi_metrics
summary: The PCMDI metrics package is used to objectively compare results from climate models with observations using well-established statistical tests. Results are produced in the context of all model simulations contributed to CMIP5 and earlier CMIP phases. Among other purposes, this enables modeling groups to evaluate changes during the development cycle in the context of the structural error distribution of the multi-model ensemble. Currently, the comparisons are focused on large- to global-scale annual cycle performance metrics.



32 changes: 32 additions & 0 deletions conda-recipes/pcmdi_metrics/meta.yaml.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package:
name: pcmdi_metrics
version: @VERSION@

source:
git_rev: @UVCDAT_BRANCH@
git_url: git:https://github.com/PCMDI/pcmdi_metrics

build:
number: 0
script: python setup.py install

requirements:
build:
- python
- setuptools
- numpy
run:
- vcs >=2.6
- vcsaddons
- cdms2 >2.6
- genutil
- cdutil
- unidata
- cdp
- matplotlib
- numpy


about:
home: http:https://gitub.com/PCMDI/pcmdi_metrics
summary: The PCMDI metrics package is used to objectively compare results from climate models with observations using well-established statistical tests. Results are produced in the context of all model simulations contributed to CMIP5 and earlier CMIP phases. Among other purposes, this enables modeling groups to evaluate changes during the development cycle in the context of the structural error distribution of the multi-model ensemble. Currently, the comparisons are focused on large- to global-scale annual cycle performance metrics.
137 changes: 120 additions & 17 deletions doc/obs_info_dictionary.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@
"rltcre": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "07cb1fbed2fdc51ffafc689b35ac05ce",
"MD5sum": "e736a924ce2a9e6097f9a1ff652176bf",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:44 2016",
"RefTrackingDate": "Wed Aug 31 17:45:45 2016",
"filename": "rltcre_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
Expand All @@ -160,7 +160,7 @@
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "146eec5e8a734fedbbdd0909921530f2",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:44 2016",
"RefTrackingDate": "Wed Aug 31 17:45:45 2016",
"filename": "rlut_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
Expand All @@ -172,7 +172,7 @@
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "7e77061fb5d5399ecad4360779ceb63f",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:44 2016",
"RefTrackingDate": "Wed Aug 31 17:45:45 2016",
"filename": "rlutcs_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
Expand Down Expand Up @@ -206,9 +206,9 @@
"rsdt": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "033c05ea6447ec2b3be88016014ac2ef",
"MD5sum": "665d830b08f3c3dadc5301aa31682ea9",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 14:32:40 2016",
"RefTrackingDate": "Wed Aug 31 17:45:46 2016",
"filename": "rsdt_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
Expand All @@ -218,9 +218,9 @@
"rst": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "45ee2704bd9013c4f6589cbcccb4f893",
"MD5sum": "059c7011a52b8c07e6ab5a46f34886ea",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:44 2016",
"RefTrackingDate": "Wed Aug 31 17:45:47 2016",
"filename": "rst_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
Expand All @@ -230,9 +230,9 @@
"rstcre": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "43ae9b34119b1d885a53e087720c1a72",
"MD5sum": "eaf13953bf323ca0aef058028f4c1a9c",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:43 2016",
"RefTrackingDate": "Wed Aug 31 17:45:44 2016",
"filename": "rstcre_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
Expand All @@ -250,35 +250,48 @@
"shape": "(12, 180, 360)"
}
},
"rsut": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "3080d9897550062409994abe4e7067fd",
"RefName": "CERES",
"RefTrackingDate": "Wed Aug 31 17:45:45 2016",
"filename": "rsut_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
},
"default": "CERES"
},
"rsutcs": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "e77f527db0bf303ec35e4df7e2c662fb",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:45 2016",
"RefTrackingDate": "Wed Aug 31 17:45:46 2016",
"filename": "rsutcs_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
},
"default": "CERES"
},
"rtnet": {
"rt": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "b3b28ee6496fe87a79dad308fc935f78",
"MD5sum": "4f816a24e38db99f26835c4c97b7e0b3",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:44 2016",
"filename": "rtnet_CERES_000001-000012_ac.nc",
"RefTrackingDate": "Wed Aug 31 17:45:45 2016",
"filename": "rt_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
}
},
"default": "CERES"
},
"rtnetcre": {
"CERES": {
"CMIP_CMOR_TABLE": "CERES",
"MD5sum": "d9d8973d589548124049d527331d5799",
"RefName": "CERES",
"RefTrackingDate": "Wed Jun 1 16:30:43 2016",
"RefTrackingDate": "Wed Aug 31 17:45:44 2016",
"filename": "rtnetcre_CERES_000001-000012_ac.nc",
"period": "",
"shape": "(12, 180, 360)"
Expand Down Expand Up @@ -309,6 +322,36 @@
"shape": "(180, 360)"
}
},
"sos": {
"JPL-Aquarius-v2": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "648c3f92abe91223ac24645cac653e6f",
"RefName": "JPL-Aquarius-v2",
"RefTrackingDate": "Wed Jan 15 10:29:05 2014",
"filename": "sos_pcmdi-metrics_Omon_JPL-Aquarius-v2_201108-201304-clim.nc",
"period": "JPL-Aquarius-v2",
"shape": "(12, 180, 360)"
},
"NODC-WOA09": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "c645c6382f41af91019470e9c0bfc3a6",
"RefName": "NODC-WOA09",
"RefTrackingDate": "Wed Jan 15 10:33:04 2014",
"filename": "sos_pcmdi-metrics_Omon_NODC-WOA09_177201-200812-clim.nc",
"period": "NODC-WOA09",
"shape": "(12, 180, 360)"
},
"UCSD-ARGO": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "1fb5933f16a4644bd429ab0d618f06f0",
"RefName": "UCSD-ARGO",
"RefTrackingDate": "Wed Jan 15 10:48:30 2014",
"filename": "sos_pcmdi-metrics_Omon_UCSD-ARGO_200401-201212-clim.nc",
"period": "UCSD-ARGO",
"shape": "(12, 260, 720)"
},
"default": "NODC-WOA09"
},
"ta": {
"ERA40": {
"CMIP_CMOR_TABLE": "ERA40",
Expand Down Expand Up @@ -397,6 +440,54 @@
},
"default": "ERAINT"
},
"tos": {
"NOAA-OISST-v2": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "4995e86ecbe771751fcf542c96c84162",
"RefName": "NOAA-OISST-v2",
"RefTrackingDate": "Wed Jan 15 10:51:51 2014",
"filename": "tos_pcmdi-metrics_Omon_NOAA-OISST-v2_198202-201201-clim.nc",
"period": "NOAA-OISST-v2",
"shape": "(12, 180, 360)"
},
"NODC-WOA09": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "49a00ee3298d266f9234517d5c1c75d1",
"RefName": "NODC-WOA09",
"RefTrackingDate": "Wed Jan 15 10:53:00 2014",
"filename": "tos_pcmdi-metrics_Omon_NODC-WOA09_177201-200812-clim.nc",
"period": "NODC-WOA09",
"shape": "(12, 180, 360)"
},
"REMSS-AMSRE-L3-v7": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "b849e0e2a90ba9424252639c3446b9b4",
"RefName": "REMSS-AMSRE-L3-v7",
"RefTrackingDate": "Wed Jan 15 10:54:18 2014",
"filename": "tos_pcmdi-metrics_Omon_REMSS-AMSRE-L3-v7_200301-201012-clim.nc",
"period": "REMSS-AMSRE-L3-v7",
"shape": "(12, 180, 360)"
},
"UCSD-ARGO": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "a7b0e7fa23e56e915f0ba527427d2f07",
"RefName": "UCSD-ARGO",
"RefTrackingDate": "Wed Jan 15 10:55:42 2014",
"filename": "tos_pcmdi-metrics_Omon_UCSD-ARGO_200401-201212-clim.nc",
"period": "UCSD-ARGO",
"shape": "(12, 260, 720)"
},
"UKMETOFFICE-HadISST-v1-1": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "41833b403cad7052773dd933d1798a14",
"RefName": "UKMETOFFICE-HadISST-v1-1",
"RefTrackingDate": "Wed Jan 15 10:57:20 2014",
"filename": "tos_pcmdi-metrics_Omon_UKMETOFFICE-HadISST-v1-1_198002-200501-clim.nc",
"period": "UKMETOFFICE-HadISST-v1-1",
"shape": "(12, 180, 360)"
},
"default": "UKMETOFFICE-HadISST-v1-1"
},
"ts": {
"ERAINT": {
"CMIP_CMOR_TABLE": "ERAINT",
Expand Down Expand Up @@ -567,5 +658,17 @@
"alternate1": "ERA40",
"alternate2": "JRA25",
"default": "ERAINT"
},
"zos": {
"CNES-AVISO-L4": {
"CMIP_CMOR_TABLE": "pcmdi-metrics",
"MD5sum": "8835a061bb2ab4b154555f98d022b67b",
"RefName": "CNES-AVISO-L4",
"RefTrackingDate": "Wed Jan 15 11:01:14 2014",
"filename": "zos_pcmdi-metrics_Omon_CNES-AVISO-L4_199301-201012-clim.nc",
"period": "CNES-AVISO-L4",
"shape": "(12, 180, 360)"
},
"default": "CNES-AVISO-L4"
}
}

0 comments on commit 75ad09c

Please sign in to comment.