Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #87 ESMF periodicity #90

Merged
merged 7 commits into from Feb 24, 2017
Merged

Fix #87 ESMF periodicity #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37549f1
Fix #87 ESMF periodicity
dnadeau4 Feb 17, 2017
de29e8f
add Test for regriding periodicity
dnadeau4 Feb 17, 2017
f24591d
add UVCDAT URL to retrieve file remotely
dnadeau4 Feb 17, 2017
7d2db2e
tear down Downloaded files
dnadeau4 Feb 17, 2017
97c4ba5
Change array test to string test
dnadeau4 Feb 17, 2017
a374358
Change array to 1d array
dnadeau4 Feb 17, 2017
4f92943
Merge branch 'master' into periodicity
dnadeau4 Feb 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions Lib/avariable.py
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
import selectors
import copy
# from regrid2 import Regridder, PressureRegridder, CrossSectionRegridder
from mvCdmsRegrid import CdmsRegrid
from mvCdmsRegrid import CdmsRegrid, getBoundList, _getCoordList
from regrid2.mvGenericRegrid import guessPeriodicity
#import PropertiedClasses
from convention import CF1
Expand Down Expand Up @@ -1020,8 +1020,9 @@ def regrid (self, togrid, missing=None, order=None, mask=None, **keywords):

if self.getAxis(-1).attributes.has_key('topology'):
if self.getAxis(-1).attributes['topology'] == 'circular':
# for the ESMF regridders
keywords['periodicity'] = guessPeriodicity(self.getAxis(-1).getBounds())
# for the ESMF regridders if periodicity is not set.
if 'periodicity' not in keywords.keys():
keywords['periodicity'] = guessPeriodicity(getBoundList(_getCoordList(self.getGrid())))
keywords['mkCyclic'] = 1 # for LibCF regridder

# check if there are bounds and we have esmf
Expand Down
61 changes: 61 additions & 0 deletions Test/test_regrid_periodicity.py
View file
Open in desktop
@@ -0,0 +1,61 @@
import urllib
import cdms2
import os
import sys
import cdat_info
import basetest
import numpy as np
import basetest

modFile="model_ANN_climo.nc"
obsFile="GPCP_ANN_climo.nc"
class TestRegrid(basetest.CDMSBaseTest):
def setUp(self):
super(TestRegrid, self).setUp()
myurl = "http://uvcdat.llnl.gov/cdat/sample_data/"+obsFile
urllib.urlretrieve(myurl, obsFile)
myurl = "http://uvcdat.llnl.gov/cdat/sample_data/"+modFile
urllib.urlretrieve(myurl, modFile)

def tearDown(self):
super(TestRegrid, self).tearDown()
os.remove(obsFile)
os.remove(modFile)

def testPeriodicity(self):
reference_data_set = obsFile
test_data_set = modFile

f_obs = cdms2.open(reference_data_set)
f_mod = cdms2.open(test_data_set)

obs= f_obs('PRECT')

mod = (f_mod('PRECC') + f_mod('PRECL'))*3600.0*24.0*1000.0
mod.units = 'mm/day'

self.assertEqual([obs.getLongitude()[0],obs.getLongitude()[-1]], [1.25, 358.75])
self.assertEqual([mod.getLongitude()[0],mod.getLongitude()[-1]], [0., 358.59375])

obs_grid = obs.getGrid()

# Regrid model to obs grid using 'linear'
mod_reg = mod.regrid(obs_grid, regridTool='esmf', regridMethod='linear',
periodicity=1)
self.assertEqual(np.array_str(mod_reg[-1,-1,:], precision=2), '[ 0.61 0.61 0.61 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.62\n 0.62 0.62 0.62 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63\n 0.63 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64\n 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64\n 0.64 0.64 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63\n 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.63\n 0.63 0.63 0.63 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.62\n 0.61 0.61 0.61 0.61 0.61 0.61 0.61 0.61 0.61 0.61 0.61 0.61\n 0.61 0.61 0.61 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.6\n 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.59 0.59 0.59\n 0.59 0.59 0.59 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.6\n 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.61 0.61 0.61 0.61 0.61]')
self.assertEqual(np.array_str(mod_reg[0,0,:], precision=2), '[ 0.19 0.19 0.18 0.17 0.18 0.18 0.17 0.17 0.16 0.18 0.17 0.17\n 0.17 0.18 0.17 0.17 0.17 0.17 0.18 0.17 0.17 0.16 0.17 0.17\n 0.17 0.16 0.16 0.17 0.17 0.16 0.16 0.18 0.18 0.18 0.18 0.17\n 0.19 0.18 0.18 0.18 0.19 0.19 0.19 0.19 0.19 0.2 0.2 0.2\n 0.2 0.21 0.21 0.21 0.21 0.21 0.22 0.22 0.22 0.22 0.22 0.23\n 0.23 0.23 0.23 0.24 0.24 0.24 0.24 0.25 0.26 0.29 0.3 0.3\n 0.28 0.29 0.3 0.35 0.32 0.33 0.35 0.36 0.37 0.33 0.34 0.34\n 0.35 0.32 0.32 0.32 0.31 0.3 0.29 0.3 0.31 0.32 0.31 0.32\n 0.33 0.34 0.35 0.31 0.32 0.33 0.34 0.3 0.3 0.29 0.29 0.3\n 0.28 0.28 0.29 0.28 0.26 0.26 0.26 0.26 0.25 0.25 0.25 0.24\n 0.24 0.24 0.23 0.23 0.23 0.22 0.22 0.22 0.21 0.21 0.21 0.21\n 0.21 0.21 0.21 0.2 0.2 0.2 0.2 0.2 0.19 0.19 0.18 0.18]')

self.assertEqual([mod_reg.getLongitude()[0],mod_reg.getLongitude()[-1]],[1.25, 358.75])
# Regrid model to obs grid using 'conservative'
mod_reg = mod.regrid(obs_grid, regridTool='esmf', regridMethod='conservative',
periodicity=1)

self.assertEqual(np.array_str(mod_reg[0,0,:], precision=2),'[ 0.18 0.18 0.17 0.16 0.16 0.16 0.16 0.16 0.16 0.16 0.16 0.16\n 0.15 0.15 0.15 0.15 0.15 0.16 0.16 0.15 0.15 0.15 0.15 0.15\n 0.15 0.15 0.15 0.15 0.14 0.14 0.15 0.15 0.15 0.16 0.16 0.16\n 0.16 0.16 0.16 0.17 0.17 0.17 0.18 0.18 0.18 0.18 0.18 0.18\n 0.19 0.19 0.19 0.19 0.2 0.2 0.2 0.21 0.21 0.21 0.22 0.22\n 0.23 0.24 0.24 0.25 0.25 0.26 0.26 0.27 0.28 0.31 0.36 0.37\n 0.37 0.38 0.43 0.47 0.48 0.48 0.47 0.46 0.45 0.45 0.44 0.45\n 0.45 0.45 0.45 0.44 0.43 0.43 0.43 0.43 0.43 0.43 0.43 0.43\n 0.42 0.39 0.38 0.38 0.39 0.39 0.39 0.39 0.38 0.35 0.32 0.31\n 0.31 0.31 0.3 0.29 0.28 0.28 0.27 0.27 0.27 0.27 0.26 0.26\n 0.25 0.25 0.25 0.24 0.24 0.23 0.23 0.22 0.22 0.22 0.22 0.21\n 0.21 0.2 0.2 0.2 0.2 0.2 0.2 0.19 0.19 0.18 0.18 0.18]')
self.assertEqual(np.array_str(mod_reg[-1,-1,:], precision=2), '[ 0.61 0.61 0.61 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.63\n 0.63 0.63 0.63 0.63 0.63 0.63 0.63 0.64 0.64 0.64 0.64 0.64\n 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.66 0.66 0.66 0.66\n 0.66 0.66 0.66 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65\n 0.65 0.65 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64\n 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.64 0.63 0.63 0.63\n 0.63 0.63 0.63 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.62 0.61\n 0.61 0.61 0.61 0.61 0.61 0.61 0.61 0.61 0.6 0.6 0.6 0.6\n 0.6 0.6 0.6 0.6 0.6 0.6 0.6 0.59 0.59 0.59 0.59 0.59\n 0.59 0.59 0.59 0.58 0.58 0.58 0.58 0.58 0.58 0.58 0.58 0.58\n 0.58 0.58 0.58 0.58 0.58 0.58 0.58 0.58 0.58 0.58 0.58 0.58\n 0.59 0.59 0.59 0.59 0.59 0.59 0.59 0.59 0.6 0.6 0.61 0.61]')

self.assertEqual([mod_reg.getLongitude()[0],mod_reg.getLongitude()[-1]], [1.25, 358.75])


if __name__ == "__main__":
basetest.run()
#
1 change: 0 additions & 1 deletion tests/test_allMIPs.py
View file
Open in desktop
@@ -1,4 +1,3 @@
import pdb
import urllib
import cdms2
import os
Expand Down