Skip to content

Commit 4166faa

Browse files
dsarmanydsarmany
committed
Merge branch 'feature/seas6-rules'
2 parents e79b138 + 0dc01ef commit 4166faa

File tree

2 files changed

+109
-12
lines changed

2 files changed

+109
-12
lines changed

‎share/multio/param-mappings/statistics_param_mappings.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4021,3 +4021,13 @@
40214021
- typeOfStatisticalProcessing: 0
40224022
paramOut: 263909
40234023

4024+
# Manually added mappings
4025+
- paramIn: 260289
4026+
mappings:
4027+
# Note: Average (0) is automatically generated above
4028+
- typeOfStatisticalProcessing: 2
4029+
paramOut: 237093
4030+
- typeOfStatisticalProcessing: 3
4031+
paramOut: 238093
4032+
- typeOfStatisticalProcessing: 6
4033+
paramOut: 239093

‎src/multio/mars2grib/Rules.cc‎

Lines changed: 99 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -245,36 +245,63 @@ auto paramSFCRules() {
245245
timeRange(TimeRangeType::FixedTimeRange, TOSP::Minimum),
246246
overallLengthOfTimeRange("6h"), //
247247
typeOfLevel(TOL::HeightAboveGroundAt2m), fixedLevel(2)), //
248-
rule(matchParams(201, 237167), //
248+
rule(matchParams(201, 237167, 237168), //
249249
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
250-
typeOfLevel(TOL::HeightAboveGroundAt2m), fixedLevel(2), fixedLevel(10)), //
251-
rule(matchParams(202, 238167), //
250+
typeOfLevel(TOL::HeightAboveGroundAt2m), fixedLevel(2)), //
251+
rule(matchParams(202, 238167, 238168), //
252252
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
253253
typeOfLevel(TOL::HeightAboveGroundAt2m), fixedLevel(2)), //
254254
rule(matchParams(228004, 235168), //
255255
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
256256
typeOfLevel(TOL::HeightAboveGroundAt2m), fixedLevel(2)), //
257-
rule(matchParams(123), //
258-
timeRange(TimeRangeType::FixedTimeRange, TOSP::Maximum),
257+
rule(matchParams(239167, 239168), //
258+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
259+
typeOfLevel(TOL::HeightAboveGroundAt2m), fixedLevel(2)), //
260+
rule(matchParams(123), //
261+
timeRange(TimeRangeType::FixedTimeRange, TOSP::Maximum), //
259262
overallLengthOfTimeRange("6h"), //
260263
typeOfLevel(TOL::HeightAboveGroundAt10m), fixedLevel(10)), //
261264
rule(matchParams(228028), //
262265
timeRange(TimeRangeType::FixedTimeRange, TOSP::Maximum),
263266
overallLengthOfTimeRange("3h"), //
264267
typeOfLevel(TOL::HeightAboveGroundAt10m), fixedLevel(10)), //
265-
rule(matchParams(49, 237207, 237318), //
268+
rule(matchParams(49, 237165, 237166, 237207, 237318), //
266269
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
267270
typeOfLevel(TOL::HeightAboveGroundAt10m), fixedLevel(10)), //
268271
rule(matchParams(235087, 235088, 235136, 235137, 235087, 235088, 235137, 235288, 235287, 235290, 235326,
269272
235383), //
270273
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
271274
typeOfLevel(TOL::EntireAtmosphere)), //
275+
rule(matchParams(237087, 237088, 237326, 237288, 237290, 237137, 237287), //
276+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
277+
typeOfLevel(TOL::EntireAtmosphere)), //
278+
rule(matchParams(238087, 238088, 238326, 238288, 238290, 238137, 238287), //
279+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
280+
typeOfLevel(TOL::EntireAtmosphere)), //
281+
rule(matchParams(239087, 239088, 239326, 239288, 239290, 239137, 239287), //
282+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
283+
typeOfLevel(TOL::EntireAtmosphere)), //
272284
rule(matchParams(228005, 235165, 235166), //
273-
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average),
285+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
286+
typeOfLevel(TOL::HeightAboveGroundAt10m), fixedLevel(10)), //
287+
rule(matchParams(238165, 238166, 238207), //
288+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
289+
typeOfLevel(TOL::HeightAboveGroundAt10m), fixedLevel(10)), //
290+
rule(matchParams(239165, 239166, 239207), //
291+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
274292
typeOfLevel(TOL::HeightAboveGroundAt10m), fixedLevel(10)), //
275293
rule(matchParams(235151), //
276294
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
277295
typeOfLevel(TOL::MeanSea)), //
296+
rule(matchParams(237151), //
297+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
298+
typeOfLevel(TOL::MeanSea)), //
299+
rule(matchParams(238151), //
300+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
301+
typeOfLevel(TOL::MeanSea)), //
302+
rule(matchParams(239151), //
303+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
304+
typeOfLevel(TOL::MeanSea)), //
278305
rule(matchParams(235039, 235040, 235049, 235050, 235053), //
279306
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
280307
typeOfLevel(TOL::NominalTop)), //
@@ -284,21 +311,78 @@ auto paramSFCRules() {
284311
235283, 235339), //
285312
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
286313
typeOfLevel(TOL::Surface)), //
287-
rule(matchParams(235108), timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average),
314+
rule(matchParams(235108),
315+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average),
316+
typeOfLevel(TOL::LowCloudLayer)),
317+
rule(matchParams(237108),
318+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum),
319+
typeOfLevel(TOL::LowCloudLayer)),
320+
rule(matchParams(238108),
321+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum),
288322
typeOfLevel(TOL::LowCloudLayer)),
289-
rule(matchParams(235090), timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average),
323+
rule(matchParams(239108),
324+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation),
325+
typeOfLevel(TOL::LowCloudLayer)),
326+
rule(matchParams(235090),
327+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average),
290328
typeOfLevel(TOL::MixingLayer)),
291-
rule(matchParams(235322), timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average),
329+
rule(matchParams(237090),
330+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum),
331+
typeOfLevel(TOL::MixingLayer)),
332+
rule(matchParams(238090),
333+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum),
334+
typeOfLevel(TOL::MixingLayer)),
335+
rule(matchParams(239090),
336+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation),
337+
typeOfLevel(TOL::MixingLayer)),
338+
rule(matchParams(235322),
339+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average),
340+
typeOfLevel(TOL::Tropopause)),
341+
rule(matchParams(237322),
342+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum),
343+
typeOfLevel(TOL::Tropopause)),
344+
rule(matchParams(238322),
345+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum),
346+
typeOfLevel(TOL::Tropopause)),
347+
rule(matchParams(239322),
348+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation),
292349
typeOfLevel(TOL::Tropopause)),
293350
rule(matchParams(235077, 235094), // 235077 also exists on SOL !
294351
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
295352
typeOfLevel(TOL::SoilLayer)), //
353+
rule(matchParams(237077, 237094), //
354+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
355+
typeOfLevel(TOL::SoilLayer)), //
356+
rule(matchParams(238077, 238094), //
357+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
358+
typeOfLevel(TOL::SoilLayer)), //
359+
rule(matchParams(239077, 239094), //
360+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
361+
typeOfLevel(TOL::SoilLayer)), //
296362
rule(matchParams(235309), //
297363
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
298364
typeOfLevel(TOL::IceLayerOnWater)), //
365+
rule(matchParams(237309), //
366+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
367+
typeOfLevel(TOL::IceLayerOnWater)), //
368+
rule(matchParams(238309), //
369+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
370+
typeOfLevel(TOL::IceLayerOnWater)), //
371+
rule(matchParams(239309), //
372+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
373+
typeOfLevel(TOL::IceLayerOnWater)), //
299374
rule(matchParams(263024), //
300375
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Average), //
301376
typeOfLevel(TOL::SeaIceLayer)), //
377+
rule(matchParams(265024), //
378+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
379+
typeOfLevel(TOL::SeaIceLayer)), //
380+
rule(matchParams(266024), //
381+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
382+
typeOfLevel(TOL::SeaIceLayer)), //
383+
rule(matchParams(267024), //
384+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
385+
typeOfLevel(TOL::SeaIceLayer)), //
302386
rule(matchParams(260683), //
303387
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Mode), //
304388
typeOfLevel(TOL::Surface)), //
@@ -452,12 +536,15 @@ auto paramSFCRules() {
452536
pointInTime(), //
453537
periodRange(),
454538
typeOfLevel(TOL::Surface)), //
455-
rule(matchParams(228226, 237013, 237055, 237117, 237321), //
539+
rule(matchParams(228226, 237013, 237041, 237042, 237055, 237078, 237080, 237083, 237084, 237093, 237117, 237134, 237159, 237263, 237321), //
456540
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Maximum), //
457541
typeOfLevel(TOL::Surface)), //
458-
rule(matchParams(228227, 238055, 238013), //
542+
rule(matchParams(228227, 238055, 238013, 238041, 238042, 238078, 238080, 238083, 238084, 238093, 238134, 238159, 238263), //
459543
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::Minimum), //
460544
typeOfLevel(TOL::Surface)), //
545+
rule(matchParams(239041, 239042, 239078, 239080, 239083, 239084, 239093, 239134, 239159, 239263), //
546+
timeRange(TimeRangeType::SinceLastPostProcessingStep, TOSP::StandardDeviation), //
547+
typeOfLevel(TOL::Surface)), //
461548
rule(matchParams(140251), //
462549
pointInTime(), //
463550
dirFreq()), //

0 commit comments

Comments
 (0)