From 81fca4d0f064d8fbaa8616638a54cf9038c472b3 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Tue, 21 Feb 2017 07:14:39 -0800 Subject: [PATCH 1/5] siMonthly was not using time axis calendar to convert to relative time --- Lib/times.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/times.py b/Lib/times.py index fdbc9ba..d5a6bed 100644 --- a/Lib/times.py +++ b/Lib/times.py @@ -135,8 +135,8 @@ def isMonthly(s): units=tim.units monthly=1 for i in range(len(tim)-1): - month1=cdtime.reltime(tim[i],units).torel('months since 2000').value - month2=cdtime.reltime(tim[i+1],units).torel('months since 2000').value + month1=cdtime.reltime(tim[i],units).torel('months since 2000',tim.getCalendar()).value + month2=cdtime.reltime(tim[i+1],units).torel('months since 2000',tim.getCalendar()).value if month2-month1!=1 : monthly=0 return monthly From 63f810c77b1d0562eb97826dc99cce08b112f9c3 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Tue, 21 Feb 2017 07:33:17 -0800 Subject: [PATCH 2/5] tocomp needs get calendar as well --- Lib/times.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/times.py b/Lib/times.py index d5a6bed..b415680 100644 --- a/Lib/times.py +++ b/Lib/times.py @@ -773,7 +773,7 @@ def dayBasedSlicer(tim,arg=None): subarg='feb-29' else: t=cdtime.reltime(index,'month since 1997') - t=t.tocomp() + t=t.tocomp(tim.getCalendar()) subarg=str(t.month)+'-'+str(t.day) except: raise Exception,"Error, dayBasedSlicer args must have '-' or '/' as month/day separator" From 29e7d5a5e2bbfa67f84c80557787ff0e029c14e2 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Wed, 22 Mar 2017 15:58:48 -0700 Subject: [PATCH 3/5] Update times.py --- Lib/times.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/times.py b/Lib/times.py index b415680..c8b3ab4 100644 --- a/Lib/times.py +++ b/Lib/times.py @@ -140,7 +140,6 @@ def isMonthly(s): if month2-month1!=1 : monthly=0 return monthly - def mergeTime(ds,statusbar=1,fill_value=1.e20): ''' Merge chronologically a bunch of slab From d3b01a0a6c315889c8b193c3591957dea81d20a4 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Tue, 2 May 2017 09:49:43 -0700 Subject: [PATCH 4/5] correct test conda env --- scripts/circleci_mac.sh | 2 -- scripts/circleci_mac_dep.sh | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/circleci_mac.sh b/scripts/circleci_mac.sh index 3f2fa44..6b45bf8 100644 --- a/scripts/circleci_mac.sh +++ b/scripts/circleci_mac.sh @@ -1,6 +1,4 @@ export UVCDAT_ANONYMOUS_LOG=False export PATH=${HOME}/miniconda/bin:${PATH} -#export VCS_BACKGROUND=0 # circleci seg faults on bg=1 -#python run_tests.py -v2 -g -H -p # -H and -p for collection by artifacts python run_tests.py --dropbox -v2 diff --git a/scripts/circleci_mac_dep.sh b/scripts/circleci_mac_dep.sh index ed84918..21f9a2b 100644 --- a/scripts/circleci_mac_dep.sh +++ b/scripts/circleci_mac_dep.sh @@ -2,8 +2,7 @@ ls pwd export PATH=${HOME}/miniconda/bin:${PATH} -conda install -c conda-forge -c uvcdat uvcdat pyopenssl nose image-compare +conda install -c uvcdat/label/nightly -c conda-forge -c uvcdat cdms2 genutil pyopenssl nose image-compare pip install dropbox export UVCDAT_ANONYMOUS_LOG=False -vcs_download_sample_data python setup.py install From 226cf4f3510a919c74230c8dec67cd2095fbf36b Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Tue, 2 May 2017 11:05:54 -0700 Subject: [PATCH 5/5] trying test data via https --- share/test_data_files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/test_data_files.txt b/share/test_data_files.txt index 24fc9c9..23e6546 100644 --- a/share/test_data_files.txt +++ b/share/test_data_files.txt @@ -1,4 +1,4 @@ -http://uvcdat.llnl.gov/cdat/sample_data +https://uvcdat.llnl.gov/cdat/sample_data aa51aa896ead44019335cebec68e7955 clt.nc 332feb65b3801d7ab25845976bd23d85 vertical.nc 0f928d5cc8b80e6a509a0a00f0fc87ad tas_mo.nc