Dieoff station plots fully work

NOAA-GSL · Nov 30, 2023 · beecdda · beecdda
1 parent c4aa691
commit beecdda
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/MATScommon b/MATScommon
diff --git a/METexpress b/METexpress
diff --git a/apps/cb-metar/server/dataFunctions/data_dieoff.js b/apps/cb-metar/server/dataFunctions/data_dieoff.js
@@ -214,7 +214,8 @@ dataDieoff = function (plotParams, plotFunction) {
           statement = "Station plot -- no one query.";
           const tss = new matsMiddleDieoff.MatsMiddleDieoff(cbPool);
           rows = tss.processStationQuery(
-            queryVariable,
+            statType,
+            variableDetails[0],
             sitesList,
             model,
             null,

diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff.sql b/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff.sql
@@ -11,7 +11,7 @@ WHERE m0.type = 'DD'
     AND m0.version = 'V01'
     AND m0.model = '{{vxMODEL}}'
     AND m0.region = '{{vxREGION}}'
-    AND m0.fcstLen IN [0,3,6,9,12,15,18,21,24,30,36,42,48]
+    AND (m0.fcstLen % 3) = 0
     AND m0.fcstValidEpoch %(24 * 3600) / 3600 IN [{{vxVALID_TIMES}}]
     AND m0.fcstValidEpoch >= {{vxFROM_SECS}}
     AND m0.fcstValidEpoch <= {{vxTO_SECS}}

diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_SingleCycle.sql b/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_SingleCycle.sql
@@ -11,7 +11,7 @@ WHERE m0.type = 'DD'
     AND m0.version = 'V01'
     AND m0.model = '{{vxMODEL}}'
     AND m0.region = '{{vxREGION}}'
-    AND m0.fcstLen IN [0,3,6,9,12,15,18,21,24,30,36,42,48]
+    AND (m0.fcstLen % 3) = 0
     AND m0.fcstValidEpoch - m0.fcstLen * 3600 = {{vxFROM_SECS}}
 GROUP BY m0.fcstLen
 ORDER BY fcst_lead;
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_UTC.sql b/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_UTC.sql
@@ -11,7 +11,7 @@ WHERE m0.type = 'DD'
     AND m0.version = 'V01'
     AND m0.model = '{{vxMODEL}}'
     AND m0.region = '{{vxREGION}}'
-    AND m0.fcstLen IN [0,3,6,9,12,15,18,21,24,30,36,42,48]
+    AND (m0.fcstLen % 3) = 0
     AND (m0.fcstValidEpoch - m0.fcstLen * 3600) %(24 * 3600) / 3600 IN [{{vxUTC_CYCLE_START}}]
     AND m0.fcstValidEpoch - m0.fcstLen * 3600 >= {{vxFROM_SECS}}
     AND m0.fcstValidEpoch - m0.fcstLen * 3600 <= {{vxTO_SECS}}