Merge branch 'feature_ensemble_app' into development

dtcenter · Jul 7, 2023 · b8bd451 · b8bd451
2 parents 434770a + b77a7fb
commit b8bd451
Show file tree

Hide file tree

Showing 77 changed files with 281 additions and 275 deletions.
diff --git a/MATScommon b/MATScommon
diff --git a/apps/met-airquality/server/dataFunctions/data_dieoff.js b/apps/met-airquality/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-airquality/server/main.js b/apps/met-airquality/server/main.js
@@ -2177,7 +2177,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/apps/met-anomalycor/server/dataFunctions/data_dieoff.js b/apps/met-anomalycor/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-anomalycor/server/main.js b/apps/met-anomalycor/server/main.js
@@ -2042,7 +2042,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/apps/met-cyclone/server/dataFunctions/data_dieoff.js b/apps/met-cyclone/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-cyclone/server/main.js b/apps/met-cyclone/server/main.js
@@ -541,6 +541,12 @@ const doCurveParams = function () {
     HAFS: "HAFS: Hurricane Analysis and Forecast System",
     HAFI: "HAFI: Hurricane Analysis and Forecast System",
     HAF2: "HAF2: Hurricane Analysis and Forecast System",
+    HFSA: "HFSA: Hurricane Analysis and Forecast System - A",
+    HFAI: "HFAI: Hurricane Analysis and Forecast System - A",
+    HFA2: "HFA2: Hurricane Analysis and Forecast System - A",
+    HFSB: "HFSB: Hurricane Analysis and Forecast System - B",
+    HFBI: "HFBI: Hurricane Analysis and Forecast System - B",
+    HFB2: "HFB2: Hurricane Analysis and Forecast System - B",
     HAMN: "HAMN: HAFS Ensemble Mean",
     HAMI: "HAMI: HAFS Ensemble Mean",
     HAM2: "HAM2: HAFS Ensemble Mean",
@@ -2260,7 +2266,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/apps/met-ensemble/server/dataFunctions/data_dieoff.js b/apps/met-ensemble/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-ensemble/server/main.js b/apps/met-ensemble/server/main.js
@@ -1746,7 +1746,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/apps/met-object/server/dataFunctions/data_dieoff.js b/apps/met-object/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-object/server/main.js b/apps/met-object/server/main.js
@@ -1910,7 +1910,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/apps/met-precip/server/dataFunctions/data_dieoff.js b/apps/met-precip/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-precip/server/main.js b/apps/met-precip/server/main.js
@@ -2172,7 +2172,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/apps/met-surface/server/dataFunctions/data_dieoff.js b/apps/met-surface/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-surface/server/main.js b/apps/met-surface/server/main.js
@@ -2031,7 +2031,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/apps/met-upperair/server/dataFunctions/data_dieoff.js b/apps/met-upperair/server/dataFunctions/data_dieoff.js
@@ -13,7 +13,7 @@ import {
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
-dataDieOff = function (plotParams, plotFunction) {
+dataDieoff = function (plotParams, plotFunction) {
   // initialize variables common to all curves
   const appParams = {
     plotType: matsTypes.PlotTypes.dieoff,

diff --git a/apps/met-upperair/server/main.js b/apps/met-upperair/server/main.js
@@ -2074,7 +2074,7 @@ const doPlotGraph = function () {
     matsCollections.PlotGraphFunctions.insert({
       plotType: matsTypes.PlotTypes.dieoff,
       graphFunction: "graphPlotly",
-      dataFunction: "dataDieOff",
+      dataFunction: "dataDieoff",
       checked: false,
     });
     matsCollections.PlotGraphFunctions.insert({

diff --git a/docs/Users_Guide/apps.rst b/docs/Users_Guide/apps.rst
@@ -67,7 +67,7 @@ and the mean value of the selected parameter on the x-axis.
 
 **Die-off**: Die-off plots show how skill (or the inverse, error)
 changes with increasing lead time.  :numref:`apps_interface_dieoff` shows the user
-interface page after selecting the plot type of DieOff.  Note that
+interface page after selecting the plot type of Dieoff.  Note that
 another selector is included for DIEOFF TYPE, which has the following
 possible values:
 
@@ -81,9 +81,9 @@ possible values:
 
 .. figure:: figure/apps_interface_dieoff.png
 
-        User Interface screen after selecting plot type of DieOff.
+        User Interface screen after selecting plot type of Dieoff.
 
-:numref:`apps_upper_air_dieoff_plot` shows a sample of a DieOff plot in METexpress.
+:numref:`apps_upper_air_dieoff_plot` shows a sample of a Dieoff plot in METexpress.
 This looks more
 like a familiar die-off curve when plotting skill, such as anomaly
 correlation as plotted in :numref:`apps_anom_corr_dieoff_plot` using the Anomaly Correlation
@@ -100,13 +100,13 @@ the specified date range.
 
 .. figure:: figure/apps_upper_air_dieoff_plot.png
 
-        Upper Air DieOff plot
+        Upper Air Dieoff plot
 
 .. _apps_anom_corr_dieoff_plot:
 
 .. figure:: figure/apps_anom_corr_dieoff_plot.png
 
-        Anomaly Correlation DieOff plot
+        Anomaly Correlation Dieoff plot
 
 **ValidTime**: The ValidTime plot type (also sometimes known as diurnal
 cycle plots) displays valid UTC hour on the x–axis and the mean value of
@@ -236,7 +236,7 @@ Plot types available include
 
 * Time Series
 * Profile
-* DieOff
+* Dieoff
 * ValidTime
 * Histogram
 * Contour
@@ -316,12 +316,12 @@ The selector for the Statistic has these possible choices (depending on availabl
 Plot types available include:
 
 * Time Series
-* DieOff
+* Dieoff
 * ValidTime
 * Histogram
 * Contour
 
-Plots in the Surface app for Time Series, DieOff, ValidTime, Histogram, and
+Plots in the Surface app for Time Series, Dieoff, ValidTime, Histogram, and
 Contour are the same as in Upper Air. An example of a Valid Time plot
 is shown in :numref:`apps_surface_plot`.
 
@@ -381,13 +381,13 @@ The selector for the Statistic has these possible choices (depending on availabl
 Plot types available include 
 
 * Time Series
-* DieOff
+* Dieoff
 * Threshold
 * ValidTime
 * Histogram
 * Contour
 
-Plots in the Air Quality app for Time Series, DieOff, ValidTime,
+Plots in the Air Quality app for Time Series, Dieoff, ValidTime,
 Histogram, and Contour are the same as in Upper Air. 
 
 An additional plot type, Threshold, is available in this app.
@@ -446,15 +446,15 @@ The selector for the Statistic has these possible choices (depending on availabl
 Plot types available include 
 
 * Time Series
-* DieOff
+* Dieoff
 * ValidTime
 * Histogram
 * Ensemble Histogram
 * Reliability
 * ROC
 * Performance Diagram
 
-Plots in the Ensemble app for Time Series, DieOff, ValidTime, and
+Plots in the Ensemble app for Time Series, Dieoff, ValidTime, and
 Histogram are the same as in Upper Air. 
 
 Four plot types are specific to this app: Ensemble Histogram,
@@ -602,14 +602,14 @@ The selector for the Statistic has these possible choices (depending on availabl
 Plot types available include 
 
 * Time Series
-* DieOff
+* Dieoff
 * Threshold
 * ValidTime
 * GridScale
 * Histogram
 * Contour
 
-Plots in the Precipitation app for Time Series, DieOff,
+Plots in the Precipitation app for Time Series, Dieoff,
 ValidTime, Histogram, and Contour are the same as in Upper Air. 
 
 A different plot type, Threshold, is present in this app. Threshold
@@ -707,12 +707,12 @@ The selector for the Statistic has these possible choices (depending on availabl
 Plot types available include
 
 * Time Series
-* DieOff
+* Dieoff
 * ValidTime
 * YearToYear
 * Histogram
 
-Plots in the Cyclone app for Time Series, DieOff,
+Plots in the Cyclone app for Time Series, Dieoff,
 ValidTime, and Histogram are the same as in Upper Air.
 
 A different plot type, YearToYear, is present in this app. YearToYear
@@ -836,11 +836,11 @@ The selector for the Statistic has these possible choices (depending on availabl
 Plot types available include
 
 * Time Series
-* DieOff
+* Dieoff
 * Threshold
 * ValidTime
 
-Plots in the Objects app for Time Series, DieOff,
+Plots in the Objects app for Time Series, Dieoff,
 and ValidTime are the same as in Precipitation.
 
 :numref:`apps_interface_objects` shows an example of the user interface for the

diff --git a/docs/Users_Guide/interface.rst b/docs/Users_Guide/interface.rst
@@ -75,7 +75,7 @@ __________
 
 Immediately below the name of the app is a bar that allows selection of the
 plot type.  Available types for Upper Air include Time Series, Profile,
-DieOff, ValidTime, Histogram, and Contour.  Other apps include some plot
+Dieoff, ValidTime, Histogram, and Contour.  Other apps include some plot
 types specific to that application domain, such as Reliability plots in the
 Ensemble app or GridScale plots in the Precipitation app.  The section for each
 app below will describe the available plot types for that app.

diff --git a/tests/src/features/met-airquality/basic/addRemoveCurve.feature b/tests/src/features/met-airquality/basic/addRemoveCurve.feature
@@ -29,7 +29,7 @@ Feature: Add Remove Curve
 
         When I click the "Plot Unmatched" button
         Then I should be on the graph page
-        And I should have a "TimeSeries" plot
+        And I should have a "Time Series" plot
 
         When I click the "Back" button
         Then I should be on the main page

diff --git a/tests/src/features/met-airquality/basic/addRemoveDieOffCurve.feature b/tests/src/features/met-airquality/basic/addRemoveDieOffCurve.feature
@@ -1,4 +1,4 @@
-Feature: Add Remove DieOff Curve
+Feature: Add Remove Dieoff Curve
 
     As an unauthenticated user to the app,
     with the app in its default state,
@@ -14,9 +14,9 @@ Feature: Add Remove DieOff Curve
         Then I expect the app title to be "MET Air Quality"
 
     @watch
-    Scenario: addRemoveDieOffCurve
-        When I set the plot type to "DieOff"
-        Then the plot type should be "DieOff"
+    Scenario: addRemoveDieoffCurve
+        When I set the plot type to "Dieoff"
+        Then the plot type should be "Dieoff"
         When I change the "group" parameter to "Test12"
         Then the "group" parameter value matches "Test12"
         When I change the "database" parameter to "mv_cmaq_g2o"
@@ -31,7 +31,7 @@ Feature: Add Remove DieOff Curve
 
         When I click the "Plot Unmatched" button
         Then I should be on the graph page
-        And I should have a "DieOff" plot
+        And I should have a "Dieoff" plot
 
         When I click the "Back" button
         Then I should be on the main page

diff --git a/tests/src/features/met-airquality/basic/addRemoveValidTimeCurve.feature b/tests/src/features/met-airquality/basic/addRemoveValidTimeCurve.feature
@@ -30,7 +30,7 @@ Feature: Add Remove Valid Time Curve
 
         When I click the "Plot Unmatched" button
         Then I should be on the graph page
-        And I should have a "ValidTime" plot
+        And I should have a "Valid Time" plot
 
         When I click the "Back" button
         Then I should be on the main page