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

Cb ceiling middleware die off #1006

Merged
merged 31 commits into from
Aug 9, 2023
Merged

Cb ceiling middleware die off #1006

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c564076
adding matsMiddle DieOff
May 31, 2023
8545f9b
monir refactoring of name space
Jun 6, 2023
3a84f73
matsMiddleTimeSiries, matsMiddleDieOff
Jun 6, 2023
ef492ad
DieOff matsMiddle
gopa-noaa Jun 7, 2023
89377a4
DieOff-DieOff plot matches
Jun 12, 2023
51d9044
CTC summed by epoch
Jun 22, 2023
f1f9801
DieOff stations plots look good
Jun 28, 2023
08e7802
DieOff => Dieoff
Jul 12, 2023
b99bd22
”linting”
gopa-noaa Jul 12, 2023
da464ea
sync sub-repo pointers
gopa-noaa Jul 12, 2023
75a4609
lint run
Jul 13, 2023
d78ba1a
lint run
Jul 13, 2023
a795c72
lint run
Jul 13, 2023
6074779
resolving merge conflicts
Jul 13, 2023
a56ed5b
TimeSeries CTC sumup
Jul 17, 2023
4adaea1
updating sub-repo pointers
Jul 18, 2023
10dd95c
updating sub-repo pointers
gopa-noaa Jul 19, 2023
838442a
removing code duplication per code review with Molly, Randy
Jul 24, 2023
c36cef5
{{templ}} change per issue #940
Jul 31, 2023
9785030
TimeSeries+DieOff merge code working for DieOff
Aug 1, 2023
0d632ce
created issue #1036 to work on merge code, this push works without th…
Aug 3, 2023
19e20a1
cleaning up for PR
Aug 3, 2023
6484fc8
”linting”
Aug 3, 2023
98b9fbf
sysc sub-repo pointers
Aug 3, 2023
59be33e
”linting”
Aug 7, 2023
af8ba70
back merge
Aug 7, 2023
299f162
adding package-lock.json
Aug 7, 2023
0a22ae7
Had to push to development before release so backmerging to this feat…
mollybsmith-noaa Aug 7, 2023
4b8a629
Merge branch 'development' into cb_ceiling_middle_tier_DieOff
mollybsmith-noaa Aug 7, 2023
dec4379
Merge branch 'development' into cb_ceiling_middle_tier_DieOff
mollybsmith-noaa Aug 8, 2023
350037b
MATS submodule conflict resolution
mollybsmith-noaa Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MATScommon
Open in desktop
Submodule MATScommon updated 10 files
+222 −504 meteor_packages/mats-common/.npm/package/npm-shrinkwrap.json
+0 −1 meteor_packages/mats-common/imports/startup/api/matsMethods.js
+4 −4 meteor_packages/mats-common/imports/startup/server/cb_utilities.js
+68 −151 meteor_packages/mats-common/imports/startup/server/data_query_util.js
+124 −0 meteor_packages/mats-common/imports/startup/server/matsMiddle_common.js
+496 −0 meteor_packages/mats-common/imports/startup/server/matsMiddle_dieoff.js
+50 −24 meteor_packages/mats-common/imports/startup/server/matsMiddle_timeSeries.js
+537 −0 meteor_packages/mats-common/imports/startup/server/matsMiddle_ts_dieoff.js
+7 −3 meteor_packages/mats-common/package.js
+168 −3,371 package-lock.json
2 changes: 1 addition & 1 deletion METexpress
Open in desktop
Submodule METexpress updated 118 files
35 changes: 17 additions & 18 deletions apps/cb-ceiling/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions apps/cb-ceiling/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_model.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
SELECT
fcstValidEpoch fve,
fcstLen fcst_lead,
{{vxAVERAGE}} avtime,
{{stationNamesList}}
FROM
Expand All @@ -9,5 +10,6 @@ WHERE
AND docType = "model"
AND model = {{vxMODEL}}
AND fcstLen = {{vxFCST_LEN}}
AND fcstLen IN {{vxFCST_LEN_ARRAY}}
AND version = "V01"
AND fcstValidEpoch IN {{fcstValidEpoch}}
10 changes: 10 additions & 0 deletions apps/cb-ceiling/private/matsMiddle/sqlTemplates/tmpl_get_distinct_fcstLen.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
SELECT DISTINCT fcstLen
FROM vxdata._default.METAR m0
WHERE m0.type='DD'
AND m0.docType='CTC'
AND m0.subset='METAR'
AND m0.version='V01'
AND m0.model={{vxMODEL}}
AND m0.fcstValidEpoch >= {{vxFROM_SECS}}
AND m0.fcstValidEpoch <= {{vxTO_SECS}}
ORDER BY fcstLen;
16 changes: 8 additions & 8 deletions apps/cb-ceiling/server/dataFunctions/data_dailymodelcycle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ dataDailyModelCycle = function (plotParams, plotFunction) {
}
console.log(`\nqueryTemplate:\n${queryTemplate}`);

queryTemplate = queryTemplate.replace(/vxFROM_SECS/g, fromSecs);
queryTemplate = queryTemplate.replace(/vxTO_SECS/g, toSecs);
queryTemplate = queryTemplate.replace(/{{vxFROM_SECS}}/g, fromSecs);
queryTemplate = queryTemplate.replace(/{{vxTO_SECS}}/g, toSecs);

const { diffFrom } = curve;
const { label } = curve;
var { variable } = curve;
const model = matsCollections["data-source"].findOne({ name: "data-source" })
.optionsMap[variable][curve["data-source"]][0];
queryTemplate = queryTemplate.replace(/vxMODEL/g, model);
queryTemplate = queryTemplate.replace(/{{vxMODEL}}/g, model);
var thresholdStr = curve.threshold;
let threshold = Object.keys(
matsCollections.threshold.findOne({ name: "threshold" }).valuesMap[variable]
Expand All @@ -81,7 +81,7 @@ dataDailyModelCycle = function (plotParams, plotFunction) {
] === thresholdStr
);
threshold = threshold.replace(/_/g, ".");
queryTemplate = queryTemplate.replace(/vxTHRESHOLD/g, threshold);
queryTemplate = queryTemplate.replace(/{{vxTHRESHOLD}}/g, threshold);
if (curve["utc-cycle-start"].length !== 1) {
throw new Error(
"INFO: Please select exactly one UTC Cycle Init Hour for this plot type."
Expand All @@ -90,7 +90,7 @@ dataDailyModelCycle = function (plotParams, plotFunction) {
const utcCycleStart = Number(curve["utc-cycle-start"][0]);
utcCycleStarts[curveIndex] = utcCycleStart;
queryTemplate = queryTemplate.replace(
/vxUTC_CYCLE_START/g,
/{{vxUTC_CYCLE_START}}/g,
cbPool.trfmListToCSVString(utcCycleStart, null, false)
);
const statisticSelect = curve.statistic;
Expand All @@ -108,16 +108,16 @@ dataDailyModelCycle = function (plotParams, plotFunction) {
matsCollections.region.findOne({ name: "region" }).valuesMap[key] ===
regionStr
);
queryTemplate = queryTemplate.replace(/vxREGION/g, region);
queryTemplate = queryTemplate.replace(/{{vxREGION}}/g, region);
} else {
const sitesList = curve.sites === undefined ? [] : curve.sites;
if (sitesList.length > 0 && sitesList !== matsTypes.InputTypes.unused) {
queryTemplate = queryTemplate.replace(
/vxSITES_LIST_OBS/g,
/{{vxSITES_LIST_OBS}}/g,
cbPool.trfmListToCSVString(sitesList, "obs.data.", false)
);
queryTemplate = queryTemplate.replace(
/vxSITES_LIST_MODELS/g,
/{{vxSITES_LIST_MODELS}}/g,
cbPool.trfmListToCSVString(sitesList, "models.data.", false)
);
} else {
Expand Down
Loading