Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 961F4EE5D for ; Tue, 25 Jun 2013 20:33:55 +0000 (UTC) Received: (qmail 28236 invoked by uid 500); 25 Jun 2013 20:33:55 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 28210 invoked by uid 500); 25 Jun 2013 20:33:55 -0000 Mailing-List: contact commits-help@climate.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.incubator.apache.org Delivered-To: mailing list commits@climate.incubator.apache.org Received: (qmail 28203 invoked by uid 99); 25 Jun 2013 20:33:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 20:33:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 20:33:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2CD002388ACC; Tue, 25 Jun 2013 20:33:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1496632 - /incubator/climate/trunk/rcmet/src/main/python/rcmes/cli/do_rcmes_processing_sub.py Date: Tue, 25 Jun 2013 20:33:35 -0000 To: commits@climate.incubator.apache.org From: joyce@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130625203335.2CD002388ACC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joyce Date: Tue Jun 25 20:33:34 2013 New Revision: 1496632 URL: http://svn.apache.org/r1496632 Log: Resolve CLIMATE-158 - Fix basemap.cm import Modified: incubator/climate/trunk/rcmet/src/main/python/rcmes/cli/do_rcmes_processing_sub.py Modified: incubator/climate/trunk/rcmet/src/main/python/rcmes/cli/do_rcmes_processing_sub.py URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/python/rcmes/cli/do_rcmes_processing_sub.py?rev=1496632&r1=1496631&r2=1496632&view=diff ============================================================================== --- incubator/climate/trunk/rcmet/src/main/python/rcmes/cli/do_rcmes_processing_sub.py (original) +++ incubator/climate/trunk/rcmet/src/main/python/rcmes/cli/do_rcmes_processing_sub.py Tue Jun 25 20:33:34 2013 @@ -27,7 +27,7 @@ import datetime import numpy import numpy.ma as ma import toolkit.plots as plots -import mpl_toolkits.basemap as bm +import mpl_toolkits.basemap.cm as cm import matplotlib.pyplot as plt import storage.db as db import storage.files as files @@ -123,13 +123,13 @@ def do_rcmes(settings, params, model, ma colorbar = None if options['precip'] == True: modelData['data'] = modelData['data']*86400. # convert from kgm-2s-1 into mm/day - colorbar = bm.cm.s3pcpn + colorbar = cm.s3pcpn # set color bar suitable for MODIS cloud data if params['obsParamId'] == 31: colorbar = plt.cm.gist_gray - diffcolorbar = bm.cm.GMT_polar + diffcolorbar = cm.GMT_polar ################################################################################################################## # Extract sub-selection of model data for required time range.