Feature/grib1 to grib2 error handling

src/multio/datamod/GribKeys.h

@@ -62,6 +62,31 @@ constexpr auto TypeOfProcessedDataEntry =
         .tagOptional()
         .withAccessor([](auto&& v) { return &v.typeOfProcessedData; });
 
+// Section 2 - local definition 39 (4D-var model errors, type=eme/me)
+
+constexpr auto NumberOfComponents =
+    EntryDef<std::int64_t>{"misc-numberOfComponents"}
+        .tagOptional()
+        .withAccessor([](auto&& v) { return &v.numberOfComponents; });
+
+constexpr auto ModelErrorType =
+    EntryDef<std::int64_t>{"misc-modelErrorType"}
+        .tagOptional()
+        .withAccessor([](auto&& v) { return &v.modelErrorType; });
+
+// Section 2 - local definition 38 (4D-var analysis iterations, type=4i)
+//
+// `iterationNumber` is forwarded directly through MARS as
+// `mars.iteration` (see `dm::ITERATION` in MarsKeys.h); the metkit
+// encoder reads it via the iteration deduction. Only the
+// `totalNumberOfIterations` key, which has no MARS equivalent, is
+// forwarded through misc.
+
+constexpr auto TotalNumberOfIterations =
+    EntryDef<std::int64_t>{"misc-totalNumberOfIterations"}
+        .tagOptional()
+        .withAccessor([](auto&& v) { return &v.totalNumberOfIterations; });
+
 
 // Section3 (more to be moved here from MarsMiscGeo.h)
 
@@ -191,6 +216,10 @@ constexpr auto SatelliteSeries =
     EntryDef<std::int64_t>{"misc-satelliteSeries"}
         .tagOptional()
         .withAccessor([](auto&& v) { return &v.satelliteSeries; });
+constexpr auto NumberOfFrequencies =
+    EntryDef<std::int64_t>{"misc-numberOfFrequencies"}
+        .tagOptional()
+        .withAccessor([](auto&& v) { return &v.numberOfFrequencies; });
 // Horizontal Keys
 constexpr auto PressureUnits
     = EntryDef<std::string>{"misc-pressureUnits"}

src/multio/datamod/MarsMiscGeo.h

@@ -324,6 +324,7 @@ struct MiscRecord {
     EntryType_t<decltype(TypeOfEnsembleForecast)> typeOfEnsembleForecast;
     EntryType_t<decltype(NumberOfForecastsInEnsemble)> numberOfForecastsInEnsemble;
     EntryType_t<decltype(SatelliteSeries)> satelliteSeries;
+    EntryType_t<decltype(NumberOfFrequencies)> numberOfFrequencies;
     EntryType_t<decltype(ScaleFactorOfCentralWaveNumber)> scaleFactorOfCentralWaveNumber;
     EntryType_t<decltype(ScaledValueOfCentralWaveNumber)> scaledValueOfCentralWaveNumber;
     EntryType_t<decltype(Pv)> pv;
@@ -334,15 +335,21 @@ struct MiscRecord {
     EntryType_t<decltype(BitsPerValue)> bitsPerValue;
     EntryType_t<decltype(LaplacianOperator)> laplacianOperator;
     EntryType_t<decltype(SubCentre)> subCentre;
+    EntryType_t<decltype(NumberOfComponents)> numberOfComponents;
+    EntryType_t<decltype(ModelErrorType)> modelErrorType;
+    EntryType_t<decltype(TotalNumberOfIterations)> totalNumberOfIterations;
+    EntryType_t<decltype(PVPresent)> pvPresent;
 
 
     static constexpr std::string_view record_name_ = "misc";
+
     static constexpr auto record_entries_ = std::make_tuple(
         TablesVersion, GeneratingProcessIdentifier, TypeOfProcessedDataEntry, InitialStep, TimeIncrementInSeconds,
         LengthOfTimeWindow, LengthOfTimeWindowInSeconds, BitmapPresent, MissingValue, TypeOfEnsembleForecast,
-        NumberOfForecastsInEnsemble, SatelliteSeries, ScaleFactorOfCentralWaveNumber, ScaledValueOfCentralWaveNumber,
-        Pv, ScaleFactorOfWaveDirections, ScaleFactorOfWaveFrequencies, WaveDirections, WaveFrequencies, BitsPerValue,
-        LaplacianOperator, SubCentre);
+        NumberOfForecastsInEnsemble, SatelliteSeries, NumberOfFrequencies, ScaleFactorOfCentralWaveNumber,
+        ScaledValueOfCentralWaveNumber, Pv, ScaleFactorOfWaveDirections, ScaleFactorOfWaveFrequencies, WaveDirections,
+        WaveFrequencies, BitsPerValue, LaplacianOperator, SubCentre, NumberOfComponents, ModelErrorType,
+        TotalNumberOfIterations, PVPresent);
 };