Return-Path: X-Original-To: apmail-cmda-commits-archive@minotaur.apache.org Delivered-To: apmail-cmda-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 9BFB818408 for ; Sat, 5 Sep 2015 00:20:41 +0000 (UTC) Received: (qmail 46546 invoked by uid 500); 5 Sep 2015 00:20:41 -0000 Delivered-To: apmail-cmda-commits-archive@cmda.apache.org Received: (qmail 46517 invoked by uid 500); 5 Sep 2015 00:20:41 -0000 Mailing-List: contact commits-help@cmda.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cmda.incubator.apache.org Delivered-To: mailing list commits@cmda.incubator.apache.org Received: (qmail 46508 invoked by uid 99); 5 Sep 2015 00:20:41 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Sep 2015 00:20:41 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 0214CF192B for ; Sat, 5 Sep 2015 00:20:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.782 X-Spam-Level: * X-Spam-Status: No, score=1.782 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id V1oTAYYXxDhm for ; Sat, 5 Sep 2015 00:20:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 5082437F2E for ; Sat, 5 Sep 2015 00:20:08 +0000 (UTC) Received: (qmail 43816 invoked by uid 99); 5 Sep 2015 00:20:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Sep 2015 00:20:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E425FE0435; Sat, 5 Sep 2015 00:20:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xingweicmu@apache.org To: commits@cmda.incubator.apache.org Date: Sat, 05 Sep 2015 00:20:29 -0000 Message-Id: <2352cd87f95149fa80ff60eb7545a38d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/50] [abbrv] incubator-cmda git commit: Merge branch 'master' of https://github.com/cmusv-sc/ApacheCMDA-Frontend Merge branch 'master' of https://github.com/cmusv-sc/ApacheCMDA-Frontend Project: http://git-wip-us.apache.org/repos/asf/incubator-cmda/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cmda/commit/b4a4455c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cmda/tree/b4a4455c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cmda/diff/b4a4455c Branch: refs/heads/master Commit: b4a4455c61a42f441c9e5a71f3c4df7219145063 Parents: d61616a a88e332 Author: cat1021 Authored: Thu Sep 3 17:04:15 2015 -0700 Committer: cat1021 Committed: Thu Sep 3 17:04:15 2015 -0700 ---------------------------------------------------------------------- app/controllers/ClimateServiceController.java | 2 +- ...rencePlotTwoTimeAveragedVariables.scala.html | 1357 ------------------ .../climate/TwoDVariableZonelMean.scala.html | 15 +- ...rencePlotTwoTimeAveragedVariables.scala.html | 1357 ++++++++++++++++++ .../climate/threeDVariableTwoDSlice.scala.html | 15 +- .../climate/threeDVariableZonalMean.scala.html | 15 +- app/views/climate/twoDVariableMap.scala.html | 12 +- .../climate/twoDVariableTimeSeries.scala.html | 26 +- 8 files changed, 1406 insertions(+), 1393 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/b4a4455c/app/views/climate/differencePlotTwoTimeAveragedVariables.scala.html ---------------------------------------------------------------------- diff --cc app/views/climate/differencePlotTwoTimeAveragedVariables.scala.html index 0000000,0a64039..07a327d mode 000000,100644..100644 --- a/app/views/climate/differencePlotTwoTimeAveragedVariables.scala.html +++ b/app/views/climate/differencePlotTwoTimeAveragedVariables.scala.html @@@ -1,0 -1,1357 +1,1357 @@@ + @(parameters: metadata.DiffPlotTwoTimeAveragedVar) @import helper._ + + @scripts = { + + + - + + + + } @main("Parameters of ConfId", scripts){ @flash_message() +

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Service: Difference Plot of Two Time Averaged Variables
+
This service calculates the differences between two + specified variables and displays the lat-lon maps of the two + variables and their differences.
+
+
+
+
data 1
+
+
data 2
+
source:source:
variable name:variable name:
atmosphere pressure level (hPa)
or ocean pressure + level (dbar) +
atmosphere pressure level (hPa)
or ocean pressure + level (dbar) +
start year-month:end year-month:
start lat (deg):end lat (deg):
start lon (deg):end lon (deg):
Execution purpose +
+ +
+
+
Image Here
+
+ }