diff --git a/.github/ci-config.yml b/.github/ci-config.yml index b7d26ba67..c08fe14b9 100644 --- a/.github/ci-config.yml +++ b/.github/ci-config.yml @@ -1,3 +1,4 @@ +cmake_options: -DENABLE_BUILD_TOOLS=ON dependencies: | ecmwf/ecbuild MathisRosenhauer/libaec@master diff --git a/.github/ci-hpc-config.yml b/.github/ci-hpc-config.yml index e2939896b..4ae993871 100644 --- a/.github/ci-hpc-config.yml +++ b/.github/ci-hpc-config.yml @@ -7,3 +7,5 @@ build: - ecmwf/eckit@develop - ecmwf/atlas@develop parallel: 64 + env: + - MIR_CACHING=0 diff --git a/VERSION b/VERSION index 398935591..3500250a4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.20.0 +1.21.0 diff --git a/etc/mir/parameter-class.yaml b/etc/mir/parameter-class.yaml index d2e462e82..953457fc8 100644 --- a/etc/mir/parameter-class.yaml +++ b/etc/mir/parameter-class.yaml @@ -387,6 +387,11 @@ density.mass: - 228090 # Total column snow water - 228170 # Field capacity - 228171 # Wilting point + - 235080 # Time-mean snow density + - 235087 # Time-mean total column liquid water + - 235088 # Time-mean total column cloud ice water + - 235136 # Time-mean total column water + - 235137 # Time-mean total column vertically-integrated water vapour - 260001 # Total column graupel - 260014 # Absolute humidity - 260024 # Maximum absolute humidity @@ -565,6 +570,8 @@ vector-space.2d-vector-u: - 233030 # Time integrated, vertically integrated eastward snow flux - 235041 # Mean eastward turbulent surface stress - 235045 # Mean eastward gravity wave surface stress + - 235131 # Time-mean U component of wind + - 235165 # Time-mean 10 metre U wind component - 260062 # Momentum flux, u component - 260066 # u-component of wind (gust) - 260070 # U-component storm motion @@ -672,6 +679,8 @@ vector-space.2d-vector-v: - 233031 # Time integrated, vertically integrated northward snow flux - 235042 # Mean northward turbulent surface stress - 235046 # Mean northward gravity wave surface stress + - 235132 # Time-mean V component of wind + - 235166 # Time-mean 10 metre V wind component - 260063 # Momentum flux, v component - 260067 # v-component of wind (gust) - 260071 # V-component storm motion @@ -833,8 +842,6 @@ intensity: - 135 # Vertical velocity - 138 # Vorticity (relative) - 139 # Soil temperature level 1 - - 140 # Soil wetness level 1 - - 141 # Snow depth - 148 # Charnock - 151 # Mean sea level pressure - 152 # Logarithm of surface pressure @@ -852,17 +859,14 @@ intensity: - 167 # 2 metre temperature - 168 # 2 metre dewpoint temperature - 170 # Soil temperature level 2 - - 171 # Soil wetness level 2 - 173 # Surface roughness - 183 # Soil temperature level 3 - - 184 # Soil wetness level 3 - 189 # Sunshine duration - 190 # East-West component of sub-gridscale orographic variance - 191 # North-South component of sub-gridscale orographic variance - 192 # North-West/South-East component of sub-gridscale orographic variance - 193 # North-East/South-West component of sub-gridscale orographic variance - 194 # Brightness temperature - - 198 # Skin reservoir content - 200 # Variance of sub-gridscale orography - 201 # Maximum temperature at 2 metres since previous post-processing - 202 # Minimum temperature at 2 metres since previous post-processing @@ -915,7 +919,6 @@ intensity: - 3054 # Precipitable water - 3055 # Vapour pressure - 3056 # Saturation deficit - - 3066 # Snow depth - 3067 # Mixed layer depth - 3068 # Transient thermocline depth - 3069 # Main thermocline depth @@ -1095,6 +1098,9 @@ intensity: - 140252 # Wave spectral kurtosis - 140253 # Benjamin-Feir index - 140254 # Wave spectral peakedness + - 141221 # Time-mean mean zero-crossing wave period + - 141229 # Time-mean significant height of combined wind waves and swell + - 141232 # Time-mean mean wave period - 150129 # Ocean potential temperature - 150130 # Ocean salinity - 150131 # Ocean potential density @@ -1193,7 +1199,6 @@ intensity: - 160156 # Height - 160171 # Soil wetness level 2 - 160184 # Soil wetness level 3 - - 160198 # Skin reservoir content - 160201 # Maximum temperature at 2 metres during averaging time - 160202 # Minimum temperature at 2 metres during averaging time - 160206 # Standard deviation of geopotential @@ -1330,7 +1335,6 @@ intensity: - 171138 # Relative vorticity anomaly - 171139 # Soil temperature anomaly level 1 - 171140 # Soil wetness anomaly level 1 - - 171141 # Snow depth anomaly - 171148 # Charnock anomaly - 171151 # Mean sea level pressure anomaly - 171153 # Short-wave heating rate anomaly @@ -1357,7 +1361,6 @@ intensity: - 171192 # North-West/South-East component of sub-gridscale orographic variance anomaly - 171193 # North-East/South-West component of sub-gridscale orographic variance anomaly - 171194 # Brightness temperature anomaly - - 171198 # Skin reservoir content anomaly - 171200 # Variance of sub-gridscale orography anomaly - 171201 # Maximum temperature at 2 metres anomaly - 171202 # Minimum temperature at 2 metres anomaly @@ -1473,7 +1476,6 @@ intensity: - 200138 # Vorticity (relative) difference - 200139 # Soil temperature level 1 difference - 200140 # Soil wetness level 1 difference - - 200141 # Snow depth difference - 200148 # Charnock difference - 200151 # Mean sea level pressure difference - 200153 # Short-wave heating rate difference @@ -1500,7 +1502,6 @@ intensity: - 200192 # North-West/South-East component of sub-gridscale orographic variance difference - 200193 # North-East/South-West component of sub-gridscale orographic variance difference - 200194 # Brightness temperature difference - - 200198 # Skin reservoir content difference - 200200 # Variance of sub-gridscale orography difference - 200201 # Maximum temperature at 2 metres since previous post-processing difference - 200202 # Minimum temperature at 2 metres since previous post-processing difference @@ -1750,6 +1751,9 @@ intensity: - 231051 # Wall temperature - 231052 # Road temperature - 231055 # Urban canyon temperature + - 231059 # Lake surface temperature + - 231063 # Surface roughness for heat + - 231064 # Surface roughness for moisture - 232004 # Fuel load - 232007 # Live leaf fuel load - 232008 # Live wood fuel load @@ -1768,6 +1772,24 @@ intensity: - 235017 # Time integral of surface eastward momentum flux - 235018 # Time integral of surface northward momentum flux - 235079 # Time-mean skin temperature + - 235084 # Time-mean sea surface temperature + - 235090 # Time-mean lake mix-layer temperature + - 235091 # Time-mean lake mix-layer depth + - 235094 # Time-mean soil temperature + - 235129 # Time-mean geopotential + - 235130 # Time-mean temperature + - 235131 # Time-mean U component of wind + - 235132 # Time-mean V component of wind + - 235134 # Time-mean surface pressure + - 235135 # Time-mean vertical velocity + - 235151 # Time-mean mean sea level pressure + - 235159 # Time-mean boundary layer height + - 235165 # Time-mean 10 metre U wind component + - 235166 # Time-mean 10 metre V wind component + - 235168 # Time-mean 2 metre dewpoint temperature + - 235238 # Time-mean temperature of snow layer + - 235244 # Time-mean forecast surface roughness + - 235245 # Time-mean forecast logarithm of surface roughness for heat - 240011 # Cross sectional area of flow in channel - 240014 # River storage of water - 240015 # Floodplain storage of water @@ -2071,9 +2093,14 @@ numerics.tendency: - 263516 # Time-mean sea water salinity numerics.mean: + - 141221 # Time-mean mean zero-crossing wave period + - 141229 # Time-mean significant height of combined wind waves and swell + - 141231 # Time-mean peak wave period + - 141232 # Time-mean mean wave period - 172149 # Time-mean surface net radiation flux (SW and LW) - 173008 # Mean surface runoff rate anomaly - 173009 # Mean sub-surface runoff rate anomaly + - 228005 # Mean of 10 metre wind speed - 229004 # Building height - 231020 # Time-mean top net radiation flux (SW and LW) - 235001 # Mean temperature tendency due to short-wave radiation @@ -2120,6 +2147,46 @@ numerics.mean: - 235077 # Time-mean volumetric soil moisture - 235078 # Time-mean snow depth water equivalent - 235079 # Time-mean skin temperature + - 235080 # Time-mean snow density + - 235081 # Time-mean low vegetation cover + - 235082 # Time-mean high vegetation cover + - 235083 # Time-mean sea ice area fraction + - 235084 # Time-mean sea surface temperature + - 235085 # Time-mean leaf area index, low vegetation + - 235086 # Time-mean leaf area index, high vegetation + - 235087 # Time-mean total column liquid water + - 235088 # Time-mean total column cloud ice water + - 235089 # Time-mean 2 metre specific humidity + - 235090 # Time-mean lake mix-layer temperature + - 235091 # Time-mean lake mix-layer depth + - 235092 # Time-mean 2 metre relative humidity + - 235093 # Time-mean fraction of snow cover + - 235094 # Time-mean soil temperature + - 235095 # Time-mean snow depth + - 235096 # Time-mean snow cover + - 235129 # Time-mean geopotential + - 235130 # Time-mean temperature + - 235131 # Time-mean U component of wind + - 235132 # Time-mean V component of wind + - 235133 # Time-mean specific humidity + - 235134 # Time-mean surface pressure + - 235135 # Time-mean vertical velocity + - 235136 # Time-mean total column water + - 235137 # Time-mean total column vertically-integrated water vapour + - 235141 # Time-mean snow depth + - 235151 # Time-mean mean sea level pressure + - 235157 # Time-mean relative humidity + - 235159 # Time-mean boundary layer height + - 235165 # Time-mean 10 metre U wind component + - 235166 # Time-mean 10 metre V wind component + - 235168 # Time-mean 2 metre dewpoint temperature + - 235186 # Time-mean low cloud cover + - 235187 # Time-mean medium cloud cover + - 235188 # Time-mean high cloud cover + - 235238 # Time-mean temperature of snow layer + - 235243 # Time-mean forecast albedo + - 235244 # Time-mean forecast surface roughness + - 235245 # Time-mean forecast logarithm of surface roughness for heat - 260441 # Time-mean total precipitation rate - 260477 # Time-mean snow melt rate in the last 24h - 263000 # Time-mean sea ice thickness @@ -2237,6 +2304,8 @@ numerics.accumulated: - 50 # Large-scale precipitation fraction - 57 # Downward UV radiation at the surface - 58 # Photosynthetically active radiation at the surface + - 140 # Soil wetness level 1 + - 141 # Snow depth - 142 # Large-scale precipitation - 143 # Convective precipitation - 144 # Snowfall @@ -2246,6 +2315,7 @@ numerics.accumulated: - 149 # Surface net radiation - 150 # Top net radiation - 169 # Surface solar radiation downwards + - 171 # Soil wetness level 2 - 175 # Surface thermal radiation downwards - 176 # Surface net solar radiation - 177 # Surface net thermal radiation @@ -2254,9 +2324,11 @@ numerics.accumulated: - 180 # Eastward turbulent surface stress - 181 # Northward turbulent surface stress - 182 # Evaporation + - 184 # Soil wetness level 3 - 195 # Eastward gravity wave surface stress - 196 # Northward gravity wave surface stress - 197 # Gravity wave dissipation + - 198 # Skin reservoir content - 205 # Runoff - 208 # Top net solar radiation, clear sky - 209 # Top net thermal radiation, clear sky @@ -2268,6 +2340,7 @@ numerics.accumulated: - 240 # Large-scale snowfall - 3062 # large scale precipitation - 3063 # Convective precipitation (water) + - 3066 # Snow depth - 3079 # Large scale snow - 3099 # Snow melt - 129044 # Snow evaporation gradient @@ -2318,6 +2391,7 @@ numerics.accumulated: - 151160 # Specified surface heat flux - 151162 # Heat flux correction - 160141 # Snow depth + - 160198 # Skin reservoir content - 160231 # Instantaneous surface heat flux - 160249 # Gravity wave dissipation flux - 162093 # Total column vertically-integrated water enthalpy @@ -2336,6 +2410,7 @@ numerics.accumulated: - 171050 # Large-scale precipitation fraction anomaly - 171057 # Downward UV radiation at the surface anomaly - 171058 # Photosynthetically active radiation at the surface anomaly + - 171141 # Snow depth anomaly - 171142 # Stratiform precipitation (Large-scale precipitation) anomaly - 171143 # Convective precipitation anomaly - 171144 # Snowfall (convective + stratiform) anomaly @@ -2355,6 +2430,7 @@ numerics.accumulated: - 171195 # Longitudinal component of gravity wave stress anomaly - 171196 # Meridional component of gravity wave stress anomaly - 171197 # Gravity wave dissipation anomaly + - 171198 # Skin reservoir content anomaly - 171205 # Runoff anomaly - 171208 # Top net solar radiation clear sky anomaly - 171209 # Top net thermal radiation clear sky anomaly @@ -2403,6 +2479,7 @@ numerics.accumulated: - 200050 # Large-scale precipitation fraction difference - 200057 # Downward UV radiation at the surface difference - 200058 # Photosynthetically active radiation at the surface difference + - 200141 # Snow depth difference - 200142 # Stratiform precipitation (Large-scale precipitation) difference - 200143 # Convective precipitation difference - 200144 # Snowfall (convective + stratiform) difference @@ -2422,6 +2499,7 @@ numerics.accumulated: - 200195 # Longitudinal component of gravity wave stress difference - 200196 # Meridional component of gravity wave stress difference - 200197 # Gravity wave dissipation difference + - 200198 # Skin reservoir content difference - 200205 # Runoff difference - 200208 # Top net solar radiation, clear sky difference - 200209 # Top net thermal radiation, clear sky difference @@ -2661,6 +2739,8 @@ numerics.accumulated: - 235073 # Time integral of evapotranspiration flux - 235075 # Time integral of potential evapotranspiration rate - 235078 # Time-mean snow depth water equivalent + - 235095 # Time-mean snow depth + - 235141 # Time-mean snow depth - 240020 # Depth of water on soil surface - 240021 # Upstream accumulated precipitation - 240022 # Upstream accumulated snow melt @@ -3123,6 +3203,10 @@ numerics.vertical-integral: - 233030 # Time integrated, vertically integrated eastward snow flux - 233031 # Time integrated, vertically integrated northward snow flux - 235054 # Mean vertically integrated moisture divergence + - 235087 # Time-mean total column liquid water + - 235088 # Time-mean total column cloud ice water + - 235136 # Time-mean total column water + - 235137 # Time-mean total column vertically-integrated water vapour - 260001 # Total column graupel - 260041 # Total column integrated rain - 260042 # Total column integrated snow @@ -3545,6 +3629,7 @@ rate.mass-flux: - 160143 # Convective precipitation - 160144 # Snowfall - 160182 # Evaporation + - 160198 # Skin reservoir content - 160205 # Runoff - 160239 # Convective snowfall - 160240 # Large scale snowfall @@ -3569,6 +3654,7 @@ rate.mass-flux: - 171044 # Snow evaporation anomaly - 171045 # Snowmelt anomaly - 171182 # Evaporation anomaly + - 171198 # Skin reservoir content anomaly - 173008 # Mean surface runoff rate anomaly - 173009 # Mean sub-surface runoff rate anomaly - 174008 # Surface runoff @@ -3580,6 +3666,7 @@ rate.mass-flux: - 200044 # Snow evaporation difference - 200045 # Snowmelt difference - 200182 # Evaporation difference + - 200198 # Skin reservoir content difference - 201065 # convective mass flux - 201100 # surface precipitation rate, rain, grid scale - 201101 # surface precipitation rate, snow, grid scale @@ -4340,14 +4427,20 @@ rate.volume-flux: - 9 # Sub-surface runoff - 44 # Snow evaporation - 45 # Snowmelt + - 140 # Soil wetness level 1 + - 141 # Snow depth - 142 # Large-scale precipitation - 143 # Convective precipitation - 144 # Snowfall + - 171 # Soil wetness level 2 - 182 # Evaporation + - 184 # Soil wetness level 3 + - 198 # Skin reservoir content - 205 # Runoff - 228 # Total precipitation - 239 # Convective snowfall - 240 # Large-scale snowfall + - 3066 # Snow depth - 129142 # Stratiform precipitation (Large-scale precipitation) gradient - 129143 # Convective precipitation gradient - 129144 # Snowfall (convective + stratiform) gradient @@ -4356,6 +4449,7 @@ rate.volume-flux: - 129239 # Convective snowfall gradient - 129240 # Large scale snowfall gradient - 151158 # Precipitation - evaporation + - 171141 # Snow depth anomaly - 171142 # Stratiform precipitation (Large-scale precipitation) anomaly - 171143 # Convective precipitation anomaly - 171144 # Snowfall (convective + stratiform) anomaly @@ -4383,6 +4477,7 @@ rate.volume-flux: - 173228 # Total precipitation anomalous rate of accumulation - 173239 # Convective snowfall anomaly - 173240 # Large scale snowfall anomaly + - 200141 # Snow depth difference - 200142 # Stratiform precipitation (Large-scale precipitation) difference - 200143 # Convective precipitation difference - 200144 # Snowfall (convective + stratiform) difference @@ -4621,6 +4716,8 @@ rate.volume-flux: - 230239 # Convective snowfall (variable resolution) - 230240 # Large-scale snowfall (variable resolution) - 230251 # Potential evaporation (variable resolution) + - 235095 # Time-mean snow depth + - 235141 # Time-mean snow depth - 260025 # Total snowfall - 260053 # Total snowfall rate - 260054 # Convective snowfall rate @@ -4659,6 +4756,11 @@ ratio: - 228042 # Soil wetness index in layer 3 - 228043 # Soil wetness index in layer 4 - 231013 # Reflectance in 0.4 micron channel + - 231060 # Surface bulk Richardson number + - 231061 # Time-maximum 2 metre relative humidity + - 231062 # Time-minimum 2 metre relative humidity + - 235092 # Time-mean 2 metre relative humidity + - 235157 # Time-mean relative humidity - 260023 # Maximum relative humidity - 260034 # Horizontal moisture divergence - 260112 # Convective cloud efficiency @@ -4689,6 +4791,8 @@ ratio.area: - 200066 # Leaf area index, low vegetation - 200067 # Leaf area index, high vegetation - 229005 # Vertical-to-horizontal area ratio + - 235085 # Time-mean leaf area index, low vegetation + - 235086 # Time-mean leaf area index, high vegetation - 261012 # Fraction of malarial vector reproductive habitat ratio.cover: @@ -4708,6 +4812,8 @@ ratio.cover: - 229009 # Irrigation cover - 229010 # C4 crop cover - 229011 # C4 grass cover + - 235083 # Time-mean sea ice area fraction + - 235096 # Time-mean snow cover - 260038 # Snow cover ratio.cover.cloud: @@ -4751,6 +4857,9 @@ ratio.cover.cloud: - 201060 # cloud cover, convective cirrus - 228006 # Mean total cloud cover - 228164 # Total Cloud Cover + - 235186 # Time-mean low cloud cover + - 235187 # Time-mean medium cloud cover + - 235188 # Time-mean high cloud cover - 260110 # Non-convective cloud cover - 260257 # Cloud cover - 260648 # Fog @@ -4770,6 +4879,8 @@ ratio.cover.vegetation: - 200028 # High vegetation cover difference - 200070 # Biome cover, low vegetation - 200071 # Biome cover, high vegetation + - 235081 # Time-mean low vegetation cover + - 235082 # Time-mean high vegetation cover ratio.fraction: - 6 # Soil sand fraction @@ -4897,6 +5008,8 @@ ratio.fraction: - 232005 # Combustion completeness - 235026 # Mean large-scale precipitation fraction - 235044 # Sunshine duration fraction + - 235093 # Time-mean fraction of snow cover + - 235243 # Time-mean forecast albedo - 240016 # Water fraction - 260039 # Rain fraction of total cloud water - 260103 # Cloud amount @@ -4905,6 +5018,7 @@ ratio.fraction: - 260162 # Snow free albedo - 260173 # Snow water equivalent percent of normal - 260187 # Moisture availability + - 260289 # Fraction of snow cover - 260294 # Glacier mask - 260509 # Albedo - 260557 # Keetch-Byram drought index @@ -5312,6 +5426,8 @@ ratio.mass: - 232014 # Fine dead wood moisture content - 232015 # Dense dead wood moisture content - 235006 # Mean specific humidity tendency due to parametrisations + - 235089 # Time-mean 2 metre specific humidity + - 235133 # Time-mean specific humidity - 260017 # Condensate - 260018 # Cloud mixing ratio - 260019 # Ice water mixing ratio @@ -5705,6 +5821,7 @@ spectrum.associated-magnitude: - 140246 # Altimeter wave height - 140247 # Altimeter corrected wave height - 140248 # Altimeter range relative correction + - 141231 # Time-mean peak wave period stress: - 48 # Magnitude of turbulent surface stress diff --git a/src/mir/action/filter/ShTruncate.cc b/src/mir/action/filter/ShTruncate.cc index a0e8427d8..ec62134a2 100644 --- a/src/mir/action/filter/ShTruncate.cc +++ b/src/mir/action/filter/ShTruncate.cc @@ -43,7 +43,8 @@ bool ShTruncate::sameAs(const Action& other) const { void ShTruncate::print(std::ostream& out) const { - out << "ShTruncate[" << "truncation=" << truncation_ << "]"; + out << "ShTruncate[" + << "truncation=" << truncation_ << "]"; } diff --git a/src/mir/action/interpolate/Gridded2GridDef.cc b/src/mir/action/interpolate/Gridded2GridDef.cc index 95e0b131b..4ebf1c6f3 100644 --- a/src/mir/action/interpolate/Gridded2GridDef.cc +++ b/src/mir/action/interpolate/Gridded2GridDef.cc @@ -47,7 +47,8 @@ void Gridded2GridDef::custom(std::ostream& out) const { void Gridded2GridDef::print(std::ostream& out) const { - out << "Gridded2GridDef[" << "griddef=" << griddef_ << ","; + out << "Gridded2GridDef[" + << "griddef=" << griddef_ << ","; Gridded2UnrotatedGrid::print(out); out << "]"; } diff --git a/src/mir/action/interpolate/Gridded2RegularLL.cc b/src/mir/action/interpolate/Gridded2RegularLL.cc index d3dca5836..a202d19b2 100644 --- a/src/mir/action/interpolate/Gridded2RegularLL.cc +++ b/src/mir/action/interpolate/Gridded2RegularLL.cc @@ -40,7 +40,8 @@ Gridded2RegularLL::Gridded2RegularLL(const param::MIRParametrisation& parametris repres::latlon::LatLon::globaliseBoundingBox(bbox_, increments_, reference_); - Log::debug() << "Gridded2RegularLL: globalise:" << "\n\t" << increments_ << "\n\t" << bbox_ + Log::debug() << "Gridded2RegularLL: globalise:" + << "\n\t" << increments_ << "\n\t" << bbox_ << "\n\t" "shifted in latitude? " << increments_.isLatitudeShifted(bbox_) diff --git a/src/mir/action/interpolate/Gridded2RotatedLL.cc b/src/mir/action/interpolate/Gridded2RotatedLL.cc index a91d9c306..bfdf83dbe 100644 --- a/src/mir/action/interpolate/Gridded2RotatedLL.cc +++ b/src/mir/action/interpolate/Gridded2RotatedLL.cc @@ -40,7 +40,8 @@ Gridded2RotatedLL::Gridded2RotatedLL(const param::MIRParametrisation& parametris repres::latlon::LatLon::globaliseBoundingBox(bbox_, increments_, reference_); - Log::debug() << "Gridded2RotatedLL: globalise:" << "\n\t" << increments_ << "\n\t" << bbox_ + Log::debug() << "Gridded2RotatedLL: globalise:" + << "\n\t" << increments_ << "\n\t" << bbox_ << "\n\t" "shifted in latitude? " << increments_.isLatitudeShifted(bbox_) diff --git a/src/mir/action/plan/Action.cc b/src/mir/action/plan/Action.cc index ab0d4c0ea..c0598e837 100644 --- a/src/mir/action/plan/Action.cc +++ b/src/mir/action/plan/Action.cc @@ -172,7 +172,8 @@ Action* ActionFactory::build(const std::string& name, const param::MIRParametris if (j != m->end()) { std::ostringstream oss; - oss << "ActionFactory: ambiguous '" << name << "'" << ", could be '" << j->first << "'" + oss << "ActionFactory: ambiguous '" << name << "'" + << ", could be '" << j->first << "'" << " or '" << p->first << "'"; Log::error() << " " << j->first << std::endl; throw exception::SeriousBug(oss.str()); diff --git a/src/mir/action/plan/ActionPlan.cc b/src/mir/action/plan/ActionPlan.cc index 40a771fe0..755521eb2 100644 --- a/src/mir/action/plan/ActionPlan.cc +++ b/src/mir/action/plan/ActionPlan.cc @@ -144,13 +144,21 @@ void ActionPlan::execute(context::Context& ctx) const { for (const auto& p : *this) { if (Log::debug_active()) { - Log::debug() << "Executing:" << "\n" << sep << "\n" << *p << "\n" << sep << std::endl; + Log::debug() << "Executing:" + << "\n" + << sep << "\n" + << *p << "\n" + << sep << std::endl; } p->perform(ctx); if (Log::debug_active()) { - Log::debug() << "Result:" << "\n" << sep << "\n" << ctx << "\n" << sep << std::endl; + Log::debug() << "Result:" + << "\n" + << sep << "\n" + << ctx << "\n" + << sep << std::endl; } } @@ -180,7 +188,11 @@ void ActionPlan::estimate(context::Context& ctx, api::MIREstimation& estimation) void ActionPlan::compress() { const char* sep = "#########"; - Log::debug() << "Compress:" << "\n" << sep << "\n" << *this << "\n" << sep << std::endl; + Log::debug() << "Compress:" + << "\n" + << sep << "\n" + << *this << "\n" + << sep << std::endl; bool hasCompressed = false; bool more = true; @@ -193,8 +205,9 @@ void ActionPlan::compress() { if (action(i).mergeWithNext(action(i + 1))) { - Log::debug() << "ActionPlan::compress: " << "\n " << oldAction.str() << "\n + " << action(i + 1) - << "\n = " << action(i) << std::endl; + Log::debug() << "ActionPlan::compress: " + << "\n " << oldAction.str() << "\n + " << action(i + 1) << "\n = " << action(i) + << std::endl; delete at(i + 1); erase(begin() + long(i + 1)); @@ -217,10 +230,16 @@ void ActionPlan::compress() { } if (hasCompressed) { - Log::debug() << "Compress result:" << "\n" << sep << "\n" << *this << "\n" << sep << std::endl; + Log::debug() << "Compress result:" + << "\n" + << sep << "\n" + << *this << "\n" + << sep << std::endl; } else { - Log::debug() << "Compress result: unable to compress" << "\n" << sep << std::endl; + Log::debug() << "Compress result: unable to compress" + << "\n" + << sep << std::endl; } } diff --git a/src/mir/action/transform/ShToGridded.cc b/src/mir/action/transform/ShToGridded.cc index 043d47bfd..48d3a3cfd 100644 --- a/src/mir/action/transform/ShToGridded.cc +++ b/src/mir/action/transform/ShToGridded.cc @@ -187,8 +187,8 @@ void ShToGridded::transform(data::MIRField& field, const repres::Representation& } else if (!creator.supported()) { - Log::warning() << "ShToGridded: LegendreCacheCreator is not supported for:" << "\n representation: " - << representation << "\n options: " << options_ << std::endl + Log::warning() << "ShToGridded: LegendreCacheCreator is not supported for:" + << "\n representation: " << representation << "\n options: " << options_ << std::endl << "ShToGridded: continuing with hindered performance" << std::endl; trans = atlas_trans_t(grid, domain, truncation, options_); @@ -317,8 +317,9 @@ bool ShToGridded::mergeWithNext(const Action& next) { repres::RepresentationHandle out(outputRepresentation()); cropping_.boundingBox(out->extendBoundingBox(bbox)); - Log::debug() << "ShToGridded::mergeWithNext: " << "\n " << oldAction.str() << "\n + " << next - << "\n = " << *this << "\n + " << "(...)" << std::endl; + Log::debug() << "ShToGridded::mergeWithNext: " + << "\n " << oldAction.str() << "\n + " << next << "\n = " << *this << "\n + " + << "(...)" << std::endl; } return false; } diff --git a/src/mir/caching/InMemoryCache.cc b/src/mir/caching/InMemoryCache.cc index 975fb92b2..ff460e51c 100644 --- a/src/mir/caching/InMemoryCache.cc +++ b/src/mir/caching/InMemoryCache.cc @@ -113,8 +113,9 @@ void InMemoryCache::reserve(const InMemoryCacheUsage& usage) { auto u = usage; auto p = (f + u) - c; - Log::debug() << "CACHE-RESERVE-" << name_ << " " << " => " << u << " footprint: " << f << " capacity: " << c - << " f+u: " << f + u << " f+u-c: " << p << std::endl; + Log::debug() << "CACHE-RESERVE-" << name_ << " " + << " => " << u << " footprint: " << f << " capacity: " << c << " f+u: " << f + u << " f+u-c: " << p + << std::endl; if (p) { diff --git a/src/mir/compare/Field.cc b/src/mir/compare/Field.cc index 4e29166dd..864dad5c4 100644 --- a/src/mir/compare/Field.cc +++ b/src/mir/compare/Field.cc @@ -13,6 +13,7 @@ #include #include +#include "eckit/log/JSON.h" #include "eckit/option/CmdArgs.h" #include "eckit/option/SimpleOption.h" diff --git a/src/mir/compare/FieldComparator.cc b/src/mir/compare/FieldComparator.cc index 650c8268a..e99fc1350 100644 --- a/src/mir/compare/FieldComparator.cc +++ b/src/mir/compare/FieldComparator.cc @@ -569,14 +569,16 @@ void FieldComparator::compareFieldStatistics(const MultiFile& multi1, const Mult constexpr double relativeErrorMax = 0.01; if (s1.values_ != s2.values_) { - Log::info() << "Number of data values mismatch:" << "\n " << multi1 << ": " << s1.values_ << " " << field1 - << "\n " << multi2 << ": " << s2.values_ << " " << field2 << std::endl; + Log::info() << "Number of data values mismatch:" + << "\n " << multi1 << ": " << s1.values_ << " " << field1 << "\n " << multi2 << ": " << s2.values_ + << " " << field2 << std::endl; error("statistics-mismatches"); } if (s1.missing_ != s2.missing_) { - Log::info() << "Number of missing values mismatch:" << "\n " << multi1 << ": " << s1.missing_ << " " << field1 - << "\n " << multi2 << ": " << s2.missing_ << " " << field2 << std::endl; + Log::info() << "Number of missing values mismatch:" + << "\n " << multi1 << ": " << s1.missing_ << " " << field1 << "\n " << multi2 << ": " + << s2.missing_ << " " << field2 << std::endl; error("statistics-mismatches"); } @@ -641,8 +643,9 @@ void FieldComparator::compareFieldValues(const FieldComparator::MultiFile& multi auto problems = comp->execute(input1->field(), input2->field()); if (!problems.empty()) { - Log::info() << "Value compare failed between:" << "\n " << multi1 << ": " << field1 << "\n " << multi2 - << ": " << field2 << "\n reporting " << *comp << "\n failed because" << problems << std::endl; + Log::info() << "Value compare failed between:" + << "\n " << multi1 << ": " << field1 << "\n " << multi2 << ": " << field2 << "\n reporting " + << *comp << "\n failed because" << problems << std::endl; error("values-mismatches"); } } @@ -669,8 +672,9 @@ void FieldComparator::compareFieldMissingValues(const FieldComparator::MultiFile auto problems = comp->execute(input1->field(), input2->field()); if (!problems.empty()) { - Log::info() << "Value compare failed between:" << "\n " << multi1 << ": " << field1 << "\n " << multi2 << ": " - << field2 << "\n reporting " << *comp << "\n failed because" << problems << std::endl; + Log::info() << "Value compare failed between:" + << "\n " << multi1 << ": " << field1 << "\n " << multi2 << ": " << field2 << "\n reporting " + << *comp << "\n failed because" << problems << std::endl; error("values-mismatches"); } } @@ -733,7 +737,8 @@ void FieldComparator::missingField(const MultiFile& multi1, const MultiFile& mul std::vector matches = field.bestMatches(fields); if (!matches.empty()) { - Log::info() << " ? " << "No match found in " << multi2 << std::endl; + Log::info() << " ? " + << "No match found in " << multi2 << std::endl; size_t cnt = 0; auto flds = field.sortByDifference(fields); @@ -781,7 +786,8 @@ void FieldComparator::missingField(const MultiFile& multi1, const MultiFile& mul } else { - Log::info() << " + " << "Possible matched in " << multi2 << std::endl; + Log::info() << " + " + << "Possible matched in " << multi2 << std::endl; size_t cnt = 0; for (const auto& other : matches) { @@ -845,8 +851,8 @@ void FieldComparator::compareCounts(const std::string& name, const MultiFile& mu size_t n2 = count(multi2, fields2); if (n1 != n2) { - Log::info() << name << " count mismatch" << "\n " << n1 << " " << multi1 << "\n " << n2 << " " << multi2 - << std::endl; + Log::info() << name << " count mismatch" + << "\n " << n1 << " " << multi1 << "\n " << n2 << " " << multi2 << std::endl; error("count-mismatches"); } } diff --git a/src/mir/data/CartesianVector2DField.cc b/src/mir/data/CartesianVector2DField.cc index 27d501fe8..46d49dc96 100644 --- a/src/mir/data/CartesianVector2DField.cc +++ b/src/mir/data/CartesianVector2DField.cc @@ -95,7 +95,8 @@ void CartesianVector2DField::rotate(const util::Rotation& rotation, MIRValuesVec void CartesianVector2DField::print(std::ostream& out) const { - out << "CartesianVector2DField[" << "]"; + out << "CartesianVector2DField[" + << "]"; } diff --git a/src/mir/input/GribInput.cc b/src/mir/input/GribInput.cc index 4c78649ec..a238aa7a6 100644 --- a/src/mir/input/GribInput.cc +++ b/src/mir/input/GribInput.cc @@ -127,7 +127,8 @@ bool ConditionT::eval(grib_handle* h) const { } if (err != 0) { - Log::debug() << "ConditionT::eval(" << ",key=" << key_ << ") failed " << err << std::endl; + Log::debug() << "ConditionT::eval(" + << ",key=" << key_ << ") failed " << err << std::endl; GRIB_ERROR(err, key_); } diff --git a/src/mir/method/MethodWeighted.cc b/src/mir/method/MethodWeighted.cc index 988d74c73..4108af1b8 100644 --- a/src/mir/method/MethodWeighted.cc +++ b/src/mir/method/MethodWeighted.cc @@ -272,7 +272,8 @@ const WeightMatrix& MethodWeighted::getMatrix(context::Context& ctx, const repre j << "interpolation"; j.startObject(); - j << "engine" << "mir"; + j << "engine" + << "mir"; j << "version" << caching::WeightCache::version(); const static std::map KNOWN_METHOD{ {"73e1dd539879ffbbbb22d6bc789c2262", "linear"}, diff --git a/src/mir/method/fe/CalculateCellLongestDiagonal.cc b/src/mir/method/fe/CalculateCellLongestDiagonal.cc index 4f9ff9300..61b69e03c 100644 --- a/src/mir/method/fe/CalculateCellLongestDiagonal.cc +++ b/src/mir/method/fe/CalculateCellLongestDiagonal.cc @@ -86,6 +86,7 @@ double CalculateCellLongestDiagonal::operator()(atlas::Mesh& mesh, bool include_ d = std::max(d, util::Earth::distance(P[ni], P[nj])); if (d > dMax) { Log::warning() << "CalculateCellLongestDiagonal: limited to maximum " << dMax << "m"; + mesh.metadata().set(name_, dMax); return dMax; } } diff --git a/src/mir/method/gridbox/GridBoxAverage.cc b/src/mir/method/gridbox/GridBoxAverage.cc index 5ae9cd686..72799a97c 100644 --- a/src/mir/method/gridbox/GridBoxAverage.cc +++ b/src/mir/method/gridbox/GridBoxAverage.cc @@ -12,6 +12,25 @@ #include "mir/method/gridbox/GridBoxAverage.h" +#include +#include +#include +#include +#include + +#include "eckit/types/FloatCompare.h" + +#include "mir/param/MIRParametrisation.h" +#include "mir/repres/Iterator.h" +#include "mir/repres/Representation.h" +#include "mir/search/PointSearch.h" +#include "mir/util/Domain.h" +#include "mir/util/Exceptions.h" +#include "mir/util/GridBox.h" +#include "mir/util/Log.h" +#include "mir/util/Point2ToPoint3.h" +#include "mir/util/Trace.h" + namespace mir::method::gridbox { @@ -19,4 +38,155 @@ namespace mir::method::gridbox { static const MethodBuilder __builder("grid-box-average"); +GridBoxAverage::GridBoxAverage(const param::MIRParametrisation& parametrisation) : GridBoxMethod(parametrisation) { + if (parametrisation.userParametrisation().has("rotation") || + parametrisation.fieldParametrisation().has("rotation")) { + throw exception::UserError("GridBoxMethod: rotated input/output not supported"); + } +} + + +void GridBoxAverage::assemble(util::MIRStatistics& /*unused*/, WeightMatrix& W, const repres::Representation& in, + const repres::Representation& out) const { + auto& log = Log::debug(); + log << "GridBoxMethod::assemble (input: " << in << ", output: " << out << ")" << std::endl; + + + if (!in.domain().contains(out.domain())) { + std::ostringstream msg; + msg << "GridBoxMethod: input must contain output (input:" << in.domain() << ", output:" << out.domain() << ")"; + throw exception::UserError(msg.str()); + } + + const Log::Plural gridBoxes("grid box", "grid boxes"); + log << "GridBoxMethod: intersect " << Log::Pretty(out.numberOfPoints()) << " from " + << Log::Pretty(in.numberOfPoints(), gridBoxes) << std::endl; + + + // init structure used to fill in sparse matrix + // TODO: triplets, really? why not writing to the matrix directly? + std::vector weights_triplets; + std::vector triplets; + std::vector closest; + + + // set input and output grid boxes + struct GridBoxes : std::vector { + explicit GridBoxes(const repres::Representation& rep) : vector(rep.gridBoxes()) { + ASSERT(size() == rep.numberOfPoints()); + } + + double getLongestGridBoxDiagonal() const { + double R = 0.; + for (const auto& box : *this) { + R = std::max(R, box.diagonal()); + } + ASSERT(R > 0.); + return R; + } + }; + + const GridBoxes inBoxes(in); + const GridBoxes outBoxes(out); + const auto R = inBoxes.getLongestGridBoxDiagonal() + outBoxes.getLongestGridBoxDiagonal(); + + util::Point2ToPoint3 point3(in, poleDisplacement()); + + size_t nbFailures = 0; + std::forward_list> failures; + + + // set input k-d tree for grid boxes indices + std::unique_ptr tree; + { + trace::ResourceUsage usage("GridBoxMethod::assemble create k-d tree"); + tree = std::make_unique(parametrisation_, in); + } + + { + trace::ProgressTimer progress("Intersecting", outBoxes.size(), gridBoxes); + + for (const std::unique_ptr it(out.iterator()); it->next();) { + if (++progress) { + log << *tree << std::endl; + } + + + // lookup + tree->closestWithinRadius(point3(*(*it)), R, closest); + ASSERT(!closest.empty()); + + + // calculate grid box intersections + triplets.clear(); + triplets.reserve(closest.size()); + + auto i = it->index(); + const auto& box = outBoxes.at(i); + double area = box.area(); + ASSERT(area > 0.); + + double sumSmallAreas = 0.; + bool areaMatch = false; + for (auto& c : closest) { + auto j = c.payload(); + auto smallBox = inBoxes.at(j); + + if (box.intersects(smallBox)) { + double smallArea = smallBox.area(); + ASSERT(smallArea > 0.); + + triplets.emplace_back(i, j, smallArea / area); + sumSmallAreas += smallArea; + + if ((areaMatch = eckit::types::is_approximately_equal(area, sumSmallAreas, 1. /*m^2*/))) { + break; + } + } + } + + + // insert the interpolant weights into the global (sparse) interpolant matrix + if (areaMatch) { + std::copy(triplets.begin(), triplets.end(), std::back_inserter(weights_triplets)); + } + else { + ++nbFailures; + failures.emplace_front(i, it->pointUnrotated()); + } + } + } + log << "Intersected " << Log::Pretty(weights_triplets.size(), gridBoxes) << std::endl; + + if (nbFailures > 0) { + auto& warning = Log::warning(); + warning << "Failed to intersect " << Log::Pretty(nbFailures, gridBoxes) << ":"; + size_t count = 0; + for (const auto& f : failures) { + warning << "\n\tpoint " << f.first << " " << f.second; + if (++count > 10) { + warning << "\n\t..."; + break; + } + } + warning << std::endl; + } + + + // fill sparse matrix + ASSERT_NONEMPTY_INTERPOLATION("GridBoxMethod", !weights_triplets.empty()); + W.setFromTriplets(weights_triplets); +} + + +const char* GridBoxAverage::name() const { + return "grid-box-average"; +} + + +int GridBoxAverage::version() const { + return 3; +} + + } // namespace mir::method::gridbox diff --git a/src/mir/method/gridbox/GridBoxAverage.h b/src/mir/method/gridbox/GridBoxAverage.h index cba662fe1..8d4700890 100644 --- a/src/mir/method/gridbox/GridBoxAverage.h +++ b/src/mir/method/gridbox/GridBoxAverage.h @@ -19,7 +19,12 @@ namespace mir::method::gridbox { struct GridBoxAverage final : GridBoxMethod { - using GridBoxMethod::GridBoxMethod; + explicit GridBoxAverage(const param::MIRParametrisation&); + + void assemble(util::MIRStatistics&, WeightMatrix&, const repres::Representation& in, + const repres::Representation& out) const override; + const char* name() const override; + int version() const override; }; diff --git a/src/mir/method/gridbox/GridBoxMethod.cc b/src/mir/method/gridbox/GridBoxMethod.cc index 28c55058b..4e917e3ba 100644 --- a/src/mir/method/gridbox/GridBoxMethod.cc +++ b/src/mir/method/gridbox/GridBoxMethod.cc @@ -12,179 +12,19 @@ #include "mir/method/gridbox/GridBoxMethod.h" -#include -#include -#include -#include - #include "eckit/log/JSON.h" -#include "eckit/types/FloatCompare.h" #include "eckit/utils/MD5.h" -#include "mir/param/MIRParametrisation.h" -#include "mir/repres/Iterator.h" -#include "mir/repres/Representation.h" -#include "mir/search/PointSearch.h" -#include "mir/util/Domain.h" -#include "mir/util/Exceptions.h" -#include "mir/util/GridBox.h" -#include "mir/util/Log.h" -#include "mir/util/Point2ToPoint3.h" -#include "mir/util/Trace.h" -#include "mir/util/Types.h" - namespace mir::method::gridbox { -GridBoxMethod::GridBoxMethod(const param::MIRParametrisation& parametrisation) : MethodWeighted(parametrisation) { - if (parametrisation.userParametrisation().has("rotation") || - parametrisation.fieldParametrisation().has("rotation")) { - throw exception::UserError("GridBoxMethod: rotated input/output not supported"); - } -} - - bool GridBoxMethod::sameAs(const Method& other) const { const auto* o = dynamic_cast(&other); return (o != nullptr) && name() == o->name() && MethodWeighted::sameAs(*o); } -void GridBoxMethod::assemble(util::MIRStatistics& /*unused*/, WeightMatrix& W, const repres::Representation& in, - const repres::Representation& out) const { - auto& log = Log::debug(); - log << "GridBoxMethod::assemble (input: " << in << ", output: " << out << ")" << std::endl; - - - if (!in.domain().contains(out.domain())) { - std::ostringstream msg; - msg << "GridBoxMethod: input must contain output (input:" << in.domain() << ", output:" << out.domain() << ")"; - throw exception::UserError(msg.str()); - } - - const Log::Plural gridBoxes("grid box", "grid boxes"); - log << "GridBoxMethod: intersect " << Log::Pretty(out.numberOfPoints()) << " from " - << Log::Pretty(in.numberOfPoints(), gridBoxes) << std::endl; - - - // init structure used to fill in sparse matrix - // TODO: triplets, really? why not writing to the matrix directly? - std::vector weights_triplets; - std::vector triplets; - std::vector closest; - - - // set input and output grid boxes - struct GridBoxes : std::vector { - explicit GridBoxes(const repres::Representation& rep) : vector(rep.gridBoxes()) { - ASSERT(size() == rep.numberOfPoints()); - } - - double getLongestGridBoxDiagonal() const { - double R = 0.; - for (const auto& box : *this) { - R = std::max(R, box.diagonal()); - } - ASSERT(R > 0.); - return R; - } - }; - - const GridBoxes inBoxes(in); - const GridBoxes outBoxes(out); - const auto R = inBoxes.getLongestGridBoxDiagonal() + outBoxes.getLongestGridBoxDiagonal(); - - util::Point2ToPoint3 point3(in, poleDisplacement()); - - size_t nbFailures = 0; - using failed_intersection_t = std::pair; - std::forward_list failures; - - - // set input k-d tree for grid boxes indices - std::unique_ptr tree; - { - trace::ResourceUsage usage("GridBoxMethod::assemble create k-d tree"); - tree = std::make_unique(parametrisation_, in); - } - - { - trace::ProgressTimer progress("Intersecting", outBoxes.size(), gridBoxes); - - for (const std::unique_ptr it(out.iterator()); it->next();) { - if (++progress) { - log << *tree << std::endl; - } - - - // lookup - tree->closestWithinRadius(point3(*(*it)), R, closest); - ASSERT(!closest.empty()); - - - // calculate grid box intersections - triplets.clear(); - triplets.reserve(closest.size()); - - auto i = it->index(); - const auto& box = outBoxes.at(i); - double area = box.area(); - ASSERT(area > 0.); - - double sumSmallAreas = 0.; - bool areaMatch = false; - for (auto& c : closest) { - auto j = c.payload(); - auto smallBox = inBoxes.at(j); - - if (box.intersects(smallBox)) { - double smallArea = smallBox.area(); - ASSERT(smallArea > 0.); - - triplets.emplace_back(i, j, smallArea / area); - sumSmallAreas += smallArea; - - if ((areaMatch = eckit::types::is_approximately_equal(area, sumSmallAreas, 1. /*m^2*/))) { - break; - } - } - } - - - // insert the interpolant weights into the global (sparse) interpolant matrix - if (areaMatch) { - std::copy(triplets.begin(), triplets.end(), std::back_inserter(weights_triplets)); - } - else { - ++nbFailures; - failures.emplace_front(i, it->pointUnrotated()); - } - } - } - log << "Intersected " << Log::Pretty(weights_triplets.size(), gridBoxes) << std::endl; - - if (nbFailures > 0) { - auto& warning = Log::warning(); - warning << "Failed to intersect " << Log::Pretty(nbFailures, gridBoxes) << ":"; - size_t count = 0; - for (const auto& f : failures) { - warning << "\n\tpoint " << f.first << " " << f.second; - if (++count > 10) { - warning << "\n\t..."; - break; - } - } - warning << std::endl; - } - - - // fill sparse matrix - ASSERT_NONEMPTY_INTERPOLATION("GridBoxMethod", !weights_triplets.empty()); - W.setFromTriplets(weights_triplets); -} - - void GridBoxMethod::hash(eckit::MD5& md5) const { MethodWeighted::hash(md5); md5.add(name()); @@ -210,14 +50,4 @@ bool GridBoxMethod::validateMatrixWeights() const { } -const char* GridBoxMethod::name() const { - return "grid-box"; -} - - -int GridBoxMethod::version() const { - return 2; -} - - } // namespace mir::method::gridbox diff --git a/src/mir/method/gridbox/GridBoxMethod.h b/src/mir/method/gridbox/GridBoxMethod.h index c9a7f7e39..e36210ac2 100644 --- a/src/mir/method/gridbox/GridBoxMethod.h +++ b/src/mir/method/gridbox/GridBoxMethod.h @@ -20,18 +20,14 @@ namespace mir::method::gridbox { class GridBoxMethod : public MethodWeighted { public: - explicit GridBoxMethod(const param::MIRParametrisation&); + using MethodWeighted::MethodWeighted; private: void hash(eckit::MD5&) const override; - void assemble(util::MIRStatistics&, WeightMatrix&, const repres::Representation& in, - const repres::Representation& out) const override; bool sameAs(const Method&) const override; void json(eckit::JSON&) const override; void print(std::ostream&) const override; bool validateMatrixWeights() const override; - const char* name() const override; - int version() const override; }; diff --git a/src/mir/method/gridbox/GridBoxStatistics.cc b/src/mir/method/gridbox/GridBoxStatistics.cc index 947c4b83b..6401a8119 100644 --- a/src/mir/method/gridbox/GridBoxStatistics.cc +++ b/src/mir/method/gridbox/GridBoxStatistics.cc @@ -12,14 +12,32 @@ #include "mir/method/gridbox/GridBoxStatistics.h" +#include +#include +#include +#include +#include + +#include "mir/method/gridbox/GridBoxMethod.h" #include "mir/method/solver/Statistics.h" #include "mir/param/MIRParametrisation.h" +#include "mir/repres/Representation.h" +#include "mir/search/PointSearch.h" #include "mir/stats/Field.h" +#include "mir/util/Domain.h" +#include "mir/util/Exceptions.h" +#include "mir/util/GridBox.h" +#include "mir/util/Log.h" +#include "mir/util/Point2ToPoint3.h" +#include "mir/util/Trace.h" namespace mir::method::gridbox { +static const MethodBuilder __builder("grid-box-statistics"); + + GridBoxStatistics::GridBoxStatistics(const param::MIRParametrisation& param) : GridBoxMethod(param) { std::string stats = "maximum"; param.get("interpolation-statistics", stats); @@ -28,7 +46,143 @@ GridBoxStatistics::GridBoxStatistics(const param::MIRParametrisation& param) : G } -static const MethodBuilder __builder("grid-box-statistics"); +void GridBoxStatistics::assemble(util::MIRStatistics& /*unused*/, WeightMatrix& W, const repres::Representation& in, + const repres::Representation& out) const { + auto& log = Log::debug(); + log << "GridBoxStatistics::assemble (input: " << in << ", output: " << out << ")" << std::endl; + + + if (!in.domain().contains(out.domain())) { + std::ostringstream msg; + msg << "GridBoxStatistics: input must contain output (input:" << in.domain() << ", output:" << out.domain() + << ")"; + throw exception::UserError(msg.str()); + } + + const Log::Plural boxes("grid box", "grid boxes"); + const Log::Plural points("point"); + log << "GridBoxStatistics: intersect " << Log::Pretty(out.numberOfPoints()) << " from " + << Log::Pretty(in.numberOfPoints(), boxes) << std::endl; + + + // init structure used to fill in sparse matrix + // TODO: triplets, really? why not writing to the matrix directly? + std::vector weights_triplets; + std::vector closest; + + + // set input and output grid boxes + struct GridBoxes : std::vector { + explicit GridBoxes(const repres::Representation& rep) : vector(rep.gridBoxes()) { + ASSERT(size() == rep.numberOfPoints()); + } + + double getLongestGridBoxDiagonal() const { + double R = 0.; + for (const auto& box : *this) { + R = std::max(R, box.diagonal()); + } + ASSERT(R > 0.); + return R; + } + }; + + const GridBoxes outBoxes(out); + + util::Point2ToPoint3 point3(in, poleDisplacement()); + + size_t nbFailures = 0; + std::forward_list> failures; + + + // set input k-d tree for grid boxes indices + std::unique_ptr tree; + { + trace::ResourceUsage usage("GridBoxStatistics::assemble create k-d tree"); + tree = std::make_unique(parametrisation_, in); + } + + { + trace::ProgressTimer progress("Containing", outBoxes.size(), boxes); + + const auto R = outBoxes.getLongestGridBoxDiagonal(); + + auto point_2D = [](const Point3& point) -> Point2 { + atlas::PointLonLat pll; + util::Earth::convertCartesianToSpherical(point, pll); + + // notice the order + return {pll[1], pll[0]}; + }; + + for (size_t i = 0; i < outBoxes.size(); ++i) { + if (++progress) { + log << *tree << std::endl; + } + + + // lookup + const auto& box = outBoxes[i]; + tree->closestWithinRadius(point3(box.centre()), R, closest); + if (closest.empty()) { + continue; + } + + + // calculate grid box contains + std::vector js; + for (auto& c : closest) { + if (box.contains(point_2D(c.point()))) { + js.emplace_back(c.payload()); + } + } + + + // insert the interpolant weights into the global (sparse) interpolant matrix + if (!js.empty()) { + std::sort(js.begin(), js.end()); + const auto weight = 1. / static_cast(js.size()); + for (auto j : js) { + weights_triplets.emplace_back(i, j, weight); + } + } + else { + ++nbFailures; + } + } + log << "Contained " << Log::Pretty(weights_triplets.size(), points) << " in " + << Log::Pretty(outBoxes.size(), boxes) << std::endl; + } + + if (nbFailures > 0) { + auto& warning = Log::warning(); + warning << "Failed to contain " << Log::Pretty(nbFailures, points); + size_t count = 0; + for (const auto& f : failures) { + warning << "\n\tpoint " << f.first << " " << f.second; + if (++count > 10) { + warning << "\n\t..."; + break; + } + } + warning << std::endl; + } + + + // fill sparse matrix + ASSERT_NONEMPTY_INTERPOLATION("GridBoxStatistics", !weights_triplets.empty()); + W.setFromTriplets(weights_triplets); +} + + +const char* GridBoxStatistics::name() const { + return "grid-box-statistics"; +} + + +int GridBoxStatistics::version() const { + return 3; +} } // namespace mir::method::gridbox diff --git a/src/mir/method/gridbox/GridBoxStatistics.h b/src/mir/method/gridbox/GridBoxStatistics.h index dd60a5409..d7271fd87 100644 --- a/src/mir/method/gridbox/GridBoxStatistics.h +++ b/src/mir/method/gridbox/GridBoxStatistics.h @@ -20,6 +20,11 @@ namespace mir::method::gridbox { struct GridBoxStatistics final : GridBoxMethod { explicit GridBoxStatistics(const param::MIRParametrisation&); + + void assemble(util::MIRStatistics&, WeightMatrix&, const repres::Representation& in, + const repres::Representation& out) const override; + const char* name() const override; + int version() const override; }; diff --git a/src/mir/method/knn/KNearestNeighbours.cc b/src/mir/method/knn/KNearestNeighbours.cc index f5effa807..2b945b4f5 100644 --- a/src/mir/method/knn/KNearestNeighbours.cc +++ b/src/mir/method/knn/KNearestNeighbours.cc @@ -15,6 +15,7 @@ #include #include +#include "eckit/log/JSON.h" #include "eckit/utils/MD5.h" #include "mir/method/knn/distance/DistanceWeighting.h" diff --git a/src/mir/method/knn/distance/ClimateFilter.cc b/src/mir/method/knn/distance/ClimateFilter.cc index a2e7a03e9..ad1550364 100644 --- a/src/mir/method/knn/distance/ClimateFilter.cc +++ b/src/mir/method/knn/distance/ClimateFilter.cc @@ -94,7 +94,8 @@ bool ClimateFilter::sameAs(const DistanceWeighting& other) const { void ClimateFilter::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "climate-filter"; + j << "type" + << "climate-filter"; j << "climate-filter-delta" << delta_; j.endObject(); } diff --git a/src/mir/method/knn/distance/Cressman.cc b/src/mir/method/knn/distance/Cressman.cc index 8dcf72513..45fd94ee6 100644 --- a/src/mir/method/knn/distance/Cressman.cc +++ b/src/mir/method/knn/distance/Cressman.cc @@ -72,7 +72,8 @@ bool Cressman::sameAs(const DistanceWeighting& other) const { void Cressman::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "cressman"; + j << "type" + << "cressman"; j.endList(); } diff --git a/src/mir/method/knn/distance/DistanceWeightingWithLSM.cc b/src/mir/method/knn/distance/DistanceWeightingWithLSM.cc index cbd05057a..672f0da1d 100644 --- a/src/mir/method/knn/distance/DistanceWeightingWithLSM.cc +++ b/src/mir/method/knn/distance/DistanceWeightingWithLSM.cc @@ -65,7 +65,8 @@ bool DistanceWeightingWithLSM::sameAs(const DistanceWeighting& other) const { void DistanceWeightingWithLSM::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "distance-weighting-with-lsm"; + j << "type" + << "distance-weighting-with-lsm"; j << "distance-weighting-with-lsm" << method_; j.endObject(); } diff --git a/src/mir/method/knn/distance/GaussianDistanceWeighting.cc b/src/mir/method/knn/distance/GaussianDistanceWeighting.cc index c162a2550..053f5e87b 100644 --- a/src/mir/method/knn/distance/GaussianDistanceWeighting.cc +++ b/src/mir/method/knn/distance/GaussianDistanceWeighting.cc @@ -75,7 +75,8 @@ bool GaussianDistanceWeighting::sameAs(const DistanceWeighting& other) const { void GaussianDistanceWeighting::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "gaussian"; + j << "type" + << "gaussian"; j << "distance-weighting-gaussian-stddev" << stddev_; j.endObject(); } diff --git a/src/mir/method/knn/distance/InverseDistanceWeighting.cc b/src/mir/method/knn/distance/InverseDistanceWeighting.cc index 4ab703eab..c51fcf9c2 100644 --- a/src/mir/method/knn/distance/InverseDistanceWeighting.cc +++ b/src/mir/method/knn/distance/InverseDistanceWeighting.cc @@ -84,7 +84,8 @@ bool InverseDistanceWeighting::sameAs(const DistanceWeighting& other) const { void InverseDistanceWeighting::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "inverse-distance-weighting"; + j << "type" + << "inverse-distance-weighting"; j << "inverse-distance-weighting-power" << power_; j.endObject(); } diff --git a/src/mir/method/knn/distance/InverseDistanceWeightingSquared.cc b/src/mir/method/knn/distance/InverseDistanceWeightingSquared.cc index 54882c00a..931b406f8 100644 --- a/src/mir/method/knn/distance/InverseDistanceWeightingSquared.cc +++ b/src/mir/method/knn/distance/InverseDistanceWeightingSquared.cc @@ -64,7 +64,8 @@ bool InverseDistanceWeightingSquared::sameAs(const DistanceWeighting& other) con void InverseDistanceWeightingSquared::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "inverse-distance-weighting-squared"; + j << "type" + << "inverse-distance-weighting-squared"; j.endObject(); } diff --git a/src/mir/method/knn/distance/NearestLSM.cc b/src/mir/method/knn/distance/NearestLSM.cc index 11a877483..a975ebb0d 100644 --- a/src/mir/method/knn/distance/NearestLSM.cc +++ b/src/mir/method/knn/distance/NearestLSM.cc @@ -69,7 +69,8 @@ bool NearestLSM::sameAs(const DistanceWeighting& other) const { void NearestLSM::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "nearest-lsm"; + j << "type" + << "nearest-lsm"; j.endObject(); } diff --git a/src/mir/method/knn/distance/NearestLSMWithLowestIndex.cc b/src/mir/method/knn/distance/NearestLSMWithLowestIndex.cc index 96c091c81..105fb5f42 100644 --- a/src/mir/method/knn/distance/NearestLSMWithLowestIndex.cc +++ b/src/mir/method/knn/distance/NearestLSMWithLowestIndex.cc @@ -87,7 +87,8 @@ bool NearestLSMWithLowestIndex::sameAs(const DistanceWeighting& other) const { void NearestLSMWithLowestIndex::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "nearest-lsm-with-lowest-index"; + j << "type" + << "nearest-lsm-with-lowest-index"; j.endObject(); } diff --git a/src/mir/method/knn/distance/NearestNeighbour.cc b/src/mir/method/knn/distance/NearestNeighbour.cc index f7d06dec1..e8fa33508 100644 --- a/src/mir/method/knn/distance/NearestNeighbour.cc +++ b/src/mir/method/knn/distance/NearestNeighbour.cc @@ -43,7 +43,8 @@ bool NearestNeighbour::sameAs(const DistanceWeighting& other) const { void NearestNeighbour::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "nearest-neighbour"; + j << "type" + << "nearest-neighbour"; j.endObject(); } diff --git a/src/mir/method/knn/distance/NoDistanceWeighting.cc b/src/mir/method/knn/distance/NoDistanceWeighting.cc index 0c0b8eee1..de5213b3f 100644 --- a/src/mir/method/knn/distance/NoDistanceWeighting.cc +++ b/src/mir/method/knn/distance/NoDistanceWeighting.cc @@ -50,7 +50,8 @@ bool NoDistanceWeighting::sameAs(const DistanceWeighting& other) const { void NoDistanceWeighting::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "no"; + j << "type" + << "no"; j.endObject(); } diff --git a/src/mir/method/knn/distance/PseudoLaplace.cc b/src/mir/method/knn/distance/PseudoLaplace.cc index 270e1935c..f0f577ccd 100644 --- a/src/mir/method/knn/distance/PseudoLaplace.cc +++ b/src/mir/method/knn/distance/PseudoLaplace.cc @@ -109,7 +109,8 @@ bool PseudoLaplace::sameAs(const DistanceWeighting& other) const { void PseudoLaplace::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "pseudo-laplace"; + j << "type" + << "pseudo-laplace"; j.endObject(); } diff --git a/src/mir/method/knn/pick/Distance.cc b/src/mir/method/knn/pick/Distance.cc index 0a310dbb8..f41da3b64 100644 --- a/src/mir/method/knn/pick/Distance.cc +++ b/src/mir/method/knn/pick/Distance.cc @@ -49,7 +49,8 @@ bool Distance::sameAs(const Pick& other) const { void Distance::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "distance"; + j << "type" + << "distance"; j << "distance" << distance_; j.endObject(); } diff --git a/src/mir/method/knn/pick/DistanceAndNClosest.cc b/src/mir/method/knn/pick/DistanceAndNClosest.cc index 817527f07..2d9496a95 100644 --- a/src/mir/method/knn/pick/DistanceAndNClosest.cc +++ b/src/mir/method/knn/pick/DistanceAndNClosest.cc @@ -53,7 +53,8 @@ bool DistanceAndNClosest::sameAs(const Pick& other) const { void DistanceAndNClosest::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "distance-and-nclosest"; + j << "type" + << "distance-and-nclosest"; j << "nclosest" << nClosest_; j << "distance" << distance_; j.endObject(); diff --git a/src/mir/method/knn/pick/DistanceOrNClosest.cc b/src/mir/method/knn/pick/DistanceOrNClosest.cc index 2e0641a9a..4ed611c30 100644 --- a/src/mir/method/knn/pick/DistanceOrNClosest.cc +++ b/src/mir/method/knn/pick/DistanceOrNClosest.cc @@ -53,7 +53,8 @@ bool DistanceOrNClosest::sameAs(const Pick& other) const { void DistanceOrNClosest::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "distance-or-nclosest"; + j << "type" + << "distance-or-nclosest"; j << "nclosest" << nClosest_; j << "distance" << distance_; j.endObject(); diff --git a/src/mir/method/knn/pick/LongestElementDiagonalAndNClosest.cc b/src/mir/method/knn/pick/LongestElementDiagonalAndNClosest.cc index 48cede5fd..2ca1a307f 100644 --- a/src/mir/method/knn/pick/LongestElementDiagonalAndNClosest.cc +++ b/src/mir/method/knn/pick/LongestElementDiagonalAndNClosest.cc @@ -81,7 +81,8 @@ void LongestElementDiagonalAndNClosest::distance(const repres::Representation& i void LongestElementDiagonalAndNClosest::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "longest-element-diagonal-and-nclosest"; + j << "type" + << "longest-element-diagonal-and-nclosest"; j << "nclosest" << nClosest_; j << "distance" << distance_; j.endObject(); diff --git a/src/mir/method/knn/pick/NClosest.cc b/src/mir/method/knn/pick/NClosest.cc index 3e3ec1b59..fc0aacce8 100644 --- a/src/mir/method/knn/pick/NClosest.cc +++ b/src/mir/method/knn/pick/NClosest.cc @@ -48,7 +48,8 @@ bool NClosest::sameAs(const Pick& other) const { void NClosest::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "nclosest"; + j << "type" + << "nclosest"; j << "nclosest" << nClosest_; j.endObject(); } diff --git a/src/mir/method/knn/pick/NClosestOrNearest.cc b/src/mir/method/knn/pick/NClosestOrNearest.cc index d26b06fe3..21477d1f3 100644 --- a/src/mir/method/knn/pick/NClosestOrNearest.cc +++ b/src/mir/method/knn/pick/NClosestOrNearest.cc @@ -83,7 +83,8 @@ bool NClosestOrNearest::sameAs(const Pick& other) const { void NClosestOrNearest::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "nclosest-or-nearest"; + j << "type" + << "nclosest-or-nearest"; j << "nclosest" << nClosest_; j << "distanceTolerance" << distanceTolerance_; j.endObject(); diff --git a/src/mir/method/knn/pick/NearestNeighbourWithLowestIndex.cc b/src/mir/method/knn/pick/NearestNeighbourWithLowestIndex.cc index 388187504..3851adef1 100644 --- a/src/mir/method/knn/pick/NearestNeighbourWithLowestIndex.cc +++ b/src/mir/method/knn/pick/NearestNeighbourWithLowestIndex.cc @@ -76,7 +76,8 @@ bool NearestNeighbourWithLowestIndex::sameAs(const Pick& other) const { void NearestNeighbourWithLowestIndex::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "nearest-neighbour-with-lowest-index"; + j << "type" + << "nearest-neighbour-with-lowest-index"; j << "nclosest" << nClosest_; j.endObject(); } diff --git a/src/mir/method/knn/pick/Sample.cc b/src/mir/method/knn/pick/Sample.cc index b40d12eb7..527e8ef91 100644 --- a/src/mir/method/knn/pick/Sample.cc +++ b/src/mir/method/knn/pick/Sample.cc @@ -68,7 +68,8 @@ bool Sample::sameAs(const Pick& other) const { void Sample::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "sample"; + j << "type" + << "sample"; j << "nclosest" << nClosest_; j << "distance" << distance_; j.endObject(); diff --git a/src/mir/method/knn/pick/SortedSample.cc b/src/mir/method/knn/pick/SortedSample.cc index efc0abd2b..05c10d06e 100644 --- a/src/mir/method/knn/pick/SortedSample.cc +++ b/src/mir/method/knn/pick/SortedSample.cc @@ -52,7 +52,8 @@ void SortedSample::hash(eckit::MD5& h) const { void SortedSample::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "sorted-sample"; + j << "type" + << "sorted-sample"; j << "sample" << sample_; j.endObject(); } diff --git a/src/mir/method/nonlinear/Heaviest.cc b/src/mir/method/nonlinear/Heaviest.cc index 36e18d523..abe648ed5 100644 --- a/src/mir/method/nonlinear/Heaviest.cc +++ b/src/mir/method/nonlinear/Heaviest.cc @@ -77,7 +77,8 @@ void Heaviest::hash(eckit::MD5& h) const { void Heaviest::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "heaviest"; + j << "type" + << "heaviest"; j.endObject(); } diff --git a/src/mir/method/nonlinear/MissingIfAllMissing.cc b/src/mir/method/nonlinear/MissingIfAllMissing.cc index 5dd9b4054..772e378f4 100644 --- a/src/mir/method/nonlinear/MissingIfAllMissing.cc +++ b/src/mir/method/nonlinear/MissingIfAllMissing.cc @@ -111,7 +111,8 @@ void MissingIfAllMissing::hash(eckit::MD5& h) const { void MissingIfAllMissing::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "missing-if-all-missing"; + j << "type" + << "missing-if-all-missing"; j.endObject(); } diff --git a/src/mir/method/nonlinear/MissingIfAnyMissing.cc b/src/mir/method/nonlinear/MissingIfAnyMissing.cc index d4493caea..ad354ad16 100644 --- a/src/mir/method/nonlinear/MissingIfAnyMissing.cc +++ b/src/mir/method/nonlinear/MissingIfAnyMissing.cc @@ -93,7 +93,8 @@ void MissingIfAnyMissing::hash(eckit::MD5& h) const { void MissingIfAnyMissing::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "missing-if-any-missing"; + j << "type" + << "missing-if-any-missing"; j.endObject(); } diff --git a/src/mir/method/nonlinear/MissingIfHeaviestMissing.cc b/src/mir/method/nonlinear/MissingIfHeaviestMissing.cc index 16454002d..d7cca8288 100644 --- a/src/mir/method/nonlinear/MissingIfHeaviestMissing.cc +++ b/src/mir/method/nonlinear/MissingIfHeaviestMissing.cc @@ -116,7 +116,8 @@ void MissingIfHeaviestMissing::hash(eckit::MD5& h) const { void MissingIfHeaviestMissing::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "missing-if-heaviest-missing"; + j << "type" + << "missing-if-heaviest-missing"; j.endObject(); } diff --git a/src/mir/method/nonlinear/NoNonLinear.cc b/src/mir/method/nonlinear/NoNonLinear.cc index 9e25513d7..77be6419e 100644 --- a/src/mir/method/nonlinear/NoNonLinear.cc +++ b/src/mir/method/nonlinear/NoNonLinear.cc @@ -53,7 +53,8 @@ void NoNonLinear::hash(eckit::MD5& h) const { void NoNonLinear::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "no"; + j << "type" + << "no"; j.endObject(); } diff --git a/src/mir/method/nonlinear/SimulatedMissingValue.cc b/src/mir/method/nonlinear/SimulatedMissingValue.cc index 14b954f26..3e1b192c4 100644 --- a/src/mir/method/nonlinear/SimulatedMissingValue.cc +++ b/src/mir/method/nonlinear/SimulatedMissingValue.cc @@ -126,7 +126,8 @@ void SimulatedMissingValue::hash(eckit::MD5& h) const { void SimulatedMissingValue::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "simulated-missing-value"; + j << "type" + << "simulated-missing-value"; j << "missingValue" << missingValue_; j << "epsilon" << epsilon_; j.endObject(); diff --git a/src/mir/method/solver/Multiply.cc b/src/mir/method/solver/Multiply.cc index f9a94f856..5afe80f2c 100644 --- a/src/mir/method/solver/Multiply.cc +++ b/src/mir/method/solver/Multiply.cc @@ -69,7 +69,8 @@ void Multiply::hash(eckit::MD5& h) const { void Multiply::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "multiply"; + j << "type" + << "multiply"; j.endObject(); } diff --git a/src/mir/method/solver/Statistics.cc b/src/mir/method/solver/Statistics.cc index 673dc0e61..a6fb2531c 100644 --- a/src/mir/method/solver/Statistics.cc +++ b/src/mir/method/solver/Statistics.cc @@ -15,6 +15,7 @@ #include #include +#include "eckit/log/JSON.h" #include "eckit/utils/MD5.h" #include "mir/method/WeightMatrix.h" @@ -43,7 +44,8 @@ void Statistics::solve(const MethodWeighted::Matrix& A, const MethodWeighted::We WeightMatrix::const_iterator it(W); for (WeightMatrix::Size r = 0; r < W.rows(); ++r) { - stats_->reset(missingValue, std::isnan(missingValue)); + // comparison v == missingValue holds iff !isnan(missingValue) + stats_->reset(missingValue, !std::isnan(missingValue)); for (; it != W.end(r); ++it) { ASSERT(it.col() < N); @@ -74,7 +76,8 @@ void Statistics::hash(eckit::MD5& h) const { void Statistics::json(eckit::JSON& j) const { j.startObject(); - j << "type" << "statistics"; + j << "type" + << "statistics"; j << "statistics" << *stats_; j.endObject(); } diff --git a/src/mir/netcdf/DataInputVariable.h b/src/mir/netcdf/DataInputVariable.h index 431d63d4b..bf804d28a 100644 --- a/src/mir/netcdf/DataInputVariable.h +++ b/src/mir/netcdf/DataInputVariable.h @@ -36,7 +36,7 @@ class DataInputVariable : public InputVariable { size_t count2DValues() const override; void get2DValues(MIRValuesVector&, size_t i) const override; - // Used during identtification + // Used during identification void addCoordinateVariable(const Variable*) override; Variable* addMissingCoordinates() override; const char* kind() const override; diff --git a/src/mir/netcdf/Type.cc b/src/mir/netcdf/Type.cc index 03eb988f0..5006232da 100644 --- a/src/mir/netcdf/Type.cc +++ b/src/mir/netcdf/Type.cc @@ -414,9 +414,8 @@ Value* TypeT::attributeValue(int nc, int id, const char* name, size return v; } - char value[len + 1]; - memset(value, 0, sizeof(value)); - NC_CALL(nc_get_att_text(nc, id, name, value), path); + std::string value(len + 1, '\0'); + NC_CALL(nc_get_att_text(nc, id, name, value.data()), path); auto* v = new ValueT(*this, value); return v; } diff --git a/src/mir/netcdf/Variable.h b/src/mir/netcdf/Variable.h index 069d48ac3..9106ed04d 100644 --- a/src/mir/netcdf/Variable.h +++ b/src/mir/netcdf/Variable.h @@ -89,7 +89,7 @@ class Variable : public Endowed { const Variable& lookupInDataset(const std::string& standardName, const std::string& units, size_t n) const; - // Used during identtification + // Used during identification virtual Variable* makeDataVariable(); virtual Variable* makeCoordinateVariable(); virtual Variable* makeSimpleVariable(); diff --git a/src/mir/output/GribOutput.cc b/src/mir/output/GribOutput.cc index a2fdd0a89..e9b15059b 100644 --- a/src/mir/output/GribOutput.cc +++ b/src/mir/output/GribOutput.cc @@ -430,7 +430,8 @@ size_t GribOutput::save(const param::MIRParametrisation& param, context::Context // util::BoundingBox after(g); if (user != before /*|| user != after || before != after*/) { - Log::info() << "MIR_CHECK_AREA:" << " request=" << user << " result=" + Log::info() << "MIR_CHECK_AREA:" + << " request=" << user << " result=" << before // << " grib=" << after << std::endl; diff --git a/src/mir/repres/gauss/Gaussian.cc b/src/mir/repres/gauss/Gaussian.cc index e5679e5a0..e1a44fc41 100644 --- a/src/mir/repres/gauss/Gaussian.cc +++ b/src/mir/repres/gauss/Gaussian.cc @@ -16,6 +16,7 @@ #include #include +#include "eckit/log/JSON.h" #include "eckit/types/FloatCompare.h" #include "mir/param/MIRParametrisation.h" diff --git a/src/mir/repres/gauss/reduced/Classic.cc b/src/mir/repres/gauss/reduced/Classic.cc index 4f4d4328b..9f0319291 100644 --- a/src/mir/repres/gauss/reduced/Classic.cc +++ b/src/mir/repres/gauss/reduced/Classic.cc @@ -37,7 +37,8 @@ Classic::Classic(size_t N, const util::BoundingBox& bbox, double angularPrecisio auto old(bbox_); bbox_ = util::BoundingBox(n, w, s, e); - Log::debug() << "Classic BoundingBox:" << "\n\t " << old << "\n\t > " << bbox_ << std::endl; + Log::debug() << "Classic BoundingBox:" + << "\n\t " << old << "\n\t > " << bbox_ << std::endl; } diff --git a/src/mir/repres/gauss/reduced/Octahedral.cc b/src/mir/repres/gauss/reduced/Octahedral.cc index 8146a9aef..492fd939e 100644 --- a/src/mir/repres/gauss/reduced/Octahedral.cc +++ b/src/mir/repres/gauss/reduced/Octahedral.cc @@ -38,7 +38,8 @@ Octahedral::Octahedral(size_t N, const util::BoundingBox& bbox, double angularPr auto old(bbox_); bbox_ = util::BoundingBox(n, w, s, e); - Log::debug() << "Octahedral BoundingBox:" << "\n\t " << old << "\n\t > " << bbox_ << std::endl; + Log::debug() << "Octahedral BoundingBox:" + << "\n\t " << old << "\n\t > " << bbox_ << std::endl; } diff --git a/src/mir/repres/gauss/reduced/Reduced.cc b/src/mir/repres/gauss/reduced/Reduced.cc index c8a3b82b6..2a2470e2b 100644 --- a/src/mir/repres/gauss/reduced/Reduced.cc +++ b/src/mir/repres/gauss/reduced/Reduced.cc @@ -41,7 +41,7 @@ template std::vector pl_convert(const T& nx) { ASSERT(!nx.empty()); std::vector pl(nx.size()); - std::transform(nx.begin(), nx.end(), pl.begin(), [](typename T::value_type p) { return long(p); }); + std::transform(nx.begin(), nx.end(), pl.begin(), [](typename T::value_type p) { return static_cast(p); }); return pl; } @@ -543,7 +543,8 @@ std::string Reduced::factory() const { void Reduced::json(eckit::JSON& s) const { s.startObject(); - s << "type" << "reduced_gg"; + s << "type" + << "reduced_gg"; s << "pl" << pls(); Gaussian::json(s); s.endObject(); diff --git a/src/mir/repres/gauss/regular/Regular.cc b/src/mir/repres/gauss/regular/Regular.cc index 50019e5fd..a2e1ac313 100644 --- a/src/mir/repres/gauss/regular/Regular.cc +++ b/src/mir/repres/gauss/regular/Regular.cc @@ -38,7 +38,8 @@ Regular::Regular(const param::MIRParametrisation& parametrisation) : Gaussian(pa auto old(bbox_); bbox_ = util::BoundingBox(n, w, s, e); - Log::debug() << "Regular::Regular: BoundingBox:" << "\n\t " << old << "\n\t > " << bbox_ << std::endl; + Log::debug() << "Regular::Regular: BoundingBox:" + << "\n\t " << old << "\n\t > " << bbox_ << std::endl; setNiNj(); } @@ -153,7 +154,8 @@ bool Regular::getLongestElementDiagonal(double& d) const { void Regular::json(eckit::JSON& s) const { s.startObject(); - s << "type" << "regular_gg"; + s << "type" + << "regular_gg"; Gaussian::json(s); s.endObject(); } diff --git a/src/mir/repres/latlon/LatLon.cc b/src/mir/repres/latlon/LatLon.cc index 5927c2d12..b910096fd 100644 --- a/src/mir/repres/latlon/LatLon.cc +++ b/src/mir/repres/latlon/LatLon.cc @@ -77,7 +77,8 @@ void LatLon::reorder(long scanningMode, MIRValuesVector& values) const { void LatLon::print(std::ostream& out) const { - out << "LatLon[" << "bbox=" << bbox_ << ",increments=" << increments_ << ",ni=" << ni_ << ",nj=" << nj_ << "]"; + out << "LatLon[" + << "bbox=" << bbox_ << ",increments=" << increments_ << ",ni=" << ni_ << ",nj=" << nj_ << "]"; } @@ -306,8 +307,9 @@ LatLon::LatLonIterator::~LatLonIterator() { void LatLon::LatLonIterator::print(std::ostream& out) const { - out << "LatLonIterator[" << "ni=" << ni_ << ",nj=" << nj_ << ",north=" << north_ << ",west=" << west_ - << ",we=" << we_ << ",ns=" << ns_ << ",i=" << i_ << ",j=" << j_ << ",count=" << count_ << "]"; + out << "LatLonIterator[" + << "ni=" << ni_ << ",nj=" << nj_ << ",north=" << north_ << ",west=" << west_ << ",we=" << we_ << ",ns=" << ns_ + << ",i=" << i_ << ",j=" << j_ << ",count=" << count_ << "]"; } diff --git a/src/mir/repres/latlon/RegularLL.cc b/src/mir/repres/latlon/RegularLL.cc index c2388345e..173822e89 100644 --- a/src/mir/repres/latlon/RegularLL.cc +++ b/src/mir/repres/latlon/RegularLL.cc @@ -63,7 +63,8 @@ void RegularLL::print(std::ostream& out) const { void RegularLL::json(eckit::JSON& json) const { json.startObject(); - json << "type" << "regular_ll"; + json << "type" + << "regular_ll"; LatLon::json(json); json.endObject(); } diff --git a/src/mir/repres/proxy/HEALPix.cc b/src/mir/repres/proxy/HEALPix.cc index d086bebde..8f06a29fe 100644 --- a/src/mir/repres/proxy/HEALPix.cc +++ b/src/mir/repres/proxy/HEALPix.cc @@ -100,7 +100,8 @@ void HEALPix::fillJob(api::MIRJob&) const { void HEALPix::json(eckit::JSON& j) const { j.startObject(); j << "grid" << name(); - j << "type" << "healpix"; + j << "type" + << "healpix"; j << "ordering" << orderingConvention_; j.endObject(); } diff --git a/src/mir/repres/regular/Lambert.cc b/src/mir/repres/regular/Lambert.cc index 49d0b2852..8e40afba7 100644 --- a/src/mir/repres/regular/Lambert.cc +++ b/src/mir/repres/regular/Lambert.cc @@ -12,6 +12,8 @@ #include "mir/repres/regular/Lambert.h" +#include + #include "mir/param/MIRParametrisation.h" #include "mir/util/Angles.h" #include "mir/util/Exceptions.h" @@ -71,11 +73,6 @@ RegularGrid::Projection Lambert::make_projection(const param::MIRParametrisation void Lambert::fillGrib(grib_info& info) const { info.grid.grid_type = CODES_UTIL_GRID_SPEC_LAMBERT_CONFORMAL; - ASSERT(x_.size() > 1); - ASSERT(y_.size() > 1); - auto Dx = (x_.max() - x_.min()) / double(x_.size() - 1); - auto Dy = (y_.max() - y_.min()) / double(y_.size() - 1); - Point2 first = {firstPointBottomLeft_ ? x_.min() : x_.front(), firstPointBottomLeft_ ? y_.min() : y_.front()}; Point2 firstLL = grid_.projection().lonlat(first); Point2 reference = grid_.projection().lonlat({0., 0.}); @@ -91,8 +88,8 @@ void Lambert::fillGrib(grib_info& info) const { info.grid.longitudeOfSouthernPoleInDegrees = longitudeOfSouthernPoleInDegrees_; info.grid.uvRelativeToGrid = uvRelativeToGrid_ ? 1 : 0; - info.extra_set("DxInMetres", Dx); - info.extra_set("DyInMetres", Dy); + info.extra_set("DxInMetres", std::abs(x_.step())); + info.extra_set("DyInMetres", std::abs(y_.step())); info.extra_set("Latin1InDegrees", reference[LLCOORDS::LAT]); info.extra_set("Latin2InDegrees", reference[LLCOORDS::LAT]); info.extra_set("LoVInDegrees", writeLonPositive_ ? util::normalise_longitude(reference[LLCOORDS::LON], 0) diff --git a/src/mir/repres/regular/RegularGrid.cc b/src/mir/repres/regular/RegularGrid.cc index 2cc529750..6ea56b83d 100644 --- a/src/mir/repres/regular/RegularGrid.cc +++ b/src/mir/repres/regular/RegularGrid.cc @@ -74,7 +74,11 @@ RegularGrid::RegularGrid(const param::MIRParametrisation& param, const RegularGr auto bbox = projection.lonlatBoundingBox(range); ASSERT(bbox); - bbox_ = {bbox.north(), bbox.west(), bbox.south(), bbox.east()}; + // MIR-661 Grid projection handling covering the poles: account for "excessive" bounds + Longitude west(bbox.west()); + auto east = bbox.east() - bbox.west() >= Longitude::GLOBE.value() ? west + Longitude::GLOBE : bbox.east(); + + bbox_ = {bbox.north(), west, bbox.south(), east}; } @@ -127,7 +131,7 @@ RegularGrid::Projection::Spec RegularGrid::make_proj_spec(const param::MIRParame RegularGrid::LinearSpacing RegularGrid::linspace(double start, double step, long num, bool plus) { ASSERT(step >= 0.); - return {start, start + step * double(plus ? num - 1 : 1 - num), num}; + return {start, start + step * static_cast(plus ? num - 1 : 1 - num), num}; } @@ -208,12 +212,12 @@ bool RegularGrid::isPeriodicWestEast() const { void RegularGrid::fillGrib(grib_info& info) const { - // shape of the reference object + // shape of the reference system shape_.fillGrib(info, grid_.projection().spec()); // scanningMode - info.grid.iScansNegatively = x_.back() < x_.front() ? 1 : 0; - info.grid.jScansPositively = y_.front() < y_.back() ? 1 : 0; + info.grid.iScansNegatively = x_.back() < x_.front() ? 1L : 0L; + info.grid.jScansPositively = y_.front() < y_.back() ? 1L : 0L; } @@ -252,9 +256,9 @@ Iterator* RegularGrid::iterator() const { size_t ni_; size_t nj_; - size_t i_; - size_t j_; - size_t count_; + size_t i_ = 0; + size_t j_ = 0; + size_t count_ = 0; void print(std::ostream& out) const override { out << "RegularGridIterator["; @@ -286,7 +290,7 @@ Iterator* RegularGrid::iterator() const { public: RegularGridIterator(Projection projection, const LinearSpacing& x, const LinearSpacing& y) : - projection_(std::move(projection)), x_(x), y_(y), ni_(x.size()), nj_(y.size()), i_(0), j_(0), count_(0) {} + projection_(std::move(projection)), x_(x), y_(y), ni_(x.size()), nj_(y.size()) {} ~RegularGridIterator() override = default; RegularGridIterator(const RegularGridIterator&) = delete; diff --git a/src/mir/repres/sh/SphericalHarmonics.cc b/src/mir/repres/sh/SphericalHarmonics.cc index e84d27bb2..11508db87 100644 --- a/src/mir/repres/sh/SphericalHarmonics.cc +++ b/src/mir/repres/sh/SphericalHarmonics.cc @@ -37,7 +37,8 @@ SphericalHarmonics::~SphericalHarmonics() = default; void SphericalHarmonics::print(std::ostream& out) const { - out << "SphericalHarmonics[" << "truncation=" << truncation_ << "]"; + out << "SphericalHarmonics[" + << "truncation=" << truncation_ << "]"; } diff --git a/src/mir/repres/unsupported/HEALPixNested.cc b/src/mir/repres/unsupported/HEALPixNested.cc index 63eb259af..a18e05f85 100644 --- a/src/mir/repres/unsupported/HEALPixNested.cc +++ b/src/mir/repres/unsupported/HEALPixNested.cc @@ -45,8 +45,10 @@ void HEALPixNested::fillGrib(grib_info& info) const { void HEALPixNested::json(eckit::JSON& j) const { j.startObject(); j << "grid" << ring_.uniqueName(); - j << "type" << "healpix"; - j << "ordering" << "nested"; + j << "type" + << "healpix"; + j << "ordering" + << "nested"; j.endObject(); } diff --git a/src/mir/tools/Count.cc b/src/mir/tools/Count.cc index e604b3fe9..9d5ff9943 100644 --- a/src/mir/tools/Count.cc +++ b/src/mir/tools/Count.cc @@ -114,9 +114,10 @@ void Count::count(const PointLatLon& point) { void Count::print(std::ostream& out) const { out << Log::Pretty(count_) << " out of " << Log::Pretty(countTotal_) << ", north=" << n_ << " (bbox.n - n " - << bbox_.north() - n_ << ")" << ", west=" << w_ << " (w - bbox.w " << w_ - bbox_.west() << ")" - << ", south=" << s_ << " (s - bbox.s " << s_ - bbox_.south() << ")" << ", east=" << e_ << " (bbox.e - e " - << bbox_.east() - e_ << ")" + << bbox_.north() - n_ << ")" + << ", west=" << w_ << " (w - bbox.w " << w_ - bbox_.west() << ")" + << ", south=" << s_ << " (s - bbox.s " << s_ - bbox_.south() << ")" + << ", east=" << e_ << " (bbox.e - e " << bbox_.east() - e_ << ")" << "\n" "N " << bbox_.north() << ":" << nn_ diff --git a/src/mir/util/BoundingBox.cc b/src/mir/util/BoundingBox.cc index d25bbc23f..c19ac8615 100644 --- a/src/mir/util/BoundingBox.cc +++ b/src/mir/util/BoundingBox.cc @@ -73,7 +73,8 @@ BoundingBox::~BoundingBox() = default; void BoundingBox::print(std::ostream& out) const { - out << "BoundingBox[" << "north=" << north_ << ",west=" << west_ << ",south=" << south_ << ",east=" << east_ << "]"; + out << "BoundingBox[" + << "north=" << north_ << ",west=" << west_ << ",south=" << south_ << ",east=" << east_ << "]"; } diff --git a/src/mir/util/Domain.cc b/src/mir/util/Domain.cc index aa06d8e7b..f6ce17fec 100644 --- a/src/mir/util/Domain.cc +++ b/src/mir/util/Domain.cc @@ -34,7 +34,8 @@ Domain::operator atlas::RectangularDomain() const { void Domain::print(std::ostream& os) const { - os << "Domain[" << "north=" << north() << ",west=" << west() << ",south=" << south() << ",east=" << east() + os << "Domain[" + << "north=" << north() << ",west=" << west() << ",south=" << south() << ",east=" << east() << ",isGlobal=" << isGlobal() << "]"; } diff --git a/src/mir/util/GridBox.cc b/src/mir/util/GridBox.cc index bb443c19a..e83e07728 100644 --- a/src/mir/util/GridBox.cc +++ b/src/mir/util/GridBox.cc @@ -19,22 +19,8 @@ #include "mir/util/Atlas.h" #include "mir/util/Exceptions.h" -#include "mir/util/Types.h" - - -static constexpr double GLOBE = 360.; -static constexpr double NORTH_POLE = 90.; -static constexpr double SOUTH_POLE = -90.; - -double normalise(double lon, double minimum) { - while (lon < minimum) { - lon += GLOBE; - } - while (lon >= minimum + GLOBE) { - lon -= GLOBE; - } - return lon; -} +#include "mir/util/Latitude.h" +#include "mir/util/LongitudeDouble.h" namespace mir::util { @@ -42,8 +28,8 @@ namespace mir::util { GridBox::GridBox(double north, double west, double south, double east) : north_(north), west_(west), south_(south), east_(east) { - ASSERT(SOUTH_POLE <= south_ && south_ <= north_ && north_ <= NORTH_POLE); - ASSERT(west_ <= east_ && east_ <= west_ + GLOBE); + ASSERT(Latitude::SOUTH_POLE.value() <= south_ && south_ <= north_ && north_ <= Latitude::NORTH_POLE.value()); + ASSERT(west_ <= east_ && east_ <= west_ + LongitudeDouble::GLOBE.value()); } @@ -57,6 +43,18 @@ double GridBox::diagonal() const { } +Point2 GridBox::centre() const { + return {0.5 * (north_ + south_), 0.5 * (west_ + east_)}; +} + + +bool GridBox::contains(const Point2& p) const { + return eckit::types::is_approximately_lesser_or_equal(south_, p[0]) && + eckit::types::is_approximately_lesser_or_equal(p[0], north_) && + eckit::types::is_approximately_lesser_or_equal(LongitudeDouble(p[1]).normalise(west_).value(), east_); +} + + bool GridBox::intersects(GridBox& other) const { double n = std::min(north_, other.north_); double s = std::max(south_, other.south_); @@ -66,9 +64,15 @@ bool GridBox::intersects(GridBox& other) const { } auto intersect = [](const GridBox& a, const GridBox& b, double& w, double& e) { +#if 1 + double ref = LongitudeDouble(b.west_).normalise(a.west_).value(); + double w_ = std::max(a.west_, ref); + double e_ = std::min(a.east_, LongitudeDouble(b.east_).normalise(ref).value()); +#else double ref = normalise(b.west_, a.west_); double w_ = std::max(a.west_, ref); double e_ = std::min(a.east_, normalise(b.east_, ref)); +#endif if (eckit::types::is_strictly_greater(e_, w_)) { w = w_; diff --git a/src/mir/util/GridBox.h b/src/mir/util/GridBox.h index 8ad8b8021..1b3c00d8d 100644 --- a/src/mir/util/GridBox.h +++ b/src/mir/util/GridBox.h @@ -14,6 +14,8 @@ #include +#include "mir/util/Types.h" + namespace mir::util { @@ -41,6 +43,9 @@ class GridBox { double area() const; double diagonal() const; + Point2 centre() const; + + bool contains(const Point2&) const; bool intersects(GridBox&) const; double north() const { return north_; } diff --git a/src/mir/util/Increments.cc b/src/mir/util/Increments.cc index e61835378..a7a528c05 100644 --- a/src/mir/util/Increments.cc +++ b/src/mir/util/Increments.cc @@ -122,7 +122,8 @@ bool Increments::isLongitudeShifted(const PointLatLon& p) const { void Increments::print(std::ostream& out) const { - out << "Increments[" << "west_east=" << west_east_.longitude() << ",south_north=" << south_north_.latitude() << "]"; + out << "Increments[" + << "west_east=" << west_east_.longitude() << ",south_north=" << south_north_.latitude() << "]"; } void Increments::json(eckit::JSON& json) const { diff --git a/src/mir/util/MeshGeneratorParameters.cc b/src/mir/util/MeshGeneratorParameters.cc index 668dbd26a..0bfbc6be3 100644 --- a/src/mir/util/MeshGeneratorParameters.cc +++ b/src/mir/util/MeshGeneratorParameters.cc @@ -87,7 +87,8 @@ void MeshGeneratorParameters::hash(eckit::Hash& hash) const { } void MeshGeneratorParameters::print(std::ostream& s) const { - s << "MeshGeneratorParameters[" << "meshGenerator=" << meshGenerator_ << ",meshCellCentres=" << meshCellCentres_ + s << "MeshGeneratorParameters[" + << "meshGenerator=" << meshGenerator_ << ",meshCellCentres=" << meshCellCentres_ << ",meshCellLongestDiagonal=" << meshCellLongestDiagonal_ << ",meshNodeLumpedMassMatrix=" << meshNodeLumpedMassMatrix_ << ",meshNodeToCellConnectivity=" << meshNodeToCellConnectivity_ << ","; diff --git a/src/mir/util/Rotation.cc b/src/mir/util/Rotation.cc index ed0c647de..6a92c5fc7 100644 --- a/src/mir/util/Rotation.cc +++ b/src/mir/util/Rotation.cc @@ -61,8 +61,8 @@ void Rotation::normalize() { void Rotation::print(std::ostream& out) const { - out << "Rotation[" << "south_pole_latitude=" << south_pole_latitude_ - << ",south_pole_longitude=" << south_pole_longitude_ + out << "Rotation[" + << "south_pole_latitude=" << south_pole_latitude_ << ",south_pole_longitude=" << south_pole_longitude_ << ",south_pole_rotation_angle=" << south_pole_rotation_angle_ << "]"; } diff --git a/src/mir/util/Trace.cc b/src/mir/util/Trace.cc index 86fef5ea9..5a5d62448 100644 --- a/src/mir/util/Trace.cc +++ b/src/mir/util/Trace.cc @@ -50,7 +50,8 @@ bool ProgressTimer::operator++() { lastTime_ = elapsed(); double rate = double(counter_) / lastTime_; output() << Log::Pretty(counter_, units_) << " in " << Log::Seconds(lastTime_) << ", rate: " << rate << " " - << units_(counter_) << "/s" << ", ETA: " << eckit::ETA(double(limit_ - counter_) / rate) << std::endl; + << units_(counter_) << "/s" + << ", ETA: " << eckit::ETA(double(limit_ - counter_) / rate) << std::endl; } if (counter_ < limit_) { diff --git a/src/tools/mir-climate-filter.cc b/src/tools/mir-climate-filter.cc index f8c36a9cf..f861e36f9 100644 --- a/src/tools/mir-climate-filter.cc +++ b/src/tools/mir-climate-filter.cc @@ -206,7 +206,8 @@ void MIRClimateFilter::execute(const eckit::option::CmdArgs& args) { for (size_t j = 0; j < Nj; ++j) { if (++progress) { - log << " latitude: " << lat[j] << " degree" << "\n farthest: " << farthest << " m" + log << " latitude: " << lat[j] << " degree" + << "\n farthest: " << farthest << " m" << "\n closest: " << Log::Seconds(tClosest) << "\n matrix A: " << Log::Seconds(tMatrixA) << "\n vector Y: " << Log::Seconds(tVectorY) << "\n vector X: " << Log::Seconds(tVectorX) << "\n" @@ -320,7 +321,8 @@ void MIRClimateFilter::execute(const eckit::option::CmdArgs& args) { log << Log::Pretty(field, {"field"}) << " in " << timer.elapsedSeconds() - << ", rate: " << double(field) / timer.elapsed() << " " << "field/s" << std::endl; + << ", rate: " << double(field) / timer.elapsed() << " " + << "field/s" << std::endl; } } diff --git a/src/tools/mir-get-data.cc b/src/tools/mir-get-data.cc index bfd198837..b81c7bf9c 100644 --- a/src/tools/mir-get-data.cc +++ b/src/tools/mir-get-data.cc @@ -353,9 +353,10 @@ void MIRGetData::execute(const eckit::option::CmdArgs& args) { ASSERT(i < values.size()); constexpr double THOUSAND = 1000; - log << "- " << c++ << " -" << " index=" << i << " latitude=" << q[1] << " longitude=" << q[0] - << " distance=" << util::Earth::distance(p, q) / THOUSAND << " (km)" << " value=" << values[i] - << std::endl; + log << "- " << c++ << " -" + << " index=" << i << " latitude=" << q[1] << " longitude=" << q[0] + << " distance=" << util::Earth::distance(p, q) / THOUSAND << " (km)" + << " value=" << values[i] << std::endl; } } diff --git a/tests/assertions/0001.core.test b/tests/assertions/0001.core.test index b14e16d00..80d4bc948 100644 --- a/tests/assertions/0001.core.test +++ b/tests/assertions/0001.core.test @@ -1,7 +1,7 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=80/-10/10/100 --grid=1/1 -# grib_get assertions +# grib_get Ni=111 Nj=71 diff --git a/tests/assertions/0003.core.test b/tests/assertions/0003.core.test index 0fd64e0fa..e68c65acc 100644 --- a/tests/assertions/0003.core.test +++ b/tests/assertions/0003.core.test @@ -1,8 +1,8 @@ -# Hit Broadwell arch. precision (Cray) +# input (Cray Broadwell arch. precision) regular_ll.2-2.grib1 -# Mir tool options +# mir --area=70/-77/-7/7 --grid=0.7/0.7 -# grib_get assertions +# grib_get Ni=121 Nj=111 latitudeOfFirstGridPointInDegrees=70 diff --git a/tests/assertions/0004.core.test b/tests/assertions/0004.core.test index f5abb5ed0..b99ae42b2 100644 --- a/tests/assertions/0004.core.test +++ b/tests/assertions/0004.core.test @@ -1,8 +1,8 @@ -# Hit Broadwell arch. precision (Cray) +# input (Cray Broadwell arch. precision) regular_ll.2-2.grib1 -# Mir tool options +# mir --area=12/-12/-1.2/1.2 --grid=1.2/1.2 -# grib_get assertions +# grib_get Ni=12 Nj=12 latitudeOfFirstGridPointInDegrees=12 diff --git a/tests/assertions/0005.core.test b/tests/assertions/0005.core.test index 3e738844c..349dc3952 100644 --- a/tests/assertions/0005.core.test +++ b/tests/assertions/0005.core.test @@ -1,6 +1,6 @@ -# Mars request +# input param=28,levtype=sfc -# Mir tool options +# mir --grid=0.5/0.5 --area=90/0/-90/359.5 -# grib_get assertions +# grib_get numberOfValues=259920 diff --git a/tests/assertions/0006.core.test b/tests/assertions/0006.core.test index 9ffbad448..64d523629 100644 --- a/tests/assertions/0006.core.test +++ b/tests/assertions/0006.core.test @@ -1,8 +1,8 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --grid=f320 --area=56/-16.5/50.5/-3 -# grib_get assertions +# grib_get Ni=48 Nj=19 numberOfValues=912 diff --git a/tests/assertions/0007.test b/tests/assertions/0007.test index 667a57b9f..7020fae93 100644 --- a/tests/assertions/0007.test +++ b/tests/assertions/0007.test @@ -1,7 +1,7 @@ -# Mars request +# input param=vo_d,level=1000,resol=20 -# Mir tool options +# mir --vod2uv -# grib_get assertions +# grib_get paramId=131 packingType=spectral_complex diff --git a/tests/assertions/0008.lsm.test b/tests/assertions/0008.lsm.test index f42f87aad..c290dedd0 100644 --- a/tests/assertions/0008.lsm.test +++ b/tests/assertions/0008.lsm.test @@ -1,6 +1,6 @@ -# Mars request +# input param=170,levtype=sfc -# Mir tool options +# mir --grid=0.125/0.125 --area=31/-57.5/-34.5/40.5 --rotation=-32.5/10 --interpolation=nearest-lsm -# grib_get assertions +# grib_get numberOfValues=412125 diff --git a/tests/assertions/0009.test b/tests/assertions/0009.test index 82778bf3b..451811715 100644 --- a/tests/assertions/0009.test +++ b/tests/assertions/0009.test @@ -1,6 +1,6 @@ -# Mars request +# input param=vo_d,level=1000,resol=20 -# Mir tool options +# mir --vod2uv --area=22.7/-13.7/-5.9/21.7 --grid=0.2/0.2 --rotation=-40/10 -# grib_get assertions +# grib_get paramId=131 diff --git a/tests/assertions/0010.core.test b/tests/assertions/0010.core.test index e69743294..df42f7950 100644 --- a/tests/assertions/0010.core.test +++ b/tests/assertions/0010.core.test @@ -1,4 +1,4 @@ -# mars +# input param=2t,levtype=sfc # mir --dont-compress-plan --grid=1/1 --area=60/180/-56/-180 diff --git a/tests/assertions/0011.test b/tests/assertions/0011.test index 6c00dae1d..da505e360 100644 --- a/tests/assertions/0011.test +++ b/tests/assertions/0011.test @@ -1,8 +1,8 @@ -# Mars request +# input date=19930202 -# Mir tool options +# mir --grid=1/1 --dont-compress-plan -# grib_get assertions +# grib_get Ni = 360 Nj = 181 iDirectionIncrementInDegrees = 1 diff --git a/tests/assertions/0012.test b/tests/assertions/0012.test index 4bec430a2..1a82cb711 100644 --- a/tests/assertions/0012.test +++ b/tests/assertions/0012.test @@ -1,8 +1,8 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=-60/50/-90/180 --grid=N640 -# grib_get assertions +# grib_get numberOfPoints=52654 Nj=213 N=640 diff --git a/tests/assertions/0013.test b/tests/assertions/0013.test index 6a9873ec7..bbce6e2b7 100644 --- a/tests/assertions/0013.test +++ b/tests/assertions/0013.test @@ -1,6 +1,6 @@ -# Input file with plenty of awkward formats +# input (plenty of awkward formats) multi-format.grib -# Mir tool options +# mir --grid=3/3 -# grib_get assertions (none for the moment) +# grib_get numberOfPoints=7320 diff --git a/tests/assertions/0014.test.disabled b/tests/assertions/0014.test.disabled index f9fa2fe3b..7421b8e94 100644 --- a/tests/assertions/0014.test.disabled +++ b/tests/assertions/0014.test.disabled @@ -1,6 +1,6 @@ -# Input file +# input rotated_ll.3-3.grib1 -# Mir tool options +# mir --grid=3/3 -# grib_get assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/0015.core.test b/tests/assertions/0015.core.test index 43596521e..5994c236b 100644 --- a/tests/assertions/0015.core.test +++ b/tests/assertions/0015.core.test @@ -1,9 +1,8 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --grid=1.5/1.5 --area=50/109.5/20/150 -# --shift=0/-1 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=50 longitudeOfFirstGridPointInDegrees=109.5 latitudeOfLastGridPointInDegrees=20 diff --git a/tests/assertions/0016.core.test b/tests/assertions/0016.core.test index 10958bd0a..8cb15ca70 100644 --- a/tests/assertions/0016.core.test +++ b/tests/assertions/0016.core.test @@ -1,7 +1,7 @@ -# Mars request +# input ukmo-tigge.grib -# Mir tool options +# mir --area=80/-10/10/100 --grid=1/1 -# grib_get assertions +# grib_get Ni=111 Nj=71 diff --git a/tests/assertions/0017.core.test b/tests/assertions/0017.core.test index c0bce7c19..0163e672c 100644 --- a/tests/assertions/0017.core.test +++ b/tests/assertions/0017.core.test @@ -1,6 +1,6 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=-10/-110/-43/-65 --grid=3/3 -# grib_get assertions +# grib_get numberOfValues=192 diff --git a/tests/assertions/0018.core.test b/tests/assertions/0018.core.test index ec6ed91e9..17d1691b1 100644 --- a/tests/assertions/0018.core.test +++ b/tests/assertions/0018.core.test @@ -1,7 +1,7 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --plan=grid2regular-ll(grid=[2,2],area=[90,-3,0,3]);crop(area=[90,-3,0,4]);frame(1) -# grib_get assertions +# grib_get Ni=4 Nj=46 diff --git a/tests/assertions/0019.core.test b/tests/assertions/0019.core.test index 852280a05..c8e659635 100644 --- a/tests/assertions/0019.core.test +++ b/tests/assertions/0019.core.test @@ -1,6 +1,6 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --plan=grid2regular-ll(grid=[2,2]);grid2namedgrid(grid=O80);grid2rotated-regular-ll(grid=[2,2],rotation=[-90,0]) -# grib_get assertions +# grib_get numberOfValues=16380 diff --git a/tests/assertions/0020.core.test b/tests/assertions/0020.core.test index 41329adae..78d0c30c7 100644 --- a/tests/assertions/0020.core.test +++ b/tests/assertions/0020.core.test @@ -1,8 +1,8 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --grid=2/2 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=0 latitudeOfLastGridPointInDegrees=-90 diff --git a/tests/assertions/0021.core.test b/tests/assertions/0021.core.test index 70ee77e9d..97ca37e5a 100644 --- a/tests/assertions/0021.core.test +++ b/tests/assertions/0021.core.test @@ -1,8 +1,8 @@ -# Mars request +# input stream=wave,param=swh -# Mir tool options +# mir --grid=2/2 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=0 latitudeOfLastGridPointInDegrees=-90 diff --git a/tests/assertions/0022.test b/tests/assertions/0022.test index b5249645d..902d69190 100644 --- a/tests/assertions/0022.test +++ b/tests/assertions/0022.test @@ -1,7 +1,7 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=90/0/-90/360 --grid=N400 --rotation=-30.0/-10.0 -# grib_get assertions +# grib_get latitudeOfSouthernPoleInDegrees=-30 longitudeOfSouthernPoleInDegrees=-10 diff --git a/tests/assertions/0023.lsm.test b/tests/assertions/0023.lsm.test index 4a541efdc..cb4206f4d 100644 --- a/tests/assertions/0023.lsm.test +++ b/tests/assertions/0023.lsm.test @@ -1,7 +1,7 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=90/90/18/-90 --grid=0.2/0.2 --interpolation=nearest-lsm --rotation=-30.0/-10.0 -# grib_get assertions +# grib_get Ni=901 Nj=361 diff --git a/tests/assertions/0024.lsm.core.test b/tests/assertions/0024.lsm.core.test index c4ee987a7..a6df4ccc9 100644 --- a/tests/assertions/0024.lsm.core.test +++ b/tests/assertions/0024.lsm.core.test @@ -1,7 +1,7 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=90/90/18/-90 --grid=0.2/0.2 --interpolation=nearest-lsm -# grib_get assertions +# grib_get Ni=901 Nj=361 diff --git a/tests/assertions/0026.test b/tests/assertions/0026.test index 5370292b6..e5dc1e5cb 100644 --- a/tests/assertions/0026.test +++ b/tests/assertions/0026.test @@ -1,9 +1,8 @@ -# Testing shifted rotated bounding box -# Input file +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=22.7/-13.7/-5.9/21.7 --grid=0.2/0.2 --rotation=-40/10 -# grib_get assertions +# grib_get Ni = 178 Nj = 144 iDirectionIncrementInDegrees = 0.2 diff --git a/tests/assertions/0027.core.test b/tests/assertions/0027.core.test index 7d3129914..64e0c403b 100644 --- a/tests/assertions/0027.core.test +++ b/tests/assertions/0027.core.test @@ -1,9 +1,8 @@ -# Testing meridian bounding box -# Input file +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=90/-999/-90/-999 --grid=9/9 -# grib_get assertions +# grib_get longitudeOfFirstGridPointInDegrees=-999 longitudeOfLastGridPointInDegrees=-999 Ni=1 diff --git a/tests/assertions/0028.core.test b/tests/assertions/0028.core.test index c10bf14d1..af7821817 100644 --- a/tests/assertions/0028.core.test +++ b/tests/assertions/0028.core.test @@ -1,8 +1,8 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --bitmap=$tests_assertions_dir/GAUSS400_EU_GL --area=90/-60/25/60 --grid=0.1/0.1 -# grib_get assertions +# grib_get Ni = 1201 Nj = 651 iDirectionIncrementInDegrees = 0.1 diff --git a/tests/assertions/0029.lsm.core.test b/tests/assertions/0029.lsm.core.test index b9e30b592..2871380a7 100644 --- a/tests/assertions/0029.lsm.core.test +++ b/tests/assertions/0029.lsm.core.test @@ -1,8 +1,8 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=48.3/5.2/45.2/11 --grid=F1280 --interpolation=nearest-lsm -# grib_get assertions +# grib_get N = 1280 Ni = 83 Nj = 44 diff --git a/tests/assertions/0030.test b/tests/assertions/0030.test index 36af8d0ac..21d18cc3d 100644 --- a/tests/assertions/0030.test +++ b/tests/assertions/0030.test @@ -1,7 +1,7 @@ -# Mars request +# input levtype=sfc,param=tvh -# Mir tool options +# mir --area=6.75/-6.75/-5.75/9.25 --rotation=-56.17/66 --grid=0.125/0.125 -# grib_get assertions +# grib_get Ni=129 Nj=101 diff --git a/tests/assertions/0031.core.test b/tests/assertions/0031.core.test index 8937071a0..fb24c97ae 100644 --- a/tests/assertions/0031.core.test +++ b/tests/assertions/0031.core.test @@ -1,7 +1,7 @@ -# Mars request +# input stream=wave,param=swh,domain=m -# Mir tool options +# mir --globalise --grid=0.125/0.125 -# grib_get assertions +# grib_get Ni=2880 Nj=1441 diff --git a/tests/assertions/0034.core.test b/tests/assertions/0034.core.test index 0018b25d6..b978a072c 100644 --- a/tests/assertions/0034.core.test +++ b/tests/assertions/0034.core.test @@ -1,9 +1,8 @@ -# Test to check interpolation of an angle (1d-angle-degree-asymmetric) -# Mars request +# input (d-angle-degree-asymmetric) stream=wave,param=mwd -# Mir tool options +# mir --grid=O32 -# grib_get assertions +# grib_get numberOfValues = 5144 N = 32 Nj = 64 diff --git a/tests/assertions/0035.core.test b/tests/assertions/0035.core.test index 8b6a80b47..1e018dfd6 100644 --- a/tests/assertions/0035.core.test +++ b/tests/assertions/0035.core.test @@ -1,8 +1,7 @@ -# Test to check interpolation of a logarithmic quantity (1d.logarithmic) -# Mars request +# input (1d.logarithmic) levtype=ml,levelist=1,param=lnsp,grid=O32 -# Mir tool options +# mir --grid=O16 -# grib_get assertions +# grib_get Nj = 32 N = 16 diff --git a/tests/assertions/0036.core.test b/tests/assertions/0036.core.test index 0eafe6db2..cca951d1e 100644 --- a/tests/assertions/0036.core.test +++ b/tests/assertions/0036.core.test @@ -1,7 +1,7 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --area=90/-60/25/60 --grid=O1280 -# grib_get assertions +# grib_get Nj = 924 N = 1280 diff --git a/tests/assertions/0037.test b/tests/assertions/0037.test index 2c7e05740..12b92b2d7 100644 --- a/tests/assertions/0037.test +++ b/tests/assertions/0037.test @@ -1,7 +1,7 @@ -# Mars request +# input level=500,param=t,type=cf,stream=enfo -# Mir tool options +# mir --area=11.4/-18.4/-10.8/8 --grid=0.2/0.2 --rotation=-43/10 --dont-compress-plan -# grib_get assertions +# grib_get Nj = 112 Ni = 133 diff --git a/tests/assertions/0040.core.test b/tests/assertions/0040.core.test index 5a148ba34..d87727ad9 100644 --- a/tests/assertions/0040.core.test +++ b/tests/assertions/0040.core.test @@ -1,8 +1,8 @@ -# MARS request +# input param=2t,levtype=sfc # mir --area=12.4/-25.6/-13.3/23.8 --grid=.1/.1 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=12.4 latitudeOfLastGridPointInDegrees=-13.3 longitudeOfFirstGridPointInDegrees=-25.6 diff --git a/tests/assertions/0041.core.test b/tests/assertions/0041.core.test index a07b0dc64..af616f3d3 100644 --- a/tests/assertions/0041.core.test +++ b/tests/assertions/0041.core.test @@ -1,8 +1,8 @@ -# MARS request +# input param=2t,levtype=sfc # mir --area=12.4/-25.6/-13.3/23.8 --grid=.1/.1 --dont-compress-plan -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=12.4 latitudeOfLastGridPointInDegrees=-13.3 longitudeOfFirstGridPointInDegrees=-25.6 diff --git a/tests/assertions/0042.compress-plan.core.test b/tests/assertions/0042.compress-plan.core.test index 525cd0a2a..ec29da87b 100644 --- a/tests/assertions/0042.compress-plan.core.test +++ b/tests/assertions/0042.compress-plan.core.test @@ -1,7 +1,7 @@ -# MARS request +# input regular_ll.2-2.grib1 # mir --area=37.6025/-114.8907/27.7626/-105.1875 --grid=O1280 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 37.575 # 37.574691602387 latitudeOfLastGridPointInDegrees = 27.803 # 27.803162868604 diff --git a/tests/assertions/0042.dont-compress-plan.core.test b/tests/assertions/0042.dont-compress-plan.core.test index 9c8be715d..344a75a07 100644 --- a/tests/assertions/0042.dont-compress-plan.core.test +++ b/tests/assertions/0042.dont-compress-plan.core.test @@ -1,7 +1,7 @@ -# MARS request +# input regular_ll.2-2.grib1 # mir --area=37.6025/-114.8907/27.7626/-105.1875 --grid=O1280 --dont-compress-plan -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 37.575 # 37.574691602387 latitudeOfLastGridPointInDegrees = 27.803 # 27.803162868604 diff --git a/tests/assertions/0043.compress-plan.core.test b/tests/assertions/0043.compress-plan.core.test index 27a9c7e7e..43e665b92 100644 --- a/tests/assertions/0043.compress-plan.core.test +++ b/tests/assertions/0043.compress-plan.core.test @@ -1,7 +1,7 @@ -# MARS request +# input regular_ll.2-2.grib1 # mir --area=37.6025/-114.8915/27.7626/-105.188 --grid=O1280 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 37.575 # 37.574691602387 latitudeOfLastGridPointInDegrees = 27.803 # 27.803162868604 diff --git a/tests/assertions/0043.dont-compress-plan.core.test b/tests/assertions/0043.dont-compress-plan.core.test index d7eea8124..a32f1654c 100644 --- a/tests/assertions/0043.dont-compress-plan.core.test +++ b/tests/assertions/0043.dont-compress-plan.core.test @@ -1,7 +1,7 @@ -# MARS request +# input regular_ll.2-2.grib1 # mir --area=37.6025/-114.8915/27.7626/-105.188 --grid=O1280 --dont-compress-plan -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 37.575 # 37.574691602387 latitudeOfLastGridPointInDegrees = 27.803 # 27.803162868604 diff --git a/tests/assertions/0044.test b/tests/assertions/0044.test index 7b52dca67..ca95fecaf 100644 --- a/tests/assertions/0044.test +++ b/tests/assertions/0044.test @@ -1,6 +1,6 @@ -# Mars request +# input param=t,level=1000,resol=20 -# Mir tool options +# mir --grid=O1280 --area=90/280/25/50 -# grib_get assertions +# grib_get numberOfValues=622725 diff --git a/tests/assertions/0045.core.test b/tests/assertions/0045.core.test index c34d6d257..3d8a0fbfb 100644 --- a/tests/assertions/0045.core.test +++ b/tests/assertions/0045.core.test @@ -1,6 +1,6 @@ -# Mars request +# input gridType=reduced_gg,gridName=O32,shortName=msl.grib1 -# Mir tool options +# mir --grid=F32 --interpolation=nn -# grib_get assertions +# grib_get gridName=F32 diff --git a/tests/assertions/0046.core.test b/tests/assertions/0046.core.test index 313ec64fa..54d8322ac 100644 --- a/tests/assertions/0046.core.test +++ b/tests/assertions/0046.core.test @@ -1,6 +1,6 @@ -# Mars request +# input gridType=regular_gg,gridName=F32,shortName=msl.grib1 -# Mir tool options +# mir --grid=O32 --interpolation=nn -# grib_get assertions +# grib_get gridName=O32 diff --git a/tests/assertions/0047.core.test b/tests/assertions/0047.core.test index 555620e72..ddac35032 100644 --- a/tests/assertions/0047.core.test +++ b/tests/assertions/0047.core.test @@ -1,6 +1,6 @@ -# Mars request +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --grid=O32 --interpolation=nn -# grib_get assertions +# grib_get gridName=O32 diff --git a/tests/assertions/0048.core.test b/tests/assertions/0048.core.test index 456780775..32c155e19 100644 --- a/tests/assertions/0048.core.test +++ b/tests/assertions/0048.core.test @@ -1,6 +1,6 @@ -# Mars request +# input regular_ll.2-2.grib2 -# Mir tool options +# mir --grid=O32 --interpolation=nn -# grib_get assertions +# grib_get gridName=O32 diff --git a/tests/assertions/ECC-576.001.core.test b/tests/assertions/ECC-576.001.core.test index ba83bf25e..b2d4bc232 100644 --- a/tests/assertions/ECC-576.001.core.test +++ b/tests/assertions/ECC-576.001.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc,grid=N256 -# MIR options +# mir --area=90/0/-90/359.6489 -# grib_get assertions +# grib_get numberOfValues=348528 diff --git a/tests/assertions/ECC-576.002.core.test b/tests/assertions/ECC-576.002.core.test index 9ecbd3610..3c0ace984 100644 --- a/tests/assertions/ECC-576.002.core.test +++ b/tests/assertions/ECC-576.002.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc,grid=N256 -# MIR options +# mir --area=90/0/-90/359.9 -# grib_get assertions +# grib_get numberOfValues=348528 diff --git a/tests/assertions/ECC-576.003.core.test b/tests/assertions/ECC-576.003.core.test index d78229a83..5046c79de 100644 --- a/tests/assertions/ECC-576.003.core.test +++ b/tests/assertions/ECC-576.003.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc,grid=N640 -# MIR options +# mir --area=90/0/-90/359.9 -# grib_get assertions +# grib_get numberOfValues=2140702 diff --git a/tests/assertions/ECC-576.004.core.test b/tests/assertions/ECC-576.004.core.test index 014297e34..4ffe38097 100644 --- a/tests/assertions/ECC-576.004.core.test +++ b/tests/assertions/ECC-576.004.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc,grid=N640 -# MIR options +# mir --area=90/0/-90/359.99 -# grib_get assertions +# grib_get numberOfValues=2140702 diff --git a/tests/assertions/ECC-576.005.core.test b/tests/assertions/ECC-576.005.core.test index 3293b84e3..d6e67707b 100644 --- a/tests/assertions/ECC-576.005.core.test +++ b/tests/assertions/ECC-576.005.core.test @@ -1,8 +1,8 @@ -# MARS request +# input param=2t,levtype=sfc,grid=N640 -# MIR options +# mir --area=90/-180/-90/179.99 -# grib_get assertions +# grib_get numberOfValues=2140702 longitudeOfFirstGridPointInDegrees=-180 longitudeOfLastGridPointInDegrees=179.918 diff --git a/tests/assertions/ECC-576.006.core.test b/tests/assertions/ECC-576.006.core.test index d2c4e44f2..0ccbf08cf 100644 --- a/tests/assertions/ECC-576.006.core.test +++ b/tests/assertions/ECC-576.006.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc,grid=O640 -# MIR options +# mir --area=90/0/-90/359.999 -# grib_get assertions +# grib_get numberOfValues=1661440 diff --git a/tests/assertions/MIR-174.0001.core.test b/tests/assertions/MIR-174.0001.core.test index a0b30a268..af7385ada 100644 --- a/tests/assertions/MIR-174.0001.core.test +++ b/tests/assertions/MIR-174.0001.core.test @@ -1,8 +1,8 @@ -# MIR-174 first area only, the others areas trigger the same issue +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=88/-178/-88/180 -# grib_get assertions +# grib_get Ni=180 Nj=89 latitudeOfFirstGridPointInDegrees=88 diff --git a/tests/assertions/MIR-174.0002.core.test b/tests/assertions/MIR-174.0002.core.test index 493bbd2da..6fae56654 100644 --- a/tests/assertions/MIR-174.0002.core.test +++ b/tests/assertions/MIR-174.0002.core.test @@ -1,8 +1,8 @@ -# MIR-174 first area only, the others areas trigger the same issue +# input regular_ll.2-2.grib2 -# Mir tool options +# mir --area=88/-178/-88/180 -# grib_get assertions +# grib_get Ni=180 Nj=89 latitudeOfFirstGridPointInDegrees=88 diff --git a/tests/assertions/MIR-180.0001.core.test b/tests/assertions/MIR-180.0001.core.test index 68c444fb6..227d043f6 100644 --- a/tests/assertions/MIR-180.0001.core.test +++ b/tests/assertions/MIR-180.0001.core.test @@ -1,8 +1,8 @@ -# MIR-180 (case 1) +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=84/-165/23.9/165 --grid=0.1/0.1 -# grib_get assertions +# grib_get Ni=3301 Nj=602 latitudeOfFirstGridPointInDegrees=84 diff --git a/tests/assertions/MIR-180.0002.core.test b/tests/assertions/MIR-180.0002.core.test index 89abe4ba6..bb645ea9e 100644 --- a/tests/assertions/MIR-180.0002.core.test +++ b/tests/assertions/MIR-180.0002.core.test @@ -1,8 +1,8 @@ -# MIR-180 (case 2) +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=84.06/-165.06/24.03/165.06 --grid=0.09/0.09 -# grib_get assertions +# grib_get Ni=3669 Nj=668 latitudeOfFirstGridPointInDegrees=84.06 diff --git a/tests/assertions/MIR-180.0003.core.test b/tests/assertions/MIR-180.0003.core.test index 51164610d..5da618066 100644 --- a/tests/assertions/MIR-180.0003.core.test +++ b/tests/assertions/MIR-180.0003.core.test @@ -1,8 +1,8 @@ -# MIR-180 (case 3) +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=45/23.85/32.94/47.97 --grid=0.09/0.09 -# grib_get assertions +# grib_get Ni=269 Nj=135 latitudeOfFirstGridPointInDegrees=45 diff --git a/tests/assertions/MIR-180.0004.core.test b/tests/assertions/MIR-180.0004.core.test index eb050330e..1a764e767 100644 --- a/tests/assertions/MIR-180.0004.core.test +++ b/tests/assertions/MIR-180.0004.core.test @@ -1,8 +1,8 @@ -# MIR-180 (case 1) +# input regular_ll.2-2.grib2 -# Mir tool options +# mir --area=84/-165/23.9/165 --grid=0.1/0.1 -# grib_get assertions +# grib_get Ni=3301 Nj=602 latitudeOfFirstGridPointInDegrees=84 diff --git a/tests/assertions/MIR-180.0005.core.test b/tests/assertions/MIR-180.0005.core.test index 78bd4ebeb..3288387fb 100644 --- a/tests/assertions/MIR-180.0005.core.test +++ b/tests/assertions/MIR-180.0005.core.test @@ -1,8 +1,8 @@ -# MIR-180 (case 2) +# input regular_ll.2-2.grib2 -# Mir tool options +# mir --area=84.06/-165.06/24.03/165.06 --grid=0.09/0.09 -# grib_get assertions +# grib_get Ni=3669 Nj=668 latitudeOfFirstGridPointInDegrees=84.06 diff --git a/tests/assertions/MIR-180.0006.core.test b/tests/assertions/MIR-180.0006.core.test index 9191fe810..66065d863 100644 --- a/tests/assertions/MIR-180.0006.core.test +++ b/tests/assertions/MIR-180.0006.core.test @@ -1,8 +1,8 @@ -# MIR-180 (case 4) +# input regular_ll.2-2.grib2 -# Mir tool options +# mir --area=76.0/-14.4/49.6/44.8 --grid=0.8/0.8 -# grib_get assertions +# grib_get Ni=75 Nj=34 latitudeOfFirstGridPointInDegrees=76 diff --git a/tests/assertions/MIR-180.0007.core.test b/tests/assertions/MIR-180.0007.core.test index 2aa760a74..515ab6cce 100644 --- a/tests/assertions/MIR-180.0007.core.test +++ b/tests/assertions/MIR-180.0007.core.test @@ -1,8 +1,8 @@ -# MIR-180 (MIR handles this correctly, EMOSLIB does not) +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=15/279.9/-19.95/318 --grid=0.15/0.15 -# grib_get assertions +# grib_get Ni=255 Nj=234 latitudeOfFirstGridPointInDegrees=15 diff --git a/tests/assertions/MIR-180.0008.core.test b/tests/assertions/MIR-180.0008.core.test index c85943564..901b16bcc 100644 --- a/tests/assertions/MIR-180.0008.core.test +++ b/tests/assertions/MIR-180.0008.core.test @@ -1,8 +1,8 @@ -# MIR-180 (MIR handles this correctly, EMOSLIB does not) +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=14.94/-209.97/-70.47/5.22 --grid=0.09/0.09 -# grib_get assertions +# grib_get Ni=2392 Nj=950 latitudeOfFirstGridPointInDegrees=14.94 diff --git a/tests/assertions/MIR-203.0001.core.test b/tests/assertions/MIR-203.0001.core.test index 8b1ac1bef..e40f13f7a 100644 --- a/tests/assertions/MIR-203.0001.core.test +++ b/tests/assertions/MIR-203.0001.core.test @@ -1,8 +1,8 @@ -# Mars request +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --area=33.075/241.85/5.95/284.025 --grid=0.175/0.175 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=33.075 longitudeOfFirstGridPointInDegrees=241.85 latitudeOfLastGridPointInDegrees=5.95 diff --git a/tests/assertions/MIR-209.001.core.fail.test b/tests/assertions/MIR-209.001.core.fail.test index ae4a4f05f..1da126705 100644 --- a/tests/assertions/MIR-209.001.core.fail.test +++ b/tests/assertions/MIR-209.001.core.fail.test @@ -1,7 +1,6 @@ -# Support for old ocean grids (unsupported) -# mars +# input (unsupported old ocean grids) mofc_ocean_fc_inst_horizontal.grib1 # mir --grid=3/3 -# grib_get assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-209.002.core.fail.test b/tests/assertions/MIR-209.002.core.fail.test index f5de33623..5922c53b7 100644 --- a/tests/assertions/MIR-209.002.core.fail.test +++ b/tests/assertions/MIR-209.002.core.fail.test @@ -1,7 +1,7 @@ -# Mars request (based on metabuilder_master:/mars_client/.*/tests/retrieve/ocean) +# input stream=enfh,param=z,levtype=dp,type=pf,levelist=5,date=20110512,hdate=19990512,time=0000,step=24,number=2,product=inst,section=h -# Mir tool options +# mir --grid=1/1 -# grib_get assertions -Ni = 360 -Nj = 181 +# grib_get +Ni=360 +Nj=181 diff --git a/tests/assertions/MIR-218.0001.core.test b/tests/assertions/MIR-218.0001.core.test index 9817a18a1..d20177ef5 100644 --- a/tests/assertions/MIR-218.0001.core.test +++ b/tests/assertions/MIR-218.0001.core.test @@ -1,8 +1,8 @@ -# MIR-218: test projection failure on points on domain edges (interpolation fail) +# input (test projection failure on points on domain edges) regular_ll.0.5-0.5.europe.grib1 -# Mir tool options +# mir --area=50/-12/34/7 --grid=0.125/0.125 -# Assertions +# grib_get Ni = 153 Nj = 129 iDirectionIncrementInDegrees = 0.125 diff --git a/tests/assertions/MIR-218.0002.core.test b/tests/assertions/MIR-218.0002.core.test index d9c404a3e..b2c2610cc 100644 --- a/tests/assertions/MIR-218.0002.core.test +++ b/tests/assertions/MIR-218.0002.core.test @@ -1,8 +1,8 @@ -# MIR-218: test projection failure on points on domain edges (interpolation fail) +# input (test projection failure on points on domain edges) regular_ll.0.2-0.2.europe.grib1 -# Mir tool options +# mir --area=50/-12/34/7 --grid=0.125/0.125 -# Assertions +# grib_get Ni = 153 Nj = 129 iDirectionIncrementInDegrees = 0.125 diff --git a/tests/assertions/MIR-218.0003.core.test b/tests/assertions/MIR-218.0003.core.test index d50b79af1..abdb76696 100644 --- a/tests/assertions/MIR-218.0003.core.test +++ b/tests/assertions/MIR-218.0003.core.test @@ -1,8 +1,8 @@ -# MIR-218: test projection failure on points on domain edges (interpolation fail) +# input (test projection failure on points on domain edges) regular_ll.0.1-0.1.europe.grib1 -# Mir tool options +# mir --area=50/-12/34/7 --grid=0.1/0.1 -# Assertions +# grib_get iDirectionIncrementInDegrees = 0.1 jDirectionIncrementInDegrees = 0.1 longitudeOfFirstGridPointInDegrees = -12 diff --git a/tests/assertions/MIR-233.uvRelativeToGrid=0-scalar.test b/tests/assertions/MIR-233.uvRelativeToGrid=0-scalar.test index 1a9d7b887..495670135 100644 --- a/tests/assertions/MIR-233.uvRelativeToGrid=0-scalar.test +++ b/tests/assertions/MIR-233.uvRelativeToGrid=0-scalar.test @@ -1,6 +1,6 @@ -# Mars request +# input regular_ll.2-2.grib1 -# Mir tool options +# mir --grid=3/3 --rotation=-30.0/-10.0 -# grib_get assertions +# grib_get uvRelativeToGrid = 0 diff --git a/tests/assertions/MIR-233.uvRelativeToGrid=0-wind.test b/tests/assertions/MIR-233.uvRelativeToGrid=0-wind.test index dda3ee5b6..e26e52b8a 100644 --- a/tests/assertions/MIR-233.uvRelativeToGrid=0-wind.test +++ b/tests/assertions/MIR-233.uvRelativeToGrid=0-wind.test @@ -1,6 +1,6 @@ -# Mars request +# input param=vo_d,level=500 -# Mir tool options +# mir --grid=3/3 --vod2uv -# grib_get assertions +# grib_get uvRelativeToGrid = 0 diff --git a/tests/assertions/MIR-233.uvRelativeToGrid=1-wind.test b/tests/assertions/MIR-233.uvRelativeToGrid=1-wind.test index cc2ee0722..159aeb498 100644 --- a/tests/assertions/MIR-233.uvRelativeToGrid=1-wind.test +++ b/tests/assertions/MIR-233.uvRelativeToGrid=1-wind.test @@ -1,6 +1,6 @@ -# Mars request +# input param=vo_d,level=500 -# Mir tool options +# mir --grid=3/3 --rotation=-30.0/-10.0 --vod2uv -# grib_get assertions +# grib_get uvRelativeToGrid = 1 diff --git a/tests/assertions/MIR-236.grid=N640.1.core.test b/tests/assertions/MIR-236.grid=N640.1.core.test index 47c678290..ddfa48c45 100644 --- a/tests/assertions/MIR-236.grid=N640.1.core.test +++ b/tests/assertions/MIR-236.grid=N640.1.core.test @@ -1,8 +1,8 @@ -# Mars +# input param=2t,levtype=sfc,grid=N640 -# Mir +# mir --area=51.5189/2.08333/50.5349/5.83333 -# grib_get assertions +# grib_get gridName = N640 latitudeOfFirstGridPointInDegrees = 51.379 longitudeOfFirstGridPointInDegrees = 2.083 diff --git a/tests/assertions/MIR-236.grid=O1280.1.core.test b/tests/assertions/MIR-236.grid=O1280.1.core.test index af87d5600..45c3199c6 100644 --- a/tests/assertions/MIR-236.grid=O1280.1.core.test +++ b/tests/assertions/MIR-236.grid=O1280.1.core.test @@ -1,8 +1,8 @@ -# Mars (mentioned in ECC-474) +# input (ECC-474) param=msl,levtype=sfc,grid=O1280 -# Mir +# mir --area=-25/135/-47/179 -# grib_get assertions +# grib_get gridName = O1280 latitudeOfFirstGridPointInDegrees = -25.061 longitudeOfFirstGridPointInDegrees = 135 diff --git a/tests/assertions/MIR-236.grid=O1280.2.core.test b/tests/assertions/MIR-236.grid=O1280.2.core.test index d6621e5cd..6e2516cd1 100644 --- a/tests/assertions/MIR-236.grid=O1280.2.core.test +++ b/tests/assertions/MIR-236.grid=O1280.2.core.test @@ -1,8 +1,8 @@ -# Mars (mentioned in ECC-445) +# input (ECC-445) param=msl,levtype=sfc,grid=O1280 -# Mir +# mir --area=27.9/253/27.8/254 -# grib_get assertions +# grib_get gridName = O1280 latitudeOfFirstGridPointInDegrees = 27.874 longitudeOfFirstGridPointInDegrees = 253.074 diff --git a/tests/assertions/MIR-243.compress-plan.core.test b/tests/assertions/MIR-243.compress-plan.core.test index ae2dfbc48..59c30696f 100644 --- a/tests/assertions/MIR-243.compress-plan.core.test +++ b/tests/assertions/MIR-243.compress-plan.core.test @@ -1,9 +1,8 @@ -# regular_ll cropping for a periodic West-East range shouldn't include duplicate points -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --grid=1/1 --area=90/0/-90/360 -# grib_get assertions +# grib_get Ni = 360 Nj = 181 latitudeOfFirstGridPointInDegrees = 90 diff --git a/tests/assertions/MIR-243.dont-compress-plan.core.test b/tests/assertions/MIR-243.dont-compress-plan.core.test index 21cb06435..2d21120f6 100644 --- a/tests/assertions/MIR-243.dont-compress-plan.core.test +++ b/tests/assertions/MIR-243.dont-compress-plan.core.test @@ -1,9 +1,8 @@ -# regular_ll cropping for a periodic West-East range shouldn't include duplicate points -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --grid=1/1 --area=90/0/-90/360 --dont-compress-plan -# grib_get assertions +# grib_get Ni = 360 Nj = 181 latitudeOfFirstGridPointInDegrees = 90 diff --git a/tests/assertions/MIR-247.001.test.disabled b/tests/assertions/MIR-247.001.test.disabled index 42446639b..8f6b7ec84 100644 --- a/tests/assertions/MIR-247.001.test.disabled +++ b/tests/assertions/MIR-247.001.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.55469953775/1.41732283465 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-247.002.test.disabled b/tests/assertions/MIR-247.002.test.disabled index 6e67c280f..9a1d2dc77 100644 --- a/tests/assertions/MIR-247.002.test.disabled +++ b/tests/assertions/MIR-247.002.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.555555555556/1.41732283465 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-247.003.test.disabled b/tests/assertions/MIR-247.003.test.disabled index d98f85ef5..b86485d9c 100644 --- a/tests/assertions/MIR-247.003.test.disabled +++ b/tests/assertions/MIR-247.003.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.55832037325/1.41732283465 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-247.004.test.disabled b/tests/assertions/MIR-247.004.test.disabled index 806b55d9c..d65f6d21c 100644 --- a/tests/assertions/MIR-247.004.test.disabled +++ b/tests/assertions/MIR-247.004.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.559875583204/1.41732283465 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-248.001.core.test b/tests/assertions/MIR-248.001.core.test index d3b7b6989..4ba6f86bd 100644 --- a/tests/assertions/MIR-248.001.core.test +++ b/tests/assertions/MIR-248.001.core.test @@ -1,8 +1,8 @@ -# MARS request +# input regular_ll.2-2.grib1 -# MIR options +# mir --grid=f1280 --area=58.5940228153455/16.171875/58.5940228153455/16.2421875 -# grib_get assertions +# grib_get Ni=2 Nj=1 latitudeOfFirstGridPointInDegrees=58.595 diff --git a/tests/assertions/MIR-248.002.core.test b/tests/assertions/MIR-248.002.core.test index 7ec790f01..0c893a4c0 100644 --- a/tests/assertions/MIR-248.002.core.test +++ b/tests/assertions/MIR-248.002.core.test @@ -1,8 +1,8 @@ -# MARS request +# input regular_ll.2-2.grib2 -# MIR options +# mir --grid=f1280 --area=58.5940228153455/16.171875/58.5940228153455/16.2421875 -# grib_get assertions +# grib_get Ni=2 Nj=1 latitudeOfFirstGridPointInDegrees=58.594 diff --git a/tests/assertions/MIR-249.001.core.test b/tests/assertions/MIR-249.001.core.test index c84baa0c9..c8ffdcbbd 100644 --- a/tests/assertions/MIR-249.001.core.test +++ b/tests/assertions/MIR-249.001.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --area=13.6/39.7/13.5/39.6 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-249.002.core.test b/tests/assertions/MIR-249.002.core.test index c41067c34..43e5f4eec 100644 --- a/tests/assertions/MIR-249.002.core.test +++ b/tests/assertions/MIR-249.002.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --area=31/28.8/30.9/28.9 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-249.003.core.test b/tests/assertions/MIR-249.003.core.test index c6cc8daf1..9001b2832 100644 --- a/tests/assertions/MIR-249.003.core.test +++ b/tests/assertions/MIR-249.003.core.test @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --area=46/15/45.875/21 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-250.001.test.disabled b/tests/assertions/MIR-250.001.test.disabled index 2dc61f505..ebe836941 100644 --- a/tests/assertions/MIR-250.001.test.disabled +++ b/tests/assertions/MIR-250.001.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=t,level=1000 -# MIR options +# mir --grid=0.123456789/0.123456789 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-250.002.test.disabled b/tests/assertions/MIR-250.002.test.disabled index 039dfe8ea..536fdbe85 100644 --- a/tests/assertions/MIR-250.002.test.disabled +++ b/tests/assertions/MIR-250.002.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=t,level=1000 -# MIR options +# mir --grid=1.40625/0.555556 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.001.test.disabled b/tests/assertions/MIR-251.001.test.disabled index 66e6d0445..299c157cc 100644 --- a/tests/assertions/MIR-251.001.test.disabled +++ b/tests/assertions/MIR-251.001.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.00352/0.003558252427184 --area=34.657355/113.04832/34.29085525/113.74528 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.002.test.disabled b/tests/assertions/MIR-251.002.test.disabled index f1fe5d7dc..abd413900 100644 --- a/tests/assertions/MIR-251.002.test.disabled +++ b/tests/assertions/MIR-251.002.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.003474259/0.003496601747573 --area=34.6548026/113.04894614/34.2911562/113.7472724 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.003.test.disabled b/tests/assertions/MIR-251.003.test.disabled index 9412b14a1..9dc324fe0 100644 --- a/tests/assertions/MIR-251.003.test.disabled +++ b/tests/assertions/MIR-251.003.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.006198529411765/0.005665625 --area=36.34501645/113.58806225/35.81244723/114.41866527 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.004.test.disabled b/tests/assertions/MIR-251.004.test.disabled index 8072b98d5..50ceee8f0 100644 --- a/tests/assertions/MIR-251.004.test.disabled +++ b/tests/assertions/MIR-251.004.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.0097087/0.010417 --area=35.00112/112.9995593/33.990671/114.0092641 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.005.test.disabled b/tests/assertions/MIR-251.005.test.disabled index b1b3203eb..41e2adeed 100644 --- a/tests/assertions/MIR-251.005.test.disabled +++ b/tests/assertions/MIR-251.005.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.010417/0.007353 --area=36.345879/113.586968/35.816463/114.420328 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.015.test.disabled b/tests/assertions/MIR-251.015.test.disabled index 225ebda56..fb6977ae8 100644 --- a/tests/assertions/MIR-251.015.test.disabled +++ b/tests/assertions/MIR-251.015.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.0333333333333/0.0333333333333 --area=30.03333033/49.999995/26.9999973/53.03332803 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.016.test.disabled b/tests/assertions/MIR-251.016.test.disabled index 83da11586..6e82e5f9c 100644 --- a/tests/assertions/MIR-251.016.test.disabled +++ b/tests/assertions/MIR-251.016.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.04166666667/0.04166666667 --area=50.000004/339.95836053/19.95833493/350.000028 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.017.test.disabled b/tests/assertions/MIR-251.017.test.disabled index a391b9b8f..2bf025215 100644 --- a/tests/assertions/MIR-251.017.test.disabled +++ b/tests/assertions/MIR-251.017.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.0833333358/0.0833333358 --area=51.08333742/10.8333342/42.5000034/28.08333558 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-251.030.test.disabled b/tests/assertions/MIR-251.030.test.disabled index 4cd3b018e..9878d74aa 100644 --- a/tests/assertions/MIR-251.030.test.disabled +++ b/tests/assertions/MIR-251.030.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input param=2t,levtype=sfc -# MIR options +# mir --grid=0.8333333333333334/0.5555555555555556 --area=90/-359.16666667/29.44444468/0.83333189 -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-255.001.core.test b/tests/assertions/MIR-255.001.core.test index 24a7f7871..63ee438b2 100644 --- a/tests/assertions/MIR-255.001.core.test +++ b/tests/assertions/MIR-255.001.core.test @@ -1,8 +1,8 @@ -# Mars request +# input gridType=regular_gg,gridName=F48,shortName=msl,global=0.001.grib1 -# Mir tool options +# mir --grid=1/1 -# grib_get assertions +# grib_get Ni=121 Nj=48 latitudeOfFirstGridPointInDegrees=69 diff --git a/tests/assertions/MIR-255.002.core.test b/tests/assertions/MIR-255.002.core.test index 228a090ad..f8d4021b4 100644 --- a/tests/assertions/MIR-255.002.core.test +++ b/tests/assertions/MIR-255.002.core.test @@ -1,8 +1,8 @@ -# Mars request +# input gridType=regular_gg,gridName=F48,shortName=msl,global=0.002.grib1 -# Mir tool options +# mir --grid=1/1 -# grib_get assertions +# grib_get Ni=360 Nj=168 latitudeOfFirstGridPointInDegrees=90 diff --git a/tests/assertions/MIR-255.003.core.test b/tests/assertions/MIR-255.003.core.test index 20d7c64f1..2824c5b4c 100644 --- a/tests/assertions/MIR-255.003.core.test +++ b/tests/assertions/MIR-255.003.core.test @@ -1,8 +1,8 @@ -# Mars request +# input gridType=regular_gg,gridName=F80,shortName=msl,global=0.001.grib1 -# Mir tool options +# mir --grid=1/1 -# grib_get assertions +# grib_get Ni=119 Nj=48 latitudeOfFirstGridPointInDegrees=68 diff --git a/tests/assertions/MIR-255.004.core.test b/tests/assertions/MIR-255.004.core.test index abb3507ee..d0eb183a4 100644 --- a/tests/assertions/MIR-255.004.core.test +++ b/tests/assertions/MIR-255.004.core.test @@ -1,8 +1,8 @@ -# Mars request +# input gridType=regular_gg,gridName=F80,shortName=msl,global=0.002.grib1 -# Mir tool options +# mir --grid=1/1 -# grib_get assertions +# grib_get Ni=360 Nj=168 latitudeOfFirstGridPointInDegrees=90 diff --git a/tests/assertions/MIR-255.005.core.test b/tests/assertions/MIR-255.005.core.test index 3091e5530..ebf157074 100644 --- a/tests/assertions/MIR-255.005.core.test +++ b/tests/assertions/MIR-255.005.core.test @@ -1,8 +1,8 @@ -# Mars request +# input gridType=regular_gg,gridName=F640,shortName=msl,global=0.grib1 -# Mir tool options +# mir --grid=1/1 -# grib_get assertions +# grib_get Ni=129 Nj=60 latitudeOfFirstGridPointInDegrees=75 diff --git a/tests/assertions/MIR-278.001.test b/tests/assertions/MIR-278.001.test index 6746b2b5e..d2b71ae31 100644 --- a/tests/assertions/MIR-278.001.test +++ b/tests/assertions/MIR-278.001.test @@ -1,8 +1,8 @@ -# MARS request +# input param=t,level=1000,resol=20 -# MIR options +# mir --grid=1/1 --area=1/1/1/1 -# grib_get assertions +# grib_get Ni=1 Nj=1 latitudeOfFirstGridPointInDegrees=1 diff --git a/tests/assertions/MIR-278.002.test b/tests/assertions/MIR-278.002.test index 5d68d9cae..f041502d8 100644 --- a/tests/assertions/MIR-278.002.test +++ b/tests/assertions/MIR-278.002.test @@ -1,8 +1,8 @@ -# MARS request +# input param=t,level=1000,resol=20 -# MIR options +# mir --grid=1/1 --area=1/1/1/1 --dont-compress-plan -# grib_get assertions +# grib_get Ni=1 Nj=1 latitudeOfFirstGridPointInDegrees=1 diff --git a/tests/assertions/MIR-280.001.core.test b/tests/assertions/MIR-280.001.core.test index d0fd24c14..c174cbf92 100644 --- a/tests/assertions/MIR-280.001.core.test +++ b/tests/assertions/MIR-280.001.core.test @@ -1,6 +1,6 @@ -# MARS request +# input stream=wave,param=swh,special -# mir (do nothing) +# mir --intgrid=none -# grib_get assertions +# grib_get missingValuesPresent = 1 diff --git a/tests/assertions/MIR-280.002.core.test b/tests/assertions/MIR-280.002.core.test index 34b710897..6045a7ae6 100644 --- a/tests/assertions/MIR-280.002.core.test +++ b/tests/assertions/MIR-280.002.core.test @@ -1,6 +1,6 @@ -# MARS request +# input stream=wave,param=swh,special # mir --area=25/-30/15/-20 -# grib_get assertions +# grib_get missingValuesPresent = 0 diff --git a/tests/assertions/MIR-280.003.core.test b/tests/assertions/MIR-280.003.core.test index a8dfa05a9..158d58852 100644 --- a/tests/assertions/MIR-280.003.core.test +++ b/tests/assertions/MIR-280.003.core.test @@ -1,6 +1,6 @@ -# MARS request +# input stream=wave,param=swh,special # mir --area=25/-20/15/-10 -# grib_get assertions +# grib_get missingValuesPresent = 1 diff --git a/tests/assertions/MIR-280.004.core.test b/tests/assertions/MIR-280.004.core.test index 752706dd5..07c296c26 100644 --- a/tests/assertions/MIR-280.004.core.test +++ b/tests/assertions/MIR-280.004.core.test @@ -1,6 +1,6 @@ -# MARS request +# input stream=wave,param=swh,special # mir --area=25/-10/15/0 -# grib_get assertions +# grib_get missingValuesPresent = 1 diff --git a/tests/assertions/MIR-298.001.core.test b/tests/assertions/MIR-298.001.core.test index 6b6b2331f..1d393cc15 100644 --- a/tests/assertions/MIR-298.001.core.test +++ b/tests/assertions/MIR-298.001.core.test @@ -1,9 +1,8 @@ -# Test with input area 69.946/-60/21.45/60 -# mars +# input gridType=regular_gg,gridName=F48,shortName=msl,global=0.001.grib1 -# Mir tool options +# mir --grid=0.5/0.5 --area=60/-350/20/9 -# assertions +# grib_get gridType=regular_ll latitudeOfFirstGridPointInDegrees=60 longitudeOfFirstGridPointInDegrees=-60 diff --git a/tests/assertions/MIR-298.002.test b/tests/assertions/MIR-298.002.test index f78f50185..2fec0a4e3 100644 --- a/tests/assertions/MIR-298.002.test +++ b/tests/assertions/MIR-298.002.test @@ -1,8 +1,8 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=0.5/0.5 --area=0/-350/0/9 -# assertions +# grib_get gridType=regular_ll Ni=719 latitudeOfFirstGridPointInDegrees=0 diff --git a/tests/assertions/MIR-298.003.test b/tests/assertions/MIR-298.003.test index a21cbd422..0bee70e71 100644 --- a/tests/assertions/MIR-298.003.test +++ b/tests/assertions/MIR-298.003.test @@ -1,7 +1,6 @@ -# Calculate unrotated bounding box from rotated touching North/South pole (can cause invalid latitude) -# mars +# input param=t,level=1000,resol=20 # mir --grid=1/1 --area=-70/-10/-90/10 --rotation=-40/22 -# assertions +# grib_get gridType=rotated_ll diff --git a/tests/assertions/MIR-298.004.test b/tests/assertions/MIR-298.004.test index a9d4311f4..e27550f42 100644 --- a/tests/assertions/MIR-298.004.test +++ b/tests/assertions/MIR-298.004.test @@ -1,7 +1,6 @@ -# Calculate unrotated bounding box from rotated touching North/South pole (can cause invalid latitude) -# mars +# input param=t,level=1000,resol=20 -# mir +# mir (calculate unrotated bounding box from rotated touching North/South pole, can cause invalid latitude) --grid=1/1 --area=90/-10/70/10 --rotation=-40/22 -# assertions +# grib_get gridType=rotated_ll diff --git a/tests/assertions/MIR-298.005.test b/tests/assertions/MIR-298.005.test index 3f4fa6f29..30dfe868f 100644 --- a/tests/assertions/MIR-298.005.test +++ b/tests/assertions/MIR-298.005.test @@ -1,10 +1,8 @@ -# Test for intermediate reduced Gaussian grid (not the default behaviour) -# Note: also tested in mir_tests_unit_bounding_box -# mars +# input param=t,level=1000,resol=20 # mir --grid=1/1 --area=90/10/-10/9 --intgrid=N160 -# assertions +# grib_get gridType=regular_ll latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=10 diff --git a/tests/assertions/MIR-298.006.test b/tests/assertions/MIR-298.006.test index abea817ac..d8421e923 100644 --- a/tests/assertions/MIR-298.006.test +++ b/tests/assertions/MIR-298.006.test @@ -1,10 +1,8 @@ -# Test for intermediate reduced Gaussian grid (not the default behaviour) -# Note: also tested in mir_tests_unit_bounding_box -# mars +# input param=t,level=1000,resol=20 # mir --grid=1/1 --area=90/10/-10/9 --intgrid=source -# assertions +# grib_get gridType=regular_ll latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=10 diff --git a/tests/assertions/MIR-298.007.test b/tests/assertions/MIR-298.007.test index 52d62143b..1da204ca6 100644 --- a/tests/assertions/MIR-298.007.test +++ b/tests/assertions/MIR-298.007.test @@ -1,10 +1,8 @@ -# Test for no intermediate grid (not the default behaviour) -# Note: also tested in mir_tests_unit_bounding_box -# mars +# input param=t,level=1000,resol=20 # mir --grid=1/1 --area=90/10/-10/9 --intgrid=none -# assertions +# grib_get gridType=regular_ll latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=10 diff --git a/tests/assertions/MIR-298.008.test b/tests/assertions/MIR-298.008.test index 9e50be61f..11725f3fa 100644 --- a/tests/assertions/MIR-298.008.test +++ b/tests/assertions/MIR-298.008.test @@ -1,10 +1,8 @@ -# Test for intermediate reduced Gaussian grid (not the default behaviour) -# Note: also tested in mir_tests_unit_bounding_box -# mars +# input param=t,level=1000,resol=20 # mir --grid=0.5/0.5 --area=90/-350/-10/9 --intgrid=N160 -# assertions +# grib_get gridType=regular_ll latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=-350 diff --git a/tests/assertions/MIR-298.009.test b/tests/assertions/MIR-298.009.test index e1093e362..df8f3719e 100644 --- a/tests/assertions/MIR-298.009.test +++ b/tests/assertions/MIR-298.009.test @@ -1,10 +1,8 @@ -# Test for intermediate reduced Gaussian grid (not the default behaviour) -# Note: also tested in mir_tests_unit_bounding_box -# mars +# input param=t,level=1000,resol=20 # mir --grid=0.5/0.5 --area=90/-350/-10/9 --intgrid=source -# assertions +# grib_get gridType=regular_ll latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=-350 diff --git a/tests/assertions/MIR-298.010.test b/tests/assertions/MIR-298.010.test index 25a3cfbb8..3fef0d1d2 100644 --- a/tests/assertions/MIR-298.010.test +++ b/tests/assertions/MIR-298.010.test @@ -1,10 +1,8 @@ -# Test for no intermediate grid (not the default behaviour) -# Note: also tested in mir_tests_unit_bounding_box -# mars +# input param=t,level=1000,resol=20 # mir --grid=0.5/0.5 --area=90/-350/-10/9 --intgrid=none -# assertions +# grib_get gridType=regular_ll latitudeOfFirstGridPointInDegrees=90 longitudeOfFirstGridPointInDegrees=-350 diff --git a/tests/assertions/MIR-309.001.core.test b/tests/assertions/MIR-309.001.core.test index fb7cca752..cf1c262c1 100644 --- a/tests/assertions/MIR-309.001.core.test +++ b/tests/assertions/MIR-309.001.core.test @@ -1,7 +1,7 @@ -# mars +# input stream=wave,param=swh,domain=m # mir --area=28/-77/3/-43 --globalise --grid=0.125/0.125 -# assertions +# grib_get Ni=273 Nj=201 diff --git a/tests/assertions/MIR-309.002.core.test b/tests/assertions/MIR-309.002.core.test index 74147ac17..6e9889f49 100644 --- a/tests/assertions/MIR-309.002.core.test +++ b/tests/assertions/MIR-309.002.core.test @@ -1,7 +1,7 @@ -# mars +# input stream=wave,param=swh,domain=m # mir --area=28/-77/3/-43 --globalise --grid=0.125/0.125 --dont-compress-plan -# assertions +# grib_get Ni=273 Nj=201 diff --git a/tests/assertions/MIR-313.001.core.test b/tests/assertions/MIR-313.001.core.test index 74f097ed3..30b897232 100644 --- a/tests/assertions/MIR-313.001.core.test +++ b/tests/assertions/MIR-313.001.core.test @@ -1,8 +1,8 @@ -# MARS request +# input levtype=ml,levelist=1,param=q # mir --area=19.3/-6.3/-2.3/18.3 --grid=.3/.3 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 19.3 longitudeOfFirstGridPointInDegrees = 353.7 # GRIB2 encoding latitudeOfLastGridPointInDegrees = -2.3 diff --git a/tests/assertions/MIR-313.002.core.test b/tests/assertions/MIR-313.002.core.test index 6b601a2e5..ac55da3f3 100644 --- a/tests/assertions/MIR-313.002.core.test +++ b/tests/assertions/MIR-313.002.core.test @@ -1,8 +1,8 @@ -# MARS request +# input levtype=ml,levelist=1,param=q # mir --area=19.3/-6.3/-2.3/18.3 --grid=.3/.3 --dont-compress-plan -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 19.3 longitudeOfFirstGridPointInDegrees = 353.7 # GRIB2 encoding latitudeOfLastGridPointInDegrees = -2.3 diff --git a/tests/assertions/MIR-313.003.test b/tests/assertions/MIR-313.003.test index 96f85a4fa..5562abd2d 100644 --- a/tests/assertions/MIR-313.003.test +++ b/tests/assertions/MIR-313.003.test @@ -1,8 +1,8 @@ -# MARS request +# input levtype=ml,levelist=1,param=q # mir --area=19.3/-6.3/-2.3/18.3 --grid=.15/.15 --rotation=-40/10 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 19.3 longitudeOfFirstGridPointInDegrees = 353.7 # GRIB2 encoding latitudeOfLastGridPointInDegrees = -2.3 diff --git a/tests/assertions/MIR-313.004.test b/tests/assertions/MIR-313.004.test index fe5c1310b..aee87bdf1 100644 --- a/tests/assertions/MIR-313.004.test +++ b/tests/assertions/MIR-313.004.test @@ -1,8 +1,8 @@ -# MARS request +# input levtype=ml,levelist=1,param=q # mir --area=19.3/-6.3/-2.3/18.3 --grid=.15/.15 --rotation=-40/10 --dont-compress-plan -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees = 19.3 longitudeOfFirstGridPointInDegrees = 353.7 # GRIB2 encoding latitudeOfLastGridPointInDegrees = -2.3 diff --git a/tests/assertions/MIR-313.005.core.test b/tests/assertions/MIR-313.005.core.test index b54922280..973487ee1 100644 --- a/tests/assertions/MIR-313.005.core.test +++ b/tests/assertions/MIR-313.005.core.test @@ -1,8 +1,7 @@ -# handle wrongly-encoded longitudeOfLastGridPointInDegrees (GRIB1, O400) -# mars +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) param=z,stream=oper,levtype=sfc.grid=O400.wrong.grib1 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=0 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-313.006.core.fail.test b/tests/assertions/MIR-313.006.core.fail.test index e1df7c0f3..9e45d7b88 100644 --- a/tests/assertions/MIR-313.006.core.fail.test +++ b/tests/assertions/MIR-313.006.core.fail.test @@ -1,8 +1,7 @@ -# handle wrongly-encoded longitudeOfLastGridPointInDegrees (GRIB1, O400) -# mars +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) param=z,stream=oper,levtype=sfc.grid=O400.wrong.grib1 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=1 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-313.007.core.test b/tests/assertions/MIR-313.007.core.test index 7020be581..0bd72df82 100644 --- a/tests/assertions/MIR-313.007.core.test +++ b/tests/assertions/MIR-313.007.core.test @@ -1,8 +1,7 @@ -# handle wrongly-encoded longitudeOfLastGridPointInDegrees (GRIB2) -# mars +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) stream=enfo,param=q,levtype=ml,type=cf,levelist=1,date=20130118,time=1200,step=0 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=0 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-313.008.core.fail.test b/tests/assertions/MIR-313.008.core.fail.test index cd172c3c4..dd685236e 100644 --- a/tests/assertions/MIR-313.008.core.fail.test +++ b/tests/assertions/MIR-313.008.core.fail.test @@ -1,8 +1,7 @@ -# handle wrongly-encoded longitudeOfLastGridPointInDegrees (GRIB2) -# mars +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) stream=enfo,param=q,levtype=ml,type=cf,levelist=1,date=20130118,time=1200,step=0 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=1 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-327.core.test b/tests/assertions/MIR-327.core.test index ac272011a..b33e1215c 100644 --- a/tests/assertions/MIR-327.core.test +++ b/tests/assertions/MIR-327.core.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --truncation=19 diff --git a/tests/assertions/MIR-329.001.core.fail.test b/tests/assertions/MIR-329.001.core.fail.test index 6500b933d..12be9b654 100644 --- a/tests/assertions/MIR-329.001.core.fail.test +++ b/tests/assertions/MIR-329.001.core.fail.test @@ -1,6 +1,6 @@ -# mars +# input param=vo/d,level=1000,grid=3/3 # mir --vod2uv -# grib_get assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-329.002.core.fail.test b/tests/assertions/MIR-329.002.core.fail.test index 75a4d5152..a0501a06f 100644 --- a/tests/assertions/MIR-329.002.core.fail.test +++ b/tests/assertions/MIR-329.002.core.fail.test @@ -1,6 +1,6 @@ -# mars +# input param=vo/d,level=1000,resol=20.ERROR # mir --vod2uv -# grib_get assertions +# grib_get gridType=sh diff --git a/tests/assertions/MIR-332.001.core.test b/tests/assertions/MIR-332.001.core.test index 7151a4916..04ca7d7d1 100644 --- a/tests/assertions/MIR-332.001.core.test +++ b/tests/assertions/MIR-332.001.core.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --accuracy=8 diff --git a/tests/assertions/MIR-332.002.core.test b/tests/assertions/MIR-332.002.core.test index 96b9c1985..c3248a806 100644 --- a/tests/assertions/MIR-332.002.core.test +++ b/tests/assertions/MIR-332.002.core.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --packing=so diff --git a/tests/assertions/MIR-332.003.core.test b/tests/assertions/MIR-332.003.core.test index 44846ad0a..5920e0d46 100644 --- a/tests/assertions/MIR-332.003.core.test +++ b/tests/assertions/MIR-332.003.core.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --edition=2 diff --git a/tests/assertions/MIR-346.test b/tests/assertions/MIR-346.test index 6251bf10e..de910c082 100644 --- a/tests/assertions/MIR-346.test +++ b/tests/assertions/MIR-346.test @@ -1,4 +1,4 @@ -# mars +# input param=vo/d,level=1000,resol=20 # mir --vod2uv --accuracy=24 diff --git a/tests/assertions/MIR-349.001.core.fail.test b/tests/assertions/MIR-349.001.core.fail.test index 3c003f77d..388753b52 100644 --- a/tests/assertions/MIR-349.001.core.fail.test +++ b/tests/assertions/MIR-349.001.core.fail.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib1 # mir $MIR_ABORT_IF_CONFIGURATION_NOT_FOUND=1 $MIR_HOME=/bad --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-349.002.core.test b/tests/assertions/MIR-349.002.core.test index da9cac0e5..65462c255 100644 --- a/tests/assertions/MIR-349.002.core.test +++ b/tests/assertions/MIR-349.002.core.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib1 # mir $MIR_ABORT_IF_CONFIGURATION_NOT_FOUND=0 $MIR_HOME=/bad --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-375.001.core.test b/tests/assertions/MIR-375.001.core.test index cba4836fa..b9fe8439e 100644 --- a/tests/assertions/MIR-375.001.core.test +++ b/tests/assertions/MIR-375.001.core.test @@ -1,11 +1,9 @@ -# handle wrongly-encoded latitudeOfFirstGridPointInDegrees, latitudeOfLastGridPointInDegrees (GRIB1, O2560) -# domain=g,levtype=pl,levelist=850,date=20160801,time=0000,step=24,param=133.128,class=rd,type=fc,stream=lwda,expver=h5xa,anoffset=9 -# correct latitude range should be [-89.974, 89.974], however metadata is preserved from input (unless more than change of bitsPerValue/packingType/edition is requested) +# input (wrongly-encoded latitudeOfFirstGridPointInDegrees, latitudeOfLastGridPointInDegrees; domain=g,levtype=pl,levelist=850,date=20160801,time=0000,step=24,param=133.128,class=rd,type=fc,stream=lwda,expver=h5xa,anoffset=9; correct latitude range should be [-89.974, 89.974], however metadata is preserved from input, unless more than change of bitsPerValue/packingType/edition is requested) MIR-375.grib1 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=0 --accuracy=8 -# assertions +# grib_get numberOfValues=26306560 latitudeOfFirstGridPointInDegrees=89.972 latitudeOfLastGridPointInDegrees=-89.972 diff --git a/tests/assertions/MIR-375.002.core.fail.test b/tests/assertions/MIR-375.002.core.fail.test index 9e7fde426..1c52fcfa4 100644 --- a/tests/assertions/MIR-375.002.core.fail.test +++ b/tests/assertions/MIR-375.002.core.fail.test @@ -1,10 +1,9 @@ -# handle wrongly-encoded latitudeOfFirstGridPointInDegrees, latitudeOfLastGridPointInDegrees (GRIB1, O2560) -# domain=g,levtype=pl,levelist=850,date=20160801,time=0000,step=24,param=133.128,class=rd,type=fc,stream=lwda,expver=h5xa,anoffset=9 +# input (wrongly-encoded latitudeOfFirstGridPointInDegrees, latitudeOfLastGridPointInDegrees; domain=g,levtype=pl,levelist=850,date=20160801,time=0000,step=24,param=133.128,class=rd,type=fc,stream=lwda,expver=h5xa,anoffset=9) MIR-375.grib1 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=1 --accuracy=8 -# assertions +# grib_get numberOfValues=26306560 latitudeOfFirstGridPointInDegrees=89.974 latitudeOfLastGridPointInDegrees=-89.974 diff --git a/tests/assertions/MIR-380.O16-to-laea.test b/tests/assertions/MIR-380.O16-to-laea.test index a8eb1baef..dd2898176 100644 --- a/tests/assertions/MIR-380.O16-to-laea.test +++ b/tests/assertions/MIR-380.O16-to-laea.test @@ -1,8 +1,8 @@ -# mars +# input param=2t,levtype=sfc,grid=O16 # mir --grid=gridType=lambert_azimuthal_equal_area\;grid=5000./5000.\;standardParallelInDegrees=52.\;centralLongitudeInDegrees=10.\;latitudeOfFirstGridPointInDegrees=66.982143\;longitudeOfFirstGridPointInDegrees=-35.034024\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert_azimuthal_equal_area standardParallelInDegrees=52 centralLongitudeInDegrees=10 diff --git a/tests/assertions/MIR-380.regular_ll_grib1-to-laea.test b/tests/assertions/MIR-380.regular_ll_grib1-to-laea.test index 15d5640a0..b053b560b 100644 --- a/tests/assertions/MIR-380.regular_ll_grib1-to-laea.test +++ b/tests/assertions/MIR-380.regular_ll_grib1-to-laea.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=gridType=lambert_azimuthal_equal_area\;grid=5000./5000.\;standardParallelInDegrees=52.\;centralLongitudeInDegrees=10.\;latitudeOfFirstGridPointInDegrees=66.982143\;longitudeOfFirstGridPointInDegrees=-35.034024\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert_azimuthal_equal_area standardParallelInDegrees=52 centralLongitudeInDegrees=10 diff --git a/tests/assertions/MIR-380.regular_ll_grib2-to-laea.test b/tests/assertions/MIR-380.regular_ll_grib2-to-laea.test index c33303d0b..e7569d2ce 100644 --- a/tests/assertions/MIR-380.regular_ll_grib2-to-laea.test +++ b/tests/assertions/MIR-380.regular_ll_grib2-to-laea.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=gridType=lambert_azimuthal_equal_area\;grid=5000./5000.\;standardParallelInDegrees=52.\;centralLongitudeInDegrees=10.\;latitudeOfFirstGridPointInDegrees=66.982143\;longitudeOfFirstGridPointInDegrees=-35.034024\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert_azimuthal_equal_area standardParallelInDegrees=52 centralLongitudeInDegrees=10 diff --git a/tests/assertions/MIR-380.sh-to-laea.test b/tests/assertions/MIR-380.sh-to-laea.test index ddda15d9f..a0e61624d 100644 --- a/tests/assertions/MIR-380.sh-to-laea.test +++ b/tests/assertions/MIR-380.sh-to-laea.test @@ -1,8 +1,8 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=gridType=lambert_azimuthal_equal_area\;grid=5000./5000.\;standardParallelInDegrees=52.\;centralLongitudeInDegrees=10.\;latitudeOfFirstGridPointInDegrees=66.982143\;longitudeOfFirstGridPointInDegrees=-35.034024\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert_azimuthal_equal_area standardParallelInDegrees=52 centralLongitudeInDegrees=10 diff --git a/tests/assertions/MIR-420.0001.core.test b/tests/assertions/MIR-420.0001.core.test index d8cf9924d..14fb8543c 100644 --- a/tests/assertions/MIR-420.0001.core.test +++ b/tests/assertions/MIR-420.0001.core.test @@ -1,6 +1,6 @@ -# ICON example +# input ICON.shortName=lsm.grib2 -# Mir tool options +# mir --input="{latitudes:$tests_assertions_dir/ICON.shortName=CLAT.grib2,longitudes:$tests_assertions_dir/ICON.shortName=CLON.grib2}" --area=20/0/0/20 -# grib_get assertions +# grib_get numberOfValues=189 diff --git a/tests/assertions/MIR-429.001.test b/tests/assertions/MIR-429.001.test index 9d6058843..e5cd3ec8d 100644 --- a/tests/assertions/MIR-429.001.test +++ b/tests/assertions/MIR-429.001.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=9/9 --area=90/-180/0/171 diff --git a/tests/assertions/MIR-429.002.test b/tests/assertions/MIR-429.002.test index dcfaf9187..1b22f3216 100644 --- a/tests/assertions/MIR-429.002.test +++ b/tests/assertions/MIR-429.002.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=9/9 --area=90/-180/0/180 diff --git a/tests/assertions/MIR-442.001.core.fail.test b/tests/assertions/MIR-442.001.core.fail.test index d1b514f53..85afbc822 100644 --- a/tests/assertions/MIR-442.001.core.fail.test +++ b/tests/assertions/MIR-442.001.core.fail.test @@ -1,8 +1,7 @@ -# fail on wrongly-encoded longitudeOfLastGridPointInDegrees -# GRIB +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) MIR-442.001.wrong.grib1 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=1 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-442.002.core.test b/tests/assertions/MIR-442.002.core.test index 5bb0c97a9..7452c84da 100644 --- a/tests/assertions/MIR-442.002.core.test +++ b/tests/assertions/MIR-442.002.core.test @@ -1,9 +1,7 @@ -# fail on wrongly-encoded longitudeOfLastGridPointInDegrees -# GRIB +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) MIR-442.001.wrong.grib1 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=0 --grid=9/9 -# assertions +# grib_get gridType=regular_ll - diff --git a/tests/assertions/MIR-442.003.core.fail.test b/tests/assertions/MIR-442.003.core.fail.test index 43fb69cd0..7fbeda6ed 100644 --- a/tests/assertions/MIR-442.003.core.fail.test +++ b/tests/assertions/MIR-442.003.core.fail.test @@ -1,8 +1,7 @@ -# fail on wrongly-encoded longitudeOfLastGridPointInDegrees -# GRIB +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) MIR-442.003.wrong.grib1 # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=1 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-442.004.core.test b/tests/assertions/MIR-442.004.core.test index df78d28f5..73b8f8674 100644 --- a/tests/assertions/MIR-442.004.core.test +++ b/tests/assertions/MIR-442.004.core.test @@ -1,8 +1,7 @@ -# handle wrongly-encoded longitudeOfLastGridPointInDegrees (GRIB1, O400) -# mars +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) stream=wave,param=swh # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=0 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-442.005.core.fail.test b/tests/assertions/MIR-442.005.core.fail.test index 8e2cfb0bd..d317bda4a 100644 --- a/tests/assertions/MIR-442.005.core.fail.test +++ b/tests/assertions/MIR-442.005.core.fail.test @@ -1,8 +1,7 @@ -# handle wrongly-encoded longitudeOfLastGridPointInDegrees (GRIB1, O400) -# mars +# input (wrongly-encoded longitudeOfLastGridPointInDegrees) stream=wave,param=swh # mir $MIR_ABORT_IF_WRONGLY_ENCODED_GRIB=1 --grid=9/9 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-459.nabla=scalar-gradient.param=u_v.test b/tests/assertions/MIR-459.nabla=scalar-gradient.param=u_v.test index 3066b988b..e85fc9e02 100644 --- a/tests/assertions/MIR-459.nabla=scalar-gradient.param=u_v.test +++ b/tests/assertions/MIR-459.nabla=scalar-gradient.param=u_v.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --nabla=scalar-gradient # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.gridded.test b/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.gridded.test index 06b029cf1..1274c7e1a 100644 --- a/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.gridded.test +++ b/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.gridded.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=z # mir --nabla=scalar-gradient # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.sh.test b/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.sh.test index 6c990c1fb..77dafd0a3 100644 --- a/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.sh.test +++ b/tests/assertions/MIR-459.nabla=scalar-gradient.param=z.sh.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=z # mir --grid=1/1 --nabla=scalar-gradient # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=scalar-laplacian.param=u_v.test b/tests/assertions/MIR-459.nabla=scalar-laplacian.param=u_v.test index 151b7c17d..b6e42684a 100644 --- a/tests/assertions/MIR-459.nabla=scalar-laplacian.param=u_v.test +++ b/tests/assertions/MIR-459.nabla=scalar-laplacian.param=u_v.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --nabla=scalar-laplacian # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.gridded.test b/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.gridded.test index 8327d5d4f..48f98853a 100644 --- a/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.gridded.test +++ b/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.gridded.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=z # mir --nabla=scalar-laplacian # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.sh.test b/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.sh.test index 7039c88ad..3032679a2 100644 --- a/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.sh.test +++ b/tests/assertions/MIR-459.nabla=scalar-laplacian.param=z.sh.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=z # mir --grid=1/1 --nabla=scalar-laplacian # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=uv-divergence.param=u_v.test b/tests/assertions/MIR-459.nabla=uv-divergence.param=u_v.test index 382e81a93..06d6a9ccf 100644 --- a/tests/assertions/MIR-459.nabla=uv-divergence.param=u_v.test +++ b/tests/assertions/MIR-459.nabla=uv-divergence.param=u_v.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --uv2uv --nabla=uv-divergence # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=uv-divergence.param=vo_d.test b/tests/assertions/MIR-459.nabla=uv-divergence.param=vo_d.test index 5160e9266..7b4f1c3bd 100644 --- a/tests/assertions/MIR-459.nabla=uv-divergence.param=vo_d.test +++ b/tests/assertions/MIR-459.nabla=uv-divergence.param=vo_d.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=vo_d # mir --vod2uv --grid=1/1 --nabla=uv-divergence # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=uv-gradient.param=u_v.test b/tests/assertions/MIR-459.nabla=uv-gradient.param=u_v.test index 23b64deb7..e2bffbdfb 100644 --- a/tests/assertions/MIR-459.nabla=uv-gradient.param=u_v.test +++ b/tests/assertions/MIR-459.nabla=uv-gradient.param=u_v.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --uv2uv --nabla=uv-gradient # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=uv-gradient.param=vo_d.test b/tests/assertions/MIR-459.nabla=uv-gradient.param=vo_d.test index 6b75de378..0de853891 100644 --- a/tests/assertions/MIR-459.nabla=uv-gradient.param=vo_d.test +++ b/tests/assertions/MIR-459.nabla=uv-gradient.param=vo_d.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=vo_d # mir --vod2uv --grid=1/1 --nabla=uv-gradient # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=uv-vorticity.param=u_v.test b/tests/assertions/MIR-459.nabla=uv-vorticity.param=u_v.test index 108c53d41..291d8944e 100644 --- a/tests/assertions/MIR-459.nabla=uv-vorticity.param=u_v.test +++ b/tests/assertions/MIR-459.nabla=uv-vorticity.param=u_v.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --uv2uv --nabla=uv-vorticity # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-459.nabla=uv-vorticity.param=vo_d.test b/tests/assertions/MIR-459.nabla=uv-vorticity.param=vo_d.test index f37e142da..aec9004e1 100644 --- a/tests/assertions/MIR-459.nabla=uv-vorticity.param=vo_d.test +++ b/tests/assertions/MIR-459.nabla=uv-vorticity.param=vo_d.test @@ -1,6 +1,5 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=vo_d # mir --vod2uv --grid=1/1 --nabla=uv-vorticity # grib_get -# (no checks for the moment) diff --git a/tests/assertions/MIR-474.O16-to-lambert.test b/tests/assertions/MIR-474.O16-to-lambert.test index f344f4540..d9b85cc03 100644 --- a/tests/assertions/MIR-474.O16-to-lambert.test +++ b/tests/assertions/MIR-474.O16-to-lambert.test @@ -1,8 +1,8 @@ -# mars +# input param=2t,levtype=sfc,grid=O16 # mir --grid=gridType=lambert\;grid=2500./2500.\;writeLaDInDegrees=0\;LaDInDegrees=45.8\;LoVInDegrees=2.\;latitudeOfFirstGridPointInDegrees=37.333\;longitudeOfFirstGridPointInDegrees=-8.354\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert LaDInDegrees=45.8 LoVInDegrees=2 diff --git a/tests/assertions/MIR-474.regular_ll_grib1-to-lambert.test b/tests/assertions/MIR-474.regular_ll_grib1-to-lambert.test index f694256d1..559949154 100644 --- a/tests/assertions/MIR-474.regular_ll_grib1-to-lambert.test +++ b/tests/assertions/MIR-474.regular_ll_grib1-to-lambert.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=gridType=lambert\;grid=2500./2500.\;writeLaDInDegrees=0\;LaDInDegrees=45.8\;LoVInDegrees=2.\;latitudeOfFirstGridPointInDegrees=37.333\;longitudeOfFirstGridPointInDegrees=-8.354\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert LaDInDegrees=45.8 LoVInDegrees=2 diff --git a/tests/assertions/MIR-474.regular_ll_grib2-to-lambert.test b/tests/assertions/MIR-474.regular_ll_grib2-to-lambert.test index 097515803..db5494573 100644 --- a/tests/assertions/MIR-474.regular_ll_grib2-to-lambert.test +++ b/tests/assertions/MIR-474.regular_ll_grib2-to-lambert.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=gridType=lambert\;grid=2500./2500.\;writeLaDInDegrees=1\;writeLonPositive=1\;LaDInDegrees=45.8\;LoVInDegrees=2.\;latitudeOfFirstGridPointInDegrees=37.333\;longitudeOfFirstGridPointInDegrees=-8.354\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert LaDInDegrees=45.8 LoVInDegrees=2 diff --git a/tests/assertions/MIR-474.sh-to-lambert.test b/tests/assertions/MIR-474.sh-to-lambert.test index c7b361f7c..fe5b51c5c 100644 --- a/tests/assertions/MIR-474.sh-to-lambert.test +++ b/tests/assertions/MIR-474.sh-to-lambert.test @@ -1,8 +1,8 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=gridType=lambert\;grid=2500./2500.\;writeLaDInDegrees=0\;LaDInDegrees=45.8\;LoVInDegrees=2.\;latitudeOfFirstGridPointInDegrees=37.333\;longitudeOfFirstGridPointInDegrees=-8.354\;Ni=1000\;Nj=950\;gaussianNumber=1280 -# grib_get assertions +# grib_get gridType=lambert LaDInDegrees=45.8 LoVInDegrees=2 diff --git a/tests/assertions/MIR-479.core.fail.test b/tests/assertions/MIR-479.core.fail.test index 116a42580..2b4fbb21e 100644 --- a/tests/assertions/MIR-479.core.fail.test +++ b/tests/assertions/MIR-479.core.fail.test @@ -1,6 +1,6 @@ -# mars +# input param=2t,levtype=sfc # mir --grid=9/9 --interpolation=fail -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-482.001.core.test b/tests/assertions/MIR-482.001.core.test index c4a547980..8a718cb51 100644 --- a/tests/assertions/MIR-482.001.core.test +++ b/tests/assertions/MIR-482.001.core.test @@ -1,7 +1,7 @@ -# input has two GRIB at bitsPerValue=16 -tiny.grib -# Mir tool options +# input +tiny-2x2.grib +# mir --accuracy=32 --packing=ieee -# grib_get assertions +# grib_get packingType=grid_ieee precision=1 diff --git a/tests/assertions/MIR-482.002.core.test b/tests/assertions/MIR-482.002.core.test index 07149d620..07b8db101 100644 --- a/tests/assertions/MIR-482.002.core.test +++ b/tests/assertions/MIR-482.002.core.test @@ -1,7 +1,7 @@ -# input has two GRIB at bitsPerValue=16 -tiny.grib -# Mir tool options +# input +tiny-2x2.grib +# mir --accuracy=64 --packing=ieee -# grib_get assertions +# grib_get packingType=grid_ieee precision=2 diff --git a/tests/assertions/MIR-482.003.core.fail.test b/tests/assertions/MIR-482.003.core.fail.test index 1c8984b68..7552e7992 100644 --- a/tests/assertions/MIR-482.003.core.fail.test +++ b/tests/assertions/MIR-482.003.core.fail.test @@ -1,6 +1,6 @@ -# input has two GRIB at bitsPerValue=16 -tiny.grib -# Mir tool options +# input +tiny-2x2.grib +# mir --accuracy=24 --packing=ieee -# grib_get assertions +# grib_get packingType=grid_ieee diff --git a/tests/assertions/MIR-487.001.core.test b/tests/assertions/MIR-487.001.core.test index 3a267ef9c..d23c8a42d 100644 --- a/tests/assertions/MIR-487.001.core.test +++ b/tests/assertions/MIR-487.001.core.test @@ -1,7 +1,7 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --accuracy=9 -# grib_get assertions +# grib_get gridType=reduced_ll bitsPerValue=9 diff --git a/tests/assertions/MIR-487.002.core.test b/tests/assertions/MIR-487.002.core.test index 2f503b69c..a255cf2f2 100644 --- a/tests/assertions/MIR-487.002.core.test +++ b/tests/assertions/MIR-487.002.core.test @@ -1,8 +1,8 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --accuracy=10 -# grib_get assertions +# grib_get gridType=reduced_ll bitsPerValue=10 packingType=grid_simple_matrix diff --git a/tests/assertions/MIR-487.003.core.test b/tests/assertions/MIR-487.003.core.test index d63635384..350e6f110 100644 --- a/tests/assertions/MIR-487.003.core.test +++ b/tests/assertions/MIR-487.003.core.test @@ -1,8 +1,8 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --accuracy=10 --packing=simple -# grib_get assertions +# grib_get gridType=reduced_ll bitsPerValue=10 packingType=grid_simple diff --git a/tests/assertions/MIR-487.004.core.fail.test b/tests/assertions/MIR-487.004.core.fail.test index 95d389dd1..1d1d9ea6b 100644 --- a/tests/assertions/MIR-487.004.core.fail.test +++ b/tests/assertions/MIR-487.004.core.fail.test @@ -1,6 +1,6 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --area=1/0/0/1 -# grib_get assertions +# grib_get gridType=reduced_ll diff --git a/tests/assertions/MIR-487.005.core.fail.test b/tests/assertions/MIR-487.005.core.fail.test index 143e21414..23a5b1379 100644 --- a/tests/assertions/MIR-487.005.core.fail.test +++ b/tests/assertions/MIR-487.005.core.fail.test @@ -1,6 +1,6 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --frame=1 -# grib_get assertions +# grib_get gridType=reduced_ll diff --git a/tests/assertions/MIR-488.001.core.test b/tests/assertions/MIR-488.001.core.test index 0ad2962db..76f80ccda 100644 --- a/tests/assertions/MIR-488.001.core.test +++ b/tests/assertions/MIR-488.001.core.test @@ -1,4 +1,4 @@ -# mars +# input /dev/null # mir (generate a field with uniformly distributed integers between 1 and 3) --add-random=uniform-int-distribution{a:1,b:3} --input={artificialInput:constant,constant:0.,gridded:True,gridType:regular_ll,north:10.,west:0.,south:0.,east:10.,south_north_increment:1.,west_east_increment:1.,Ni:11,Nj:11} diff --git a/tests/assertions/MIR-488.002.core.test b/tests/assertions/MIR-488.002.core.test index b9b848689..3cc1972bf 100644 --- a/tests/assertions/MIR-488.002.core.test +++ b/tests/assertions/MIR-488.002.core.test @@ -1,4 +1,4 @@ -# mars +# input /dev/null # mir (generate a field with normal, or Gaussian, distributed values given mean and standard deviation) --add-random=normal-distribution{mean:42.,stddev:3.} --input={artificialInput:constant,constant:0.,gridded:True,gridType:regular_ll,north:10.,west:0.,south:0.,east:10.,south_north_increment:1.,west_east_increment:1.,Ni:11,Nj:11} diff --git a/tests/assertions/MIR-512.001.core.test b/tests/assertions/MIR-512.001.core.test index 4eee554b5..68f8c40cc 100644 --- a/tests/assertions/MIR-512.001.core.test +++ b/tests/assertions/MIR-512.001.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --accuracy=32 diff --git a/tests/assertions/MIR-512.002.core.test b/tests/assertions/MIR-512.002.core.test index 023620686..37f70f38a 100644 --- a/tests/assertions/MIR-512.002.core.test +++ b/tests/assertions/MIR-512.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --accuracy=64 diff --git a/tests/assertions/MIR-512.003.core.test b/tests/assertions/MIR-512.003.core.test index 56340b522..e95d367c0 100644 --- a/tests/assertions/MIR-512.003.core.test +++ b/tests/assertions/MIR-512.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=16 diff --git a/tests/assertions/MIR-512.004.core.test b/tests/assertions/MIR-512.004.core.test index db3796826..d5ea50d1c 100644 --- a/tests/assertions/MIR-512.004.core.test +++ b/tests/assertions/MIR-512.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=32 diff --git a/tests/assertions/MIR-512.005.core.test b/tests/assertions/MIR-512.005.core.test index bdbde748e..89f28221a 100644 --- a/tests/assertions/MIR-512.005.core.test +++ b/tests/assertions/MIR-512.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=32 --packing=ieee diff --git a/tests/assertions/MIR-512.006.core.test b/tests/assertions/MIR-512.006.core.test index cc9bbd97a..d4db8eb09 100644 --- a/tests/assertions/MIR-512.006.core.test +++ b/tests/assertions/MIR-512.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --accuracy=32 --packing=av diff --git a/tests/assertions/MIR-512.007.core.test b/tests/assertions/MIR-512.007.core.test index f98aa1fcb..babad1bb2 100644 --- a/tests/assertions/MIR-512.007.core.test +++ b/tests/assertions/MIR-512.007.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=16 --packing=av diff --git a/tests/assertions/MIR-513.002.core.test b/tests/assertions/MIR-513.002.core.test index 19bc6d6fe..df7694224 100644 --- a/tests/assertions/MIR-513.002.core.test +++ b/tests/assertions/MIR-513.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib2 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.003.core.test b/tests/assertions/MIR-513.003.core.test index e1adaa579..c9b88e4dc 100644 --- a/tests/assertions/MIR-513.003.core.test +++ b/tests/assertions/MIR-513.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.004.core.test b/tests/assertions/MIR-513.004.core.test index 35fa561ae..053d96d3b 100644 --- a/tests/assertions/MIR-513.004.core.test +++ b/tests/assertions/MIR-513.004.core.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=9/9 --grib-packing-gridded=ccsds --grib-edition-conversion=true diff --git a/tests/assertions/MIR-513.005.core.test b/tests/assertions/MIR-513.005.core.test index ef2e93ed1..3e958ca12 100644 --- a/tests/assertions/MIR-513.005.core.test +++ b/tests/assertions/MIR-513.005.core.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=9/9 diff --git a/tests/assertions/MIR-513.006.core.test b/tests/assertions/MIR-513.006.core.test index e4374baef..186c17936 100644 --- a/tests/assertions/MIR-513.006.core.test +++ b/tests/assertions/MIR-513.006.core.test @@ -1,4 +1,4 @@ -# mars +# input param=z,level=1,levtype=ml,resol=20.grib2 # mir --grid=9/9 diff --git a/tests/assertions/MIR-513.packingType=grid_ccsds.001.core.test b/tests/assertions/MIR-513.packingType=grid_ccsds.001.core.test index 52ce579ab..03f2b9ce2 100644 --- a/tests/assertions/MIR-513.packingType=grid_ccsds.001.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ccsds.001.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=simple diff --git a/tests/assertions/MIR-513.packingType=grid_ccsds.002.core.test b/tests/assertions/MIR-513.packingType=grid_ccsds.002.core.test index 505633803..c89a68a57 100644 --- a/tests/assertions/MIR-513.packingType=grid_ccsds.002.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ccsds.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=so diff --git a/tests/assertions/MIR-513.packingType=grid_ccsds.003.core.test b/tests/assertions/MIR-513.packingType=grid_ccsds.003.core.test index 2e1409b0d..f8618831d 100644 --- a/tests/assertions/MIR-513.packingType=grid_ccsds.003.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ccsds.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=ccsds diff --git a/tests/assertions/MIR-513.packingType=grid_ccsds.004.core.test b/tests/assertions/MIR-513.packingType=grid_ccsds.004.core.test index 589496597..995054c1f 100644 --- a/tests/assertions/MIR-513.packingType=grid_ccsds.004.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ccsds.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=grid_ccsds.005.core.test b/tests/assertions/MIR-513.packingType=grid_ccsds.005.core.test index ad9d02052..5969fd71b 100644 --- a/tests/assertions/MIR-513.packingType=grid_ccsds.005.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ccsds.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=grid_ccsds.006.core.test b/tests/assertions/MIR-513.packingType=grid_ccsds.006.core.test index d7ae9c4e0..f4962d79d 100644 --- a/tests/assertions/MIR-513.packingType=grid_ccsds.006.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ccsds.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=av diff --git a/tests/assertions/MIR-513.packingType=grid_ccsds.007.core.test b/tests/assertions/MIR-513.packingType=grid_ccsds.007.core.test index 3d36d6afe..d578a96a6 100644 --- a/tests/assertions/MIR-513.packingType=grid_ccsds.007.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ccsds.007.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --grid=0.5/0.5 diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.001.core.test b/tests/assertions/MIR-513.packingType=grid_ieee.001.core.test index 3565f3d77..f3966f902 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.001.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.001.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=simple diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.002.core.test b/tests/assertions/MIR-513.packingType=grid_ieee.002.core.test index 09102dabd..58126d0f0 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.002.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=so diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.003.core.test b/tests/assertions/MIR-513.packingType=grid_ieee.003.core.test index 6011163e1..f86b9a45b 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.003.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=ccsds diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.004.core.test b/tests/assertions/MIR-513.packingType=grid_ieee.004.core.test index 3096263a1..6258d534b 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.004.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.005.core.test b/tests/assertions/MIR-513.packingType=grid_ieee.005.core.test index fb9e3960a..6e2a7d2a8 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.005.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=ieee --accuracy=64 diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.006.core.test b/tests/assertions/MIR-513.packingType=grid_ieee.006.core.test index 1bfe1c8d8..930550af3 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.006.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=av diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.007.core.fail.test b/tests/assertions/MIR-513.packingType=grid_ieee.007.core.fail.test index 47950a8a7..6c387fd58 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.007.core.fail.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.007.core.fail.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=av --accuracy=128 diff --git a/tests/assertions/MIR-513.packingType=grid_ieee.008.core.test b/tests/assertions/MIR-513.packingType=grid_ieee.008.core.test index fdb6fa2c1..80768f839 100644 --- a/tests/assertions/MIR-513.packingType=grid_ieee.008.core.test +++ b/tests/assertions/MIR-513.packingType=grid_ieee.008.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --grid=0.5/0.5 diff --git a/tests/assertions/MIR-513.packingType=grid_second_order.001.core.test b/tests/assertions/MIR-513.packingType=grid_second_order.001.core.test index 0c25f961c..369933b61 100644 --- a/tests/assertions/MIR-513.packingType=grid_second_order.001.core.test +++ b/tests/assertions/MIR-513.packingType=grid_second_order.001.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=simple diff --git a/tests/assertions/MIR-513.packingType=grid_second_order.002.core.test b/tests/assertions/MIR-513.packingType=grid_second_order.002.core.test index 51dcc469c..82a68ae80 100644 --- a/tests/assertions/MIR-513.packingType=grid_second_order.002.core.test +++ b/tests/assertions/MIR-513.packingType=grid_second_order.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=so diff --git a/tests/assertions/MIR-513.packingType=grid_second_order.003.core.test b/tests/assertions/MIR-513.packingType=grid_second_order.003.core.test index 925da3a2d..eca460c8f 100644 --- a/tests/assertions/MIR-513.packingType=grid_second_order.003.core.test +++ b/tests/assertions/MIR-513.packingType=grid_second_order.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=ccsds diff --git a/tests/assertions/MIR-513.packingType=grid_second_order.004.core.test b/tests/assertions/MIR-513.packingType=grid_second_order.004.core.test index feed3bfeb..d1cb01414 100644 --- a/tests/assertions/MIR-513.packingType=grid_second_order.004.core.test +++ b/tests/assertions/MIR-513.packingType=grid_second_order.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=grid_second_order.005.core.test b/tests/assertions/MIR-513.packingType=grid_second_order.005.core.test index 2bb5ad9e5..cddd0bc92 100644 --- a/tests/assertions/MIR-513.packingType=grid_second_order.005.core.test +++ b/tests/assertions/MIR-513.packingType=grid_second_order.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=grid_second_order.006.core.test b/tests/assertions/MIR-513.packingType=grid_second_order.006.core.test index 45d7b261c..4d0ff29ee 100644 --- a/tests/assertions/MIR-513.packingType=grid_second_order.006.core.test +++ b/tests/assertions/MIR-513.packingType=grid_second_order.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=av diff --git a/tests/assertions/MIR-513.packingType=grid_second_order.007.core.test b/tests/assertions/MIR-513.packingType=grid_second_order.007.core.test index 6d36e8583..c724883fb 100644 --- a/tests/assertions/MIR-513.packingType=grid_second_order.007.core.test +++ b/tests/assertions/MIR-513.packingType=grid_second_order.007.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --grid=0.5/0.5 diff --git a/tests/assertions/MIR-513.packingType=grid_simple.001.core.test b/tests/assertions/MIR-513.packingType=grid_simple.001.core.test index 9352ffb5f..9f2f531ce 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.001.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.001.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=simple diff --git a/tests/assertions/MIR-513.packingType=grid_simple.002.core.test b/tests/assertions/MIR-513.packingType=grid_simple.002.core.test index 1c74bee68..be147310f 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.002.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=so diff --git a/tests/assertions/MIR-513.packingType=grid_simple.003.core.test b/tests/assertions/MIR-513.packingType=grid_simple.003.core.test index 0bceea7ad..1016c559d 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.003.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=ccsds diff --git a/tests/assertions/MIR-513.packingType=grid_simple.004.core.test b/tests/assertions/MIR-513.packingType=grid_simple.004.core.test index 741b1570b..177d7f171 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.004.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=grid_simple.005.core.test b/tests/assertions/MIR-513.packingType=grid_simple.005.core.test index bed197cc0..0928e8b7b 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.005.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=grid_simple.006.core.test b/tests/assertions/MIR-513.packingType=grid_simple.006.core.test index d67f8d815..0a989ee92 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.006.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=av diff --git a/tests/assertions/MIR-513.packingType=grid_simple.007.core.test b/tests/assertions/MIR-513.packingType=grid_simple.007.core.test index d29a4ba4b..b4c482f4b 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.007.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.007.core.test @@ -1,5 +1,5 @@ -# mars -tiny.grib +# input +tiny-2x2.grib # mir --area=0/0/0/1 --packing=so # grib_get (output (#points = 2) is in packingType=grid_simple because grid_second_order is not supported for #points < 4) diff --git a/tests/assertions/MIR-513.packingType=grid_simple.008.core.test b/tests/assertions/MIR-513.packingType=grid_simple.008.core.test index 06b54a399..0dcc91f43 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.008.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.008.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --grid=0.5/0.5 diff --git a/tests/assertions/MIR-513.packingType=grid_simple.009.core.test b/tests/assertions/MIR-513.packingType=grid_simple.009.core.test index 02e38d296..9c9cc5c3b 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.009.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.009.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir --packing=simple diff --git a/tests/assertions/MIR-513.packingType=grid_simple.010.core.test b/tests/assertions/MIR-513.packingType=grid_simple.010.core.test index 791ba1712..73d91a2d4 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.010.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.010.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir --packing=so diff --git a/tests/assertions/MIR-513.packingType=grid_simple.011.core.test b/tests/assertions/MIR-513.packingType=grid_simple.011.core.test index 92bfba5bc..01584fe78 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.011.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.011.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir --packing=ccsds --grib-edition-conversion=true diff --git a/tests/assertions/MIR-513.packingType=grid_simple.012.core.test b/tests/assertions/MIR-513.packingType=grid_simple.012.core.test index d8d216185..14ca2df66 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.012.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.012.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=grid_simple.013.core.test b/tests/assertions/MIR-513.packingType=grid_simple.013.core.test index d9c23be58..281d5c24a 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.013.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.013.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=grid_simple.014.core.test b/tests/assertions/MIR-513.packingType=grid_simple.014.core.test index 91c4353e3..0ec30f8ab 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.014.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.014.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir --packing=av diff --git a/tests/assertions/MIR-513.packingType=grid_simple.015.core.test b/tests/assertions/MIR-513.packingType=grid_simple.015.core.test index 7e35c5c6f..521afce15 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.015.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.015.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=grid_simple.016.core.test b/tests/assertions/MIR-513.packingType=grid_simple.016.core.test index 6f72914c4..31502bc94 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.016.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.016.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=grid_simple.017.core.test b/tests/assertions/MIR-513.packingType=grid_simple.017.core.test index 4a5064bc4..2d78365ff 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.017.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.017.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=grid_simple.018.core.test b/tests/assertions/MIR-513.packingType=grid_simple.018.core.test index 52b8011a8..acd480782 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.018.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.018.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=grid_simple.019.core.test b/tests/assertions/MIR-513.packingType=grid_simple.019.core.test index 53fe8b71d..a51d2575d 100644 --- a/tests/assertions/MIR-513.packingType=grid_simple.019.core.test +++ b/tests/assertions/MIR-513.packingType=grid_simple.019.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib1 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.002.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.002.core.test index 4ab2dee43..4c0cd42ed 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.002.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=so diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.003.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.003.core.test index 227cea125..96fe661fc 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.003.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=ccsds --grib-edition-conversion=true diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.004.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.004.core.test index 96d65b614..e19ec0715 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.004.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.005.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.005.core.test index 61a1f849c..85d9cf076 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.005.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.006.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.006.core.test index 8e964fc7c..0ea5aaf88 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.006.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.008.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.008.core.test index d8bfa4ff1..64f06c4c4 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.008.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.008.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib2 # mir --grid=1/1 --intgrid=none --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.009.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.009.core.test index b403ef3f0..c82384192 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.009.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.009.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.010.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.010.core.test index 1b7d90df8..700a284c1 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.010.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.010.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --truncation=21 --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.011.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.011.core.test index ac01ddf71..3bc0f70a9 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.011.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.011.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib2 # mir --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.012.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.012.core.test index 6a7c242e2..d385d856f 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.012.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.012.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib2 # mir --truncation=21 --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.014.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.014.core.test index 0e25376c8..f8deb892d 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.014.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.014.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib2 # mir --grid=0.5/0.5 diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.016.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.016.core.test index d77a8b592..02292d0b1 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.016.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.016.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir --vod2uv --intgrid=none --grid=1/1 --packing=so diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.017.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.017.core.test index 1e7a55064..e9f4cd73c 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.017.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.017.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir --vod2uv --intgrid=none --grid=1/1 --packing=ccsds --grib-edition-conversion=true diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.018.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.018.core.test index 87d38c218..25117975d 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.018.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.018.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir --vod2uv --intgrid=none --grid=1/1 --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.019.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.019.core.test index 0e21935c2..f026f2b3d 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.019.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.019.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir --vod2uv --intgrid=none --grid=1/1 --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.020.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.020.core.test index 29fe2c795..ff8a1a31b 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.020.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.020.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir --vod2uv --intgrid=none --grid=1/1 diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.022.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.022.core.test index 1b3a8fa47..a3e3e90c4 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.022.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.022.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir --vod2uv --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.023.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.023.core.test index 1d14a1112..aa2fa110b 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.023.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.023.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir --vod2uv --truncation=21 --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.025.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.025.core.test index 226d4504b..f748d8b8c 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.025.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.025.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir --vod2uv --intgrid=none --grid=1/1 --packing=so diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.026.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.026.core.test index e27afc8d2..6c994549b 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.026.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.026.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir --vod2uv --intgrid=none --grid=1/1 --packing=ccsds diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.027.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.027.core.test index 3d2d7544c..410dce38d 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.027.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.027.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir --vod2uv --intgrid=none --grid=1/1 --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.028.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.028.core.test index b11912f28..f82c69718 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.028.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.028.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir --vod2uv --intgrid=none --grid=1/1 --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.029.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.029.core.test index db77f6b4a..a373dc518 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.029.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.029.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir --vod2uv --intgrid=none --grid=1/1 diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.032.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.032.core.test index 4c74b9422..7bff47427 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.032.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.032.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test index e17339450..f547aa859 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test.disabled b/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test.disabled index c8740b901..b07ff2f1c 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test.disabled +++ b/tests/assertions/MIR-513.packingType=spectral_complex.033.core.test.disabled @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir --vod2uv --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.034.core.test.disabled b/tests/assertions/MIR-513.packingType=spectral_complex.034.core.test.disabled index f51a80cb0..836e43ada 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.034.core.test.disabled +++ b/tests/assertions/MIR-513.packingType=spectral_complex.034.core.test.disabled @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir --vod2uv --truncation=21 --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.035.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.035.core.test index a24c1297b..c0e5d36ff 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.035.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.035.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib2 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.037.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.037.core.test index 8e5d2c33c..298990b8b 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.037.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.037.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.038.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.038.core.test index 6b4dd8300..6a089bdd9 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.038.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.038.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib1 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.040.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.040.core.test index df7826749..a0e264831 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.040.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.040.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_complex.041.core.test b/tests/assertions/MIR-513.packingType=spectral_complex.041.core.test index bc9b21126..356f4820e 100644 --- a/tests/assertions/MIR-513.packingType=spectral_complex.041.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_complex.041.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex,param=vo_d.grib2 # mir $MIR_CONFIG_GRIB_OUTPUT=grib-output-ii.yaml diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.001.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.001.core.test index 9645283d8..cbd095de7 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.001.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.001.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=simple diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.002.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.002.core.test index 07be296a2..eb10031d2 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.002.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=so diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.003.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.003.core.test index 655c2d174..bb86dd8a5 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.003.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=ccsds --grib-edition-conversion=true diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.004.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.004.core.test index eb92e21c6..cb0e9b892 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.004.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.005.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.005.core.test index cae31fc4c..6c595cdbf 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.005.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.006.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.006.core.test index 650d92e21..b3a9ca829 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.006.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.007.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.007.core.test index 788b2d54d..2a8d8beac 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.007.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.007.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=av diff --git a/tests/assertions/MIR-513.packingType=spectral_simple.008.core.test b/tests/assertions/MIR-513.packingType=spectral_simple.008.core.test index b5daabc29..81623584b 100644 --- a/tests/assertions/MIR-513.packingType=spectral_simple.008.core.test +++ b/tests/assertions/MIR-513.packingType=spectral_simple.008.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=0.5/0.5 diff --git a/tests/assertions/MIR-517.interpolation=grib-box-count.core.test b/tests/assertions/MIR-517.001.interpolation=grid-box-count.core.test similarity index 52% rename from tests/assertions/MIR-517.interpolation=grib-box-count.core.test rename to tests/assertions/MIR-517.001.interpolation=grid-box-count.core.test index 6300a8afa..f330b6b22 100644 --- a/tests/assertions/MIR-517.interpolation=grib-box-count.core.test +++ b/tests/assertions/MIR-517.001.interpolation=grid-box-count.core.test @@ -1,16 +1,16 @@ # input -tiny.grib -# mir tool options +tiny-2x2.grib +# mir --interpolation=grid-box-statistics --interpolation-statistics=count --grid=0.5/0.5 -# grib_get assertions (not checking results) +# grib_get Ni=3 Nj=3 values[0]=1 -values[1]=2 +values[1]=9999 values[2]=1 -values[3]=2 -values[4]=4 -values[5]=2 +values[3]=9999 +values[4]=9999 +values[5]=9999 values[6]=1 -values[7]=2 +values[7]=9999 values[8]=1 diff --git a/tests/assertions/MIR-517.interpolation=grib-box-maximum.core.test b/tests/assertions/MIR-517.002.interpolation=grid-box-maximum.core.test similarity index 53% rename from tests/assertions/MIR-517.interpolation=grib-box-maximum.core.test rename to tests/assertions/MIR-517.002.interpolation=grid-box-maximum.core.test index 870150883..5bc230ab7 100644 --- a/tests/assertions/MIR-517.interpolation=grib-box-maximum.core.test +++ b/tests/assertions/MIR-517.002.interpolation=grid-box-maximum.core.test @@ -1,16 +1,16 @@ # input -tiny.grib -# mir tool options +tiny-2x2.grib +# mir --interpolation=grid-box-statistics --interpolation-statistics=maximum --grid=0.5/0.5 -# grib_get assertions (not checking results) +# grib_get Ni=3 Nj=3 values[0]=0 -values[1]=1 +values[1]=9999 values[2]=1 -values[3]=2 -values[4]=3 -values[5]=3 +values[3]=9999 +values[4]=9999 +values[5]=9999 values[6]=2 -values[7]=3 +values[7]=9999 values[8]=3 diff --git a/tests/assertions/MIR-517.interpolation=grib-box-mean.core.test b/tests/assertions/MIR-517.003.interpolation=grid-box-mean.core.test similarity index 51% rename from tests/assertions/MIR-517.interpolation=grib-box-mean.core.test rename to tests/assertions/MIR-517.003.interpolation=grid-box-mean.core.test index bcbb3e042..eee5f74e7 100644 --- a/tests/assertions/MIR-517.interpolation=grib-box-mean.core.test +++ b/tests/assertions/MIR-517.003.interpolation=grid-box-mean.core.test @@ -1,16 +1,16 @@ # input -tiny.grib -# mir tool options +tiny-2x2.grib +# mir --interpolation=grid-box-statistics --interpolation-statistics=mean --grid=0.5/0.5 -# grib_get assertions (not checking results) +# grib_get Ni=3 Nj=3 values[0]=0 -values[1]=0.5 +values[1]=9999 values[2]=1 -values[3]=1 -values[4]=1.5 -values[5]=2 +values[3]=9999 +values[4]=9999 +values[5]=9999 values[6]=2 -values[7]=2.5 +values[7]=9999 values[8]=3 diff --git a/tests/assertions/MIR-517.interpolation=voronoi-count.core.test b/tests/assertions/MIR-517.004.interpolation=voronoi-count.core.test similarity index 80% rename from tests/assertions/MIR-517.interpolation=voronoi-count.core.test rename to tests/assertions/MIR-517.004.interpolation=voronoi-count.core.test index 651f787a5..82a0e675d 100644 --- a/tests/assertions/MIR-517.interpolation=voronoi-count.core.test +++ b/tests/assertions/MIR-517.004.interpolation=voronoi-count.core.test @@ -1,8 +1,8 @@ # input -tiny.grib -# mir tool options +tiny-2x2.grib +# mir --interpolation=voronoi-statistics --interpolation-statistics=count --grid=0.5/0.5 -# grib_get assertions +# grib_get Ni=3 Nj=3 values[0]=1 diff --git a/tests/assertions/MIR-517.interpolation=voronoi-maximum.core.test b/tests/assertions/MIR-517.005.interpolation=voronoi-maximum.core.test similarity index 74% rename from tests/assertions/MIR-517.interpolation=voronoi-maximum.core.test rename to tests/assertions/MIR-517.005.interpolation=voronoi-maximum.core.test index b035848a3..42ce84d78 100644 --- a/tests/assertions/MIR-517.interpolation=voronoi-maximum.core.test +++ b/tests/assertions/MIR-517.005.interpolation=voronoi-maximum.core.test @@ -1,8 +1,8 @@ # input -tiny.grib -# mir tool options +tiny-2x2.grib +# mir --interpolation=voronoi-statistics --interpolation-statistics=maximum --grid=0.5/0.5 -# grib_get assertions (not checking results) +# grib_get Ni=3 Nj=3 values[0]=0 diff --git a/tests/assertions/MIR-517.interpolation=voronoi-mean.core.test b/tests/assertions/MIR-517.006.interpolation=voronoi-mean.core.test similarity index 74% rename from tests/assertions/MIR-517.interpolation=voronoi-mean.core.test rename to tests/assertions/MIR-517.006.interpolation=voronoi-mean.core.test index b0cc35dc2..bd78eff67 100644 --- a/tests/assertions/MIR-517.interpolation=voronoi-mean.core.test +++ b/tests/assertions/MIR-517.006.interpolation=voronoi-mean.core.test @@ -1,8 +1,8 @@ # input -tiny.grib -# mir tool options +tiny-2x2.grib +# mir --interpolation=voronoi-statistics --interpolation-statistics=mean --grid=0.5/0.5 -# grib_get assertions (not checking results) +# grib_get Ni=3 Nj=3 values[0]=0 diff --git a/tests/assertions/MIR-517.007.interpolation=grid-box-count.core.test b/tests/assertions/MIR-517.007.interpolation=grid-box-count.core.test new file mode 100644 index 000000000..5a40f1309 --- /dev/null +++ b/tests/assertions/MIR-517.007.interpolation=grid-box-count.core.test @@ -0,0 +1,11 @@ +# input +tiny-3x3.grib +# mir +--interpolation=grid-box-statistics --interpolation-statistics=count --grid=1/1 +# grib_get +Ni=2 +Nj=2 +values[0]=4 +values[1]=4 +values[2]=4 +values[3]=4 diff --git a/tests/assertions/MIR-517.008.interpolation=grid-box-maximum.core.test b/tests/assertions/MIR-517.008.interpolation=grid-box-maximum.core.test new file mode 100644 index 000000000..8f9da858b --- /dev/null +++ b/tests/assertions/MIR-517.008.interpolation=grid-box-maximum.core.test @@ -0,0 +1,11 @@ +# input +tiny-3x3.grib +# mir +--interpolation=grid-box-statistics --interpolation-statistics=maximum --grid=1/1 +# grib_get +Ni=2 +Nj=2 +values[0]=4 +values[1]=5 +values[2]=7 +values[3]=8 diff --git a/tests/assertions/MIR-517.009.interpolation=grid-box-mean.core.test b/tests/assertions/MIR-517.009.interpolation=grid-box-mean.core.test new file mode 100644 index 000000000..f32af8aaf --- /dev/null +++ b/tests/assertions/MIR-517.009.interpolation=grid-box-mean.core.test @@ -0,0 +1,11 @@ +# input +tiny-3x3.grib +# mir +--interpolation=grid-box-statistics --interpolation-statistics=mean --grid=1/1 +# grib_get +Ni=2 +Nj=2 +values[0]=2 +values[1]=3 +values[2]=5 +values[3]=6 diff --git a/tests/assertions/MIR-517.010.interpolation=voronoi-count.core.test b/tests/assertions/MIR-517.010.interpolation=voronoi-count.core.test new file mode 100644 index 000000000..4aaddf64d --- /dev/null +++ b/tests/assertions/MIR-517.010.interpolation=voronoi-count.core.test @@ -0,0 +1,11 @@ +# input +tiny-3x3.grib +# mir +--interpolation=voronoi-statistics --interpolation-statistics=count --grid=1/1 +# grib_get +Ni=2 +Nj=2 +values[0]=4 +values[1]=4 +values[2]=3 +values[3]=3 diff --git a/tests/assertions/MIR-517.011.interpolation=voronoi-maximum.core.test b/tests/assertions/MIR-517.011.interpolation=voronoi-maximum.core.test new file mode 100644 index 000000000..981f4a386 --- /dev/null +++ b/tests/assertions/MIR-517.011.interpolation=voronoi-maximum.core.test @@ -0,0 +1,11 @@ +# input +tiny-3x3.grib +# mir +--interpolation=voronoi-statistics --interpolation-statistics=maximum --grid=1/1 +# grib_get +Ni=2 +Nj=2 +values[0]=4 +values[1]=5 +values[2]=7 +values[3]=8 diff --git a/tests/assertions/MIR-517.012.interpolation=voronoi-mean.core.test b/tests/assertions/MIR-517.012.interpolation=voronoi-mean.core.test new file mode 100644 index 000000000..498c8ce02 --- /dev/null +++ b/tests/assertions/MIR-517.012.interpolation=voronoi-mean.core.test @@ -0,0 +1,11 @@ +# input +tiny-3x3.grib +# mir +--interpolation=voronoi-statistics --interpolation-statistics=mean --grid=1/1 +# grib_get +Ni=2 +Nj=2 +values[0]=2 +values[1]=3 +values[2]=5.33333 +values[3]=6.66667 diff --git a/tests/assertions/MIR-534.001.core.test b/tests/assertions/MIR-534.001.core.test index f413ff86f..c961f8a41 100644 --- a/tests/assertions/MIR-534.001.core.test +++ b/tests/assertions/MIR-534.001.core.test @@ -1,8 +1,8 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --plan=grid2regular-ll(grid=[0.5,0.5]);crop(area=france) -# grib_get assertions +# grib_get Ni=28 Nj=20 latitudeOfFirstGridPointInDegrees=51.5 diff --git a/tests/assertions/MIR-539-001.core.test b/tests/assertions/MIR-539-001.core.test index c36c4290a..019b3637a 100644 --- a/tests/assertions/MIR-539-001.core.test +++ b/tests/assertions/MIR-539-001.core.test @@ -1,8 +1,8 @@ -# mars -tiny.grib +# input +tiny-2x2.grib # mir $MIR_CACHING=0 $MIR_CACHE_PATH=/bad --grid=0.5/0.5 --interpolation=nn -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-539-002.core.test b/tests/assertions/MIR-539-002.core.test index 0c72cca5b..be6416033 100644 --- a/tests/assertions/MIR-539-002.core.test +++ b/tests/assertions/MIR-539-002.core.test @@ -1,7 +1,7 @@ -# mars -tiny.grib +# input +tiny-2x2.grib # mir $MIR_CACHE_PATH=/bad --grid=0.5/0.5 --interpolation=nn --caching=0 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-539-003.core.test b/tests/assertions/MIR-539-003.core.test index 056c99863..cd24fbedd 100644 --- a/tests/assertions/MIR-539-003.core.test +++ b/tests/assertions/MIR-539-003.core.test @@ -1,8 +1,8 @@ -# mars -tiny.grib +# input +tiny-2x2.grib # mir $MIR_CACHING=0 $MIR_CACHE_PATH=/bad --grid=0.5/0.5 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-539-004.core.test b/tests/assertions/MIR-539-004.core.test index 0aecd4ab8..2f8adb637 100644 --- a/tests/assertions/MIR-539-004.core.test +++ b/tests/assertions/MIR-539-004.core.test @@ -1,7 +1,7 @@ -# mars -tiny.grib +# input +tiny-2x2.grib # mir $MIR_CACHE_PATH=/bad --grid=0.5/0.5 --caching=0 -# assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/MIR-544.core.test b/tests/assertions/MIR-544.core.test index 8e64e5b53..88ea341a0 100644 --- a/tests/assertions/MIR-544.core.test +++ b/tests/assertions/MIR-544.core.test @@ -1,7 +1,7 @@ -# Mars request +# input param=2t,levtype=sfc,grid=O16 -# Mir tool options +# mir --grid=2/2 --interpolation=k-nearest-neighbours --distance-weighting=pseudo-laplace --nearest-method=nclosest-or-nearest -# grib_get assertions +# grib_get iDirectionIncrementInDegrees=2 jDirectionIncrementInDegrees=2 diff --git a/tests/assertions/MIR-546.test b/tests/assertions/MIR-546.test index d1726a865..3ac0063b1 100644 --- a/tests/assertions/MIR-546.test +++ b/tests/assertions/MIR-546.test @@ -1,6 +1,6 @@ -# MARS request +# input param=t,level=1000,resol=20 -# MIR options +# mir --area=27.218147000000002/111.685125/27.018147/111.88512499999999 --grid=0.4/0.4 --intgrid=F225 -# grib_get assertions +# grib_get numberOfDataPoints=1 diff --git a/tests/assertions/MIR-553.001.test b/tests/assertions/MIR-553.001.test index af93867d2..6d31bb865 100644 --- a/tests/assertions/MIR-553.001.test +++ b/tests/assertions/MIR-553.001.test @@ -1,8 +1,8 @@ -# GRIB +# input MIR-553.grib2 # mir --area=66.6/-24.4/63.4/-13.6 -# grib_get assertions +# grib_get #Ni=122 # prone to compiler/platform dependant results #Nj=105 # ... #latitudeOfFirstGridPointInDegrees=65.7618 # ... diff --git a/tests/assertions/MIR-553.002.test b/tests/assertions/MIR-553.002.test index a01ec4d99..796c80fea 100644 --- a/tests/assertions/MIR-553.002.test +++ b/tests/assertions/MIR-553.002.test @@ -1,8 +1,8 @@ -# GRIB +# input MIR-553.grib2 # mir --area=66.6/-24.4/63.4/-13.6 -# grib_get assertions +# grib_get #Ni=122 # prone to compiler/platform dependant results #Nj=105 # ... #latitudeOfFirstGridPointInDegrees=65.7618 # ... diff --git a/tests/assertions/MIR-555.test b/tests/assertions/MIR-555.test index d0ddfe772..80a97b578 100644 --- a/tests/assertions/MIR-555.test +++ b/tests/assertions/MIR-555.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --truncation=none --intgrid=none --grid=F640 --area=54/-16.5/50.5/-3 diff --git a/tests/assertions/MIR-572.0001.core.test b/tests/assertions/MIR-572.0001.core.test index 71f620641..0f2ea9675 100644 --- a/tests/assertions/MIR-572.0001.core.test +++ b/tests/assertions/MIR-572.0001.core.test @@ -1,8 +1,8 @@ -# Mars request +# input gridType=lambert,missingValuesPresent=0.grib2 -# Mir tool options +# mir --area-mode=mask --area=90/-30/60/0 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=70.135 longitudeOfFirstGridPointInDegrees=340.592 numberOfDataPoints=780321 diff --git a/tests/assertions/MIR-572.0002.core.test b/tests/assertions/MIR-572.0002.core.test index e5c191e37..3e2b44545 100644 --- a/tests/assertions/MIR-572.0002.core.test +++ b/tests/assertions/MIR-572.0002.core.test @@ -1,8 +1,8 @@ -# Mars request +# input gridType=lambert,missingValuesPresent=1.grib2 -# Mir tool options +# mir --area-mode=mask --area=90/-30/60/0 -# grib_get assertions +# grib_get latitudeOfFirstGridPointInDegrees=70.135 longitudeOfFirstGridPointInDegrees=340.592 numberOfDataPoints=780321 diff --git a/tests/assertions/MIR-573.test.disabled b/tests/assertions/MIR-573.test.disabled index d0d2cc96a..a52c9ba3e 100644 --- a/tests/assertions/MIR-573.test.disabled +++ b/tests/assertions/MIR-573.test.disabled @@ -1,6 +1,6 @@ -# MARS request +# input gridType=regular_gg,gridName=F32,shortName=msl.grib1 -# MIR options +# mir --grid=O32 --interpolation=nn --point-search-trees=mapped-anonymous-memory -# grib_get assertions +# grib_get diff --git a/tests/assertions/MIR-583.001.test b/tests/assertions/MIR-583.001.test index 8f858c4ba..bc77f07d6 100644 --- a/tests/assertions/MIR-583.001.test +++ b/tests/assertions/MIR-583.001.test @@ -1,6 +1,5 @@ -# MIR-583 interpolation=linear failure on low parametricEpsilon +# input (interpolation=linear failure on low parametricEpsilon) MIR-583.grib1 # mir --grid=0.04/0.04 --interpolation=linear --finite-element-projection-fail=missing-value # grib_get -# (none) diff --git a/tests/assertions/MIR-586.core.test b/tests/assertions/MIR-586.core.test index 031777ee6..88681dfed 100644 --- a/tests/assertions/MIR-586.core.test +++ b/tests/assertions/MIR-586.core.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib1 # mir --area=11/-1/-1/11 --interpolation=none -# grib_get assertions +# grib_get gridType=regular_ll Ni=6 Nj=6 diff --git a/tests/assertions/MIR-587.core.test b/tests/assertions/MIR-587.core.test index 8d607b922..e105cf43a 100644 --- a/tests/assertions/MIR-587.core.test +++ b/tests/assertions/MIR-587.core.test @@ -1,8 +1,8 @@ # input MIR-587.grib2 -# mir tool options +# mir --interpolation=grid-box-average --grid=0.5/0.5 -# grib_get assertions (not checking results) +# grib_get Ni=25 Nj=15 latitudeOfFirstGridPointInDegrees=30.5 diff --git a/tests/assertions/MIR-592.001.test b/tests/assertions/MIR-592.001.test index 00b68648d..d5280db10 100644 --- a/tests/assertions/MIR-592.001.test +++ b/tests/assertions/MIR-592.001.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=3/3 --interpolation=linear --vod2uv diff --git a/tests/assertions/MIR-592.002.test b/tests/assertions/MIR-592.002.test index 8f5ffe549..29e717aa5 100644 --- a/tests/assertions/MIR-592.002.test +++ b/tests/assertions/MIR-592.002.test @@ -1,6 +1,16 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=3/3 --interpolation=linear --vod2uv --intgrid=none -# grib_get (placeholder until values can be checked) +# grib_get numberOfPoints=7320 +values[0]=2.89689 +values[1]=3.44181 +values[2]=3.97794 +values[3]=4.50235 +values[4]=5.01505 +values[5]=5.51407 +values[6]=5.99747 +values[7]=6.46427 +values[8]=6.91446 +values[9]=7.34513 diff --git a/tests/assertions/MIR-592.003.test b/tests/assertions/MIR-592.003.test index b68674a99..50064db75 100644 --- a/tests/assertions/MIR-592.003.test +++ b/tests/assertions/MIR-592.003.test @@ -1,6 +1,16 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --grid=3/3 --interpolation=linear # grib_get (placeholder until values can be checked) numberOfPoints=7320 +values[0]=0.000213623 +values[1]=0.000213623 +values[2]=0.000213623 +values[3]=0.000213623 +values[4]=0.000213623 +values[5]=0.000213623 +values[6]=0.000213623 +values[7]=0.000213623 +values[8]=0.000213623 +values[9]=0.000213623 diff --git a/tests/assertions/MIR-595.001.core.test b/tests/assertions/MIR-595.001.core.test index f1547a04b..e1d57bbd2 100644 --- a/tests/assertions/MIR-595.001.core.test +++ b/tests/assertions/MIR-595.001.core.test @@ -1,8 +1,8 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=43/-1/-10/3 --interpolation=none --basic-angle=decimal -# grib_get assertions +# grib_get gridType=regular_ll Ni=3 Nj=64 diff --git a/tests/assertions/MIR-595.002.core.test b/tests/assertions/MIR-595.002.core.test index 30ed20799..26f31116f 100644 --- a/tests/assertions/MIR-595.002.core.test +++ b/tests/assertions/MIR-595.002.core.test @@ -1,8 +1,8 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=43/-2/-10/1 --interpolation=none --basic-angle=as-input -# grib_get assertions +# grib_get gridType=regular_ll Ni=3 Nj=64 diff --git a/tests/assertions/MIR-595.003.core.test b/tests/assertions/MIR-595.003.core.test index 0a698653a..753d7c3c6 100644 --- a/tests/assertions/MIR-595.003.core.test +++ b/tests/assertions/MIR-595.003.core.test @@ -1,8 +1,8 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=43/-2/-10/1 --interpolation=none --basic-angle=fraction -# grib_get assertions +# grib_get gridType=regular_ll Ni=3 Nj=64 diff --git a/tests/assertions/MIR-595.004.core.test b/tests/assertions/MIR-595.004.core.test index afaa9f038..b230dc013 100644 --- a/tests/assertions/MIR-595.004.core.test +++ b/tests/assertions/MIR-595.004.core.test @@ -1,8 +1,8 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=1/-1/-1/1 --interpolation=none --basic-angle=decimal -# grib_get assertions +# grib_get gridType=regular_ll Ni=2 Nj=2 diff --git a/tests/assertions/MIR-595.005.core.test b/tests/assertions/MIR-595.005.core.test index 2b5b4d8f2..37dce961c 100644 --- a/tests/assertions/MIR-595.005.core.test +++ b/tests/assertions/MIR-595.005.core.test @@ -1,8 +1,8 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=1/-1/-1/1 --interpolation=none --basic-angle=as-input -# grib_get assertions +# grib_get gridType=regular_ll Ni=2 Nj=2 diff --git a/tests/assertions/MIR-595.006.core.test b/tests/assertions/MIR-595.006.core.test index 055266e70..4ce6260ac 100644 --- a/tests/assertions/MIR-595.006.core.test +++ b/tests/assertions/MIR-595.006.core.test @@ -1,8 +1,8 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=1/-1/-1/1 --interpolation=none --basic-angle=fraction -# grib_get assertions +# grib_get gridType=regular_ll Ni=2 Nj=2 diff --git a/tests/assertions/MIR-632.001.test b/tests/assertions/MIR-632.001.test index bbffcd322..83d5e4432 100644 --- a/tests/assertions/MIR-632.001.test +++ b/tests/assertions/MIR-632.001.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=H2 -# grib_get assertions +# grib_get gridType=healpix gridName=H2 Nside=2 diff --git a/tests/assertions/MIR-632.002.test b/tests/assertions/MIR-632.002.test index 0806063e3..411b7698d 100644 --- a/tests/assertions/MIR-632.002.test +++ b/tests/assertions/MIR-632.002.test @@ -1,7 +1,7 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=2/2 -# grib_get assertions +# grib_get gridType=regular_ll numberOfDataPoints=16380 diff --git a/tests/assertions/MIR-632.003.test b/tests/assertions/MIR-632.003.test index 8b2909fee..2cbb1529c 100644 --- a/tests/assertions/MIR-632.003.test +++ b/tests/assertions/MIR-632.003.test @@ -1,8 +1,8 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=H36 -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.004.test b/tests/assertions/MIR-632.004.test index 57add10dc..0d801f4f6 100644 --- a/tests/assertions/MIR-632.004.test +++ b/tests/assertions/MIR-632.004.test @@ -1,8 +1,8 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --packing=ccsds -# grib_get assertions +# grib_get gridType=healpix gridName=H32 Nside=32 diff --git a/tests/assertions/MIR-632.005.test b/tests/assertions/MIR-632.005.test index e0d03d2b8..a724262a3 100644 --- a/tests/assertions/MIR-632.005.test +++ b/tests/assertions/MIR-632.005.test @@ -1,8 +1,8 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --interpolation=grid-box-average --grid=H36 -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.006.test.disabled b/tests/assertions/MIR-632.006.test.disabled index a30e18bbc..34e85116d 100644 --- a/tests/assertions/MIR-632.006.test.disabled +++ b/tests/assertions/MIR-632.006.test.disabled @@ -1,8 +1,8 @@ -# mars +# input ORCA.grib2 # mir --grid=H2 -# grib_get assertions +# grib_get gridType=healpix gridName=H2 Nside=2 diff --git a/tests/assertions/MIR-632.007.test b/tests/assertions/MIR-632.007.test index 200d67157..a83549849 100644 --- a/tests/assertions/MIR-632.007.test +++ b/tests/assertions/MIR-632.007.test @@ -1,8 +1,8 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir --grid=H2 -# grib_get assertions +# grib_get gridType=healpix gridName=H2 Nside=2 diff --git a/tests/assertions/MIR-632.008.test b/tests/assertions/MIR-632.008.test index 8885991e2..2231ed676 100644 --- a/tests/assertions/MIR-632.008.test +++ b/tests/assertions/MIR-632.008.test @@ -1,8 +1,8 @@ -# mars +# input gridType=regular_gg,gridName=F8,shortName=q.grib2 # mir --grid=H2 -# grib_get assertions +# grib_get gridType=healpix gridName=H2 Nside=2 diff --git a/tests/assertions/MIR-632.009.test b/tests/assertions/MIR-632.009.test index e6a2f63bc..e6803069d 100644 --- a/tests/assertions/MIR-632.009.test +++ b/tests/assertions/MIR-632.009.test @@ -1,7 +1,7 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=O8 -# grib_get assertions +# grib_get gridType=reduced_gg numberOfDataPoints=544 diff --git a/tests/assertions/MIR-632.010.test b/tests/assertions/MIR-632.010.test index 6e452d950..21d63e4c5 100644 --- a/tests/assertions/MIR-632.010.test +++ b/tests/assertions/MIR-632.010.test @@ -1,7 +1,7 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=F8 -# grib_get assertions +# grib_get gridType=regular_gg numberOfDataPoints=512 diff --git a/tests/assertions/MIR-632.011.test b/tests/assertions/MIR-632.011.test index 038664719..9e35ae2fc 100644 --- a/tests/assertions/MIR-632.011.test +++ b/tests/assertions/MIR-632.011.test @@ -1,8 +1,8 @@ -# mars +# input regular_ll.2-2.grib2 # mir --interpolation=grid-box-average --grid=H2 -# grib_get assertions +# grib_get gridType=healpix gridName=H2 Nside=2 diff --git a/tests/assertions/MIR-632.012.test b/tests/assertions/MIR-632.012.test index 133505e22..ba33e5f72 100644 --- a/tests/assertions/MIR-632.012.test +++ b/tests/assertions/MIR-632.012.test @@ -1,8 +1,8 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir --interpolation=grid-box-average --grid=H2 -# grib_get assertions +# grib_get gridType=healpix gridName=H2 Nside=2 diff --git a/tests/assertions/MIR-632.013.test b/tests/assertions/MIR-632.013.test index 17e2fe2e4..8015140c1 100644 --- a/tests/assertions/MIR-632.013.test +++ b/tests/assertions/MIR-632.013.test @@ -1,8 +1,8 @@ -# mars +# input gridType=regular_gg,gridName=F8,shortName=q.grib2 # mir --interpolation=grid-box-average --grid=H2 -# grib_get assertions +# grib_get gridType=healpix gridName=H2 Nside=2 diff --git a/tests/assertions/MIR-632.014.test b/tests/assertions/MIR-632.014.test index fb6fb33cf..275c9e48d 100644 --- a/tests/assertions/MIR-632.014.test +++ b/tests/assertions/MIR-632.014.test @@ -1,7 +1,7 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --interpolation=grid-box-average --grid=O8 -# grib_get assertions +# grib_get gridType=reduced_gg numberOfDataPoints=544 diff --git a/tests/assertions/MIR-632.015.test b/tests/assertions/MIR-632.015.test index 567c1eb44..7bafc94f0 100644 --- a/tests/assertions/MIR-632.015.test +++ b/tests/assertions/MIR-632.015.test @@ -1,7 +1,7 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --interpolation=grid-box-average --grid=F8 -# grib_get assertions +# grib_get gridType=regular_gg numberOfDataPoints=512 diff --git a/tests/assertions/MIR-632.016.test b/tests/assertions/MIR-632.016.test index fffc37cdf..7e7c256e7 100644 --- a/tests/assertions/MIR-632.016.test +++ b/tests/assertions/MIR-632.016.test @@ -1,8 +1,8 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir --interpolation=grid-box-average --grid=H36 --accuracy=8 -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.017.fail.test b/tests/assertions/MIR-632.017.fail.test index 82c59ec28..edb3fc85c 100644 --- a/tests/assertions/MIR-632.017.fail.test +++ b/tests/assertions/MIR-632.017.fail.test @@ -1,8 +1,8 @@ -# mars +# input param=t,level=1,levtype=ml,resol=20.grib2 # mir (fails because of no support for inv. spectral transfoms to "shifted" grids) --grid=H36 --intgrid=none -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.018.test b/tests/assertions/MIR-632.018.test index b98685f89..3ed512934 100644 --- a/tests/assertions/MIR-632.018.test +++ b/tests/assertions/MIR-632.018.test @@ -1,8 +1,8 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir --grid=H36 --interpolation=grid-box-average --packing=ccsds -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.019.fail.test b/tests/assertions/MIR-632.019.fail.test index 99df5856e..24dfce316 100644 --- a/tests/assertions/MIR-632.019.fail.test +++ b/tests/assertions/MIR-632.019.fail.test @@ -1,8 +1,8 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir (fails because input is GRIB1) --grid=H36 --vod2uv -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.020.fail.test b/tests/assertions/MIR-632.020.fail.test index ed02e5e72..532dcc53d 100644 --- a/tests/assertions/MIR-632.020.fail.test +++ b/tests/assertions/MIR-632.020.fail.test @@ -1,8 +1,8 @@ -# mars +# input param=t,level=1000,resol=20 # mir (fails because input is GRIB1) --grid=H36 -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.021.fail.test b/tests/assertions/MIR-632.021.fail.test index 1c112f25e..15bbcf41d 100644 --- a/tests/assertions/MIR-632.021.fail.test +++ b/tests/assertions/MIR-632.021.fail.test @@ -1,8 +1,8 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir (fails because of no support for inv. spectral transfoms to "shifted" grids) --grid=H36 --intgrid=none --vod2uv -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.022.fail.test b/tests/assertions/MIR-632.022.fail.test index 26ab076d3..9b228b26d 100644 --- a/tests/assertions/MIR-632.022.fail.test +++ b/tests/assertions/MIR-632.022.fail.test @@ -1,8 +1,8 @@ -# mars +# input param=t,level=1000,resol=20 # mir (fails because of no support for inv. spectral transfoms to "shifted" grids) --grid=H36 --intgrid=none -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.023.test b/tests/assertions/MIR-632.023.test index 63b19a1fb..9277c5a62 100644 --- a/tests/assertions/MIR-632.023.test +++ b/tests/assertions/MIR-632.023.test @@ -1,8 +1,8 @@ -# mars +# input param=vo_d,level=1,levtype=ml,resol=20.grib2 # mir --grid=H36 --vod2uv -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.024.test b/tests/assertions/MIR-632.024.test index 2c801d866..49dbdd2a4 100644 --- a/tests/assertions/MIR-632.024.test +++ b/tests/assertions/MIR-632.024.test @@ -1,8 +1,8 @@ -# mars +# input param=t,level=1,levtype=ml,resol=20.grib2 # mir --grid=H36 -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-632.025.fail.test b/tests/assertions/MIR-632.025.fail.test index 27ebdbcd0..c85b45bc0 100644 --- a/tests/assertions/MIR-632.025.fail.test +++ b/tests/assertions/MIR-632.025.fail.test @@ -1,8 +1,8 @@ -# mars +# input param=vo_d,level=1,levtype=ml,resol=20.grib2 # mir --grid=H36 --intgrid=none --vod2uv -# grib_get assertions +# grib_get gridType=healpix gridName=H36 Nside=36 diff --git a/tests/assertions/MIR-634.001.test b/tests/assertions/MIR-634.001.test index b109b3d9a..0db806938 100644 --- a/tests/assertions/MIR-634.001.test +++ b/tests/assertions/MIR-634.001.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --truncation=none --intgrid=none --latitudes=1/2/3 --longitudes=4/5/6 --format=grib diff --git a/tests/assertions/MIR-634.002.test b/tests/assertions/MIR-634.002.test index 5eb07404d..7bb6698fc 100644 --- a/tests/assertions/MIR-634.002.test +++ b/tests/assertions/MIR-634.002.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --truncation=none --intgrid=none --latitudes=1/2/3 --longitudes=4/5/6 --format=grib diff --git a/tests/assertions/MIR-643.001.test b/tests/assertions/MIR-643.001.test index 002ac5ef4..0e3809212 100644 --- a/tests/assertions/MIR-643.001.test +++ b/tests/assertions/MIR-643.001.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=nested.grib2 # mir --grid=1/1 --interpolation=nn diff --git a/tests/assertions/MIR-643.002.test b/tests/assertions/MIR-643.002.test index 3a644e676..24f845ffe 100644 --- a/tests/assertions/MIR-643.002.test +++ b/tests/assertions/MIR-643.002.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=nested.grib2 # mir --grid=h32 --interpolation=nn diff --git a/tests/assertions/MIR-643.003.test b/tests/assertions/MIR-643.003.test index d7b9146de..17b425576 100644 --- a/tests/assertions/MIR-643.003.test +++ b/tests/assertions/MIR-643.003.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=nested.grib2 # mir --grid=h16_nested --interpolation=grid-box-average diff --git a/tests/assertions/MIR-643.004.test b/tests/assertions/MIR-643.004.test index 09df5cfe7..47e637df3 100644 --- a/tests/assertions/MIR-643.004.test +++ b/tests/assertions/MIR-643.004.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=h16 --interpolation=nn diff --git a/tests/assertions/MIR-643.005.test b/tests/assertions/MIR-643.005.test index cbdafb955..61cd7248f 100644 --- a/tests/assertions/MIR-643.005.test +++ b/tests/assertions/MIR-643.005.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=h16_nested --interpolation=nn diff --git a/tests/assertions/MIR-647.001.test b/tests/assertions/MIR-647.001.test index 4633efec8..3c1db0362 100644 --- a/tests/assertions/MIR-647.001.test +++ b/tests/assertions/MIR-647.001.test @@ -1,10 +1,10 @@ -# mars +# input gridType=healpix,Nside=2,orderingConvention=nested.grib2 # mir $MIR_CACHING=1 $MIR_CACHE_PATH=cache.MIR-647 --grid=H2 --interpolation=linear -# grib_get assertions +# grib_get gridType=healpix gridName=H2 orderingConvention=ring diff --git a/tests/assertions/MIR-647.002.test b/tests/assertions/MIR-647.002.test index 57cea6221..e644a8570 100644 --- a/tests/assertions/MIR-647.002.test +++ b/tests/assertions/MIR-647.002.test @@ -1,10 +1,10 @@ -# mars +# input gridType=healpix,Nside=2,orderingConvention=ring.grib2 # mir $MIR_CACHING=1 $MIR_CACHE_PATH=cache.MIR-647 --grid=H2 --interpolation=linear -# grib_get assertions +# grib_get gridType=healpix gridName=H2 orderingConvention=ring diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.001.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.001.core.test index 9c8c53d2e..0587660e9 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.001.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.001.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=simple diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.002.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.002.core.test index 8072d8b7c..8c9455654 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.002.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.002.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=so diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.003.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.003.core.test index 3d3602af6..419362a65 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.003.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.003.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=ccsds --grib-edition-conversion=true diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.004.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.004.core.test index 83ad6b453..77336c29d 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.004.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.004.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=ieee diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.005.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.005.core.test index ad89fdb87..29478f015 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.005.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.005.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=ieee --accuracy=32 diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.006.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.006.core.test index 9b7b82ab1..1fe56a91f 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.006.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.006.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.007.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.007.core.test index 58a0a8117..dd4b328d4 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.007.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.007.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=av diff --git a/tests/assertions/MIR-651.packingType=spectral_ieee.008.core.test b/tests/assertions/MIR-651.packingType=spectral_ieee.008.core.test index 674d857fb..b4a9e391f 100644 --- a/tests/assertions/MIR-651.packingType=spectral_ieee.008.core.test +++ b/tests/assertions/MIR-651.packingType=spectral_ieee.008.core.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=0.5/0.5 diff --git a/tests/assertions/MPY-400.001.core.test b/tests/assertions/MPY-400.001.core.test index 479d8f7cd..d29d79a75 100644 --- a/tests/assertions/MPY-400.001.core.test +++ b/tests/assertions/MPY-400.001.core.test @@ -1,8 +1,8 @@ -# Mars request: grid=f60,area=26.15/0/-26.15/360 +# input MPY-400.grib1 -# Mir tool options +# mir --grid=1.5/1.5 --interpolation=grid-box-average -# grib_get assertions +# grib_get gridType=regular_ll Ni=240 Nj=35 diff --git a/tests/assertions/MPY-400.002.core.test b/tests/assertions/MPY-400.002.core.test index 918c99416..efe8f6e65 100644 --- a/tests/assertions/MPY-400.002.core.test +++ b/tests/assertions/MPY-400.002.core.test @@ -1,8 +1,8 @@ -# Mars request: grid=f60,area=26.15/0/-26.15/360 +# input MPY-400.grib1 -# Mir tool options +# mir --grid=1.5/1.5 --interpolation=grid-box-average --area=25/-180/-25/180 -# grib_get assertions +# grib_get gridType=regular_ll Ni=240 Nj=34 diff --git a/tests/assertions/PGEN-413.core.test b/tests/assertions/PGEN-413.core.test index b6f970122..ce20cdd53 100644 --- a/tests/assertions/PGEN-413.core.test +++ b/tests/assertions/PGEN-413.core.test @@ -1,9 +1,8 @@ -# mars retrieve,param=nsss,levtype=sfc,date=20210802,type=fc,time=1200,step=65,area=0.5/6.75/-0.5/7.25,target=PGEN-413.grib -# (there are no missing values in the input data, the output shouldn't contain any) +# input (retrieve,param=nsss,levtype=sfc,date=20210802,type=fc,time=1200,step=65,area=0.5/6.75/-0.5/7.25,target=PGEN-413.grib -- there are no missing values in the input data, the output shouldn't contain any) PGEN-413.grib # mir --grid=.25/.25 --area=.25/7/-.25/7 --caching=0 -# grib_get assertions +# grib_get bitsPerValue=16 bitmapPresent=0 missingValuesPresent=0 diff --git a/tests/assertions/PGEN-496.core.test b/tests/assertions/PGEN-496.core.test index ae972674d..a926b99e6 100644 --- a/tests/assertions/PGEN-496.core.test +++ b/tests/assertions/PGEN-496.core.test @@ -1,7 +1,5 @@ -# PGEN-496 ensure handling of (gridded input) + RESOL=AV (--intgrid=source --truncation=none) -# mars +# input regular_ll.2-2.grib1 -# mir +# mir (resol=av => intgrid=source truncation=none) --grid=2/2 --truncation=none # grib_get - diff --git a/tests/assertions/PGEN-93.001.core.test b/tests/assertions/PGEN-93.001.core.test index 8074f7014..a69c9a40d 100644 --- a/tests/assertions/PGEN-93.001.core.test +++ b/tests/assertions/PGEN-93.001.core.test @@ -1,7 +1,6 @@ -# Different versions of IFS-generated octahedral grids -# MARS request +# input O400.version=1.grib1 # mir --grid=3/3 -# grib_get assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/PGEN-93.002.core.test b/tests/assertions/PGEN-93.002.core.test index b8ca19a8c..eeb5c182d 100644 --- a/tests/assertions/PGEN-93.002.core.test +++ b/tests/assertions/PGEN-93.002.core.test @@ -1,7 +1,6 @@ -# Different versions of IFS-generated octahedral grids -# MARS request +# input O400.version=2.grib1 # mir --grid=3/3 -# grib_get assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/PGEN-93.003.core.test b/tests/assertions/PGEN-93.003.core.test index 0297e8fff..99bcf1c84 100644 --- a/tests/assertions/PGEN-93.003.core.test +++ b/tests/assertions/PGEN-93.003.core.test @@ -1,7 +1,6 @@ -# Different versions of IFS-generated octahedral grids -# MARS request +# input O400.version=3.grib1.NON-GLOBAL # mir --grid=3/3 -# grib_get assertions +# grib_get gridType=regular_ll diff --git a/tests/assertions/grid-from-geopoints-format-ncols.core.test b/tests/assertions/grid-from-geopoints-format-ncols.core.test index 43ad3eb09..a4a4a61b1 100644 --- a/tests/assertions/grid-from-geopoints-format-ncols.core.test +++ b/tests/assertions/grid-from-geopoints-format-ncols.core.test @@ -1,7 +1,5 @@ -# Geopoints: Format NCOLS (Multi-column format) -# This format allows any number of parameters to be stored in a geopoints file. The #COLUMNS section is used to understand the columns, as they can be put in any order. The following column names are reserved and are treated specially: longitude, level, date, time, stnid. A column with a different name will be treated as a value column. The data should all be numeric, apart from stnid, which is stored as a string. +# input (Geopoints NCOLS Multi-column format; This format allows any number of parameters to be stored in a geopoints file. The #COLUMNS section is used to understand the columns, as they can be put in any order. The following column names are reserved and are treated specially: longitude, level, date, time, stnid. A column with a different name will be treated as a value column. The data should all be numeric, apart from stnid, which is stored as a string) geopoints-format-ncols.gpt -# Mir tool options +# mir --output=geopoints-xyv -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/grid-from-geopoints-format-polar-vector.core.test b/tests/assertions/grid-from-geopoints-format-polar-vector.core.test index 82c91ff45..2b0bc257e 100644 --- a/tests/assertions/grid-from-geopoints-format-polar-vector.core.test +++ b/tests/assertions/grid-from-geopoints-format-polar-vector.core.test @@ -1,7 +1,5 @@ -# Geopoints: Format POLAR_VECTOR (Polar Vector format) -# This format allows two parameters to be stored as the speed and direction of a two-dimensional vector, the direction being specified in degrees where zero is due South and angles increase clockwise. +# input (Geopoints POLAR_VECTOR; This format allows two parameters to be stored as the speed and direction of a two-dimensional vector, the direction being specified in degrees where zero is due South and angles increase clockwise) geopoints-format-polar-vector.gpt -# Mir tool options +# mir --output=geopoints-xyv -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/grid-from-geopoints-format-xy-vector.core.test b/tests/assertions/grid-from-geopoints-format-xy-vector.core.test index 8d5317ca7..480f014c8 100644 --- a/tests/assertions/grid-from-geopoints-format-xy-vector.core.test +++ b/tests/assertions/grid-from-geopoints-format-xy-vector.core.test @@ -1,6 +1,5 @@ -# Geopoints: Format XY_VECTOR (XY Vector format) +# input (Geopoints XY_VECTOR) geopoints-format-xy-vector.gpt -# Mir tool options +# mir --output=geopoints-xyv -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/grid-from-geopoints-format-xyv.core.test b/tests/assertions/grid-from-geopoints-format-xyv.core.test index 6b8487842..18b1e557f 100644 --- a/tests/assertions/grid-from-geopoints-format-xyv.core.test +++ b/tests/assertions/grid-from-geopoints-format-xyv.core.test @@ -1,6 +1,5 @@ -# Geopoints: Format XYV (Compact format) +# input (Geopoints XYV Compact format) geopoints-format-xyv.gpt -# Mir tool options +# mir --output=geopoints-xyv -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/grid-from-geopoints-standard.core.test b/tests/assertions/grid-from-geopoints-standard.core.test index 6ff2eb1bc..081e7cde6 100644 --- a/tests/assertions/grid-from-geopoints-standard.core.test +++ b/tests/assertions/grid-from-geopoints-standard.core.test @@ -1,6 +1,5 @@ -# Geopoints: Standard (6-column) geopoints +# input (Geopoints Standard 6-column geopoints) geopoints-standard.gpt -# Mir tool options +# mir --output=geopoints-xyv -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/griddef-from-gridded.core.test b/tests/assertions/griddef-from-gridded.core.test index 655b1e556..e1e90368c 100644 --- a/tests/assertions/griddef-from-gridded.core.test +++ b/tests/assertions/griddef-from-gridded.core.test @@ -1,6 +1,5 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --griddef=$tests_assertions_dir/weather-params.pts -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/griddef-from-spectral-local-transform-scalar.test.disabled b/tests/assertions/griddef-from-spectral-local-transform-scalar.test.disabled index c513166a2..c3458ca67 100644 --- a/tests/assertions/griddef-from-spectral-local-transform-scalar.test.disabled +++ b/tests/assertions/griddef-from-spectral-local-transform-scalar.test.disabled @@ -1,6 +1,5 @@ -# Mars request +# input param=t,level=1000,resol=20 -# Mir tool options +# mir --plan=sh-scalar-to-griddef(griddef=tour.pts) --output=geopoints-xyv -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/griddef-from-spectral-local-transform-vod-to-uv.test.disabled b/tests/assertions/griddef-from-spectral-local-transform-vod-to-uv.test.disabled index 088c4cd72..4149f88fb 100644 --- a/tests/assertions/griddef-from-spectral-local-transform-vod-to-uv.test.disabled +++ b/tests/assertions/griddef-from-spectral-local-transform-vod-to-uv.test.disabled @@ -1,6 +1,5 @@ -# Mars request +# input param=vo/d,level=1000,resol=20 -# Mir tool options +# mir --plan=sh-vod-to-uv-griddef(griddef=tour.pts) --output=geopoints-xy-vector --vod2uv -# grib_get assertions -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/griddef-from-spectral.test b/tests/assertions/griddef-from-spectral.test index 68559c6f0..d3bae84e9 100644 --- a/tests/assertions/griddef-from-spectral.test +++ b/tests/assertions/griddef-from-spectral.test @@ -1,6 +1,5 @@ -# mars +# input param=t,level=1000,resol=20 # mir --griddef=$tests_assertions_dir/weather-params.pts -# grib_get -# none: output file is GEOPOINTS +# grib_get (output is GEOPOINTS) diff --git a/tests/assertions/interpolation=grib-box-average.core.test b/tests/assertions/interpolation=grib-box-average.core.test index 50ae6918e..f37ce1944 100644 --- a/tests/assertions/interpolation=grib-box-average.core.test +++ b/tests/assertions/interpolation=grib-box-average.core.test @@ -1,7 +1,17 @@ # input -tiny.grib -# mir tool options +tiny-2x2.grib +# mir --interpolation=grid-box-average --grid=0.5/0.5 -# grib_get assertions (not checking results) +# grib_get (not checking results) Ni=3 Nj=3 +values[0]=0 +values[1]=0.5 +values[2]=1 +values[3]=1.00002 +values[4]=1.50002 +values[5]=2.00002 +values[6]=2 +values[7]=2.5 +values[8]=3 + diff --git a/tests/assertions/tiny-2x2.grib b/tests/assertions/tiny-2x2.grib new file mode 120000 index 000000000..cbbaac929 --- /dev/null +++ b/tests/assertions/tiny-2x2.grib @@ -0,0 +1 @@ +../data/tiny-2x2.grib \ No newline at end of file diff --git a/tests/assertions/tiny-3x3.grib b/tests/assertions/tiny-3x3.grib new file mode 120000 index 000000000..31fd2d6d3 --- /dev/null +++ b/tests/assertions/tiny-3x3.grib @@ -0,0 +1 @@ +../data/tiny-3x3.grib \ No newline at end of file diff --git a/tests/assertions/tiny.grib b/tests/assertions/tiny.grib deleted file mode 120000 index 6e9bb617f..000000000 --- a/tests/assertions/tiny.grib +++ /dev/null @@ -1 +0,0 @@ -../data/tiny.grib \ No newline at end of file diff --git a/tests/data/packingType=grid_simple.grib1 b/tests/data/packingType=grid_simple.grib1 deleted file mode 120000 index 726523bcc..000000000 --- a/tests/data/packingType=grid_simple.grib1 +++ /dev/null @@ -1 +0,0 @@ -gridType=reduced_ll,shortName=wsp,packingType=grid_simple.grib1 \ No newline at end of file diff --git a/tests/data/packingType=grid_simple.grib1 b/tests/data/packingType=grid_simple.grib1 new file mode 100644 index 000000000..a950dbaf1 Binary files /dev/null and b/tests/data/packingType=grid_simple.grib1 differ diff --git a/tests/data/tiny.grib b/tests/data/tiny-2x2.grib similarity index 100% rename from tests/data/tiny.grib rename to tests/data/tiny-2x2.grib diff --git a/tests/data/tiny-3x3.grib b/tests/data/tiny-3x3.grib new file mode 100644 index 000000000..8a9af4198 Binary files /dev/null and b/tests/data/tiny-3x3.grib differ diff --git a/tests/plans/0000.test b/tests/plans/0000.test index 38d9470a7..2899c05dc 100644 --- a/tests/plans/0000.test +++ b/tests/plans/0000.test @@ -1,4 +1,4 @@ -# mars +# input param=2t,levtype=sfc # mir --dont-compress-plan --area=80/-10/10/100 --grid=1/1 diff --git a/tests/plans/0001.test b/tests/plans/0001.test index 5113d80c9..26cb3ca71 100644 --- a/tests/plans/0001.test +++ b/tests/plans/0001.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --dont-compress-plan --grid=1/1 diff --git a/tests/plans/0002.test b/tests/plans/0002.test index 515c8a72e..02c9cf150 100644 --- a/tests/plans/0002.test +++ b/tests/plans/0002.test @@ -1,4 +1,4 @@ -# mars +# input param=2t,levtype=sfc # mir --dont-compress-plan --area=80/-10/10/100 --grid=1/1 --accuracy=8 --packing=so diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test index 01c771878..db4525a05 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global.test index 108508f35..83dcc4caa 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=global.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=1/1 diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test index f1029f729..2469c2d7c 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=1/1 --area=10/0/0/10 --dont-compress-plan diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area.test index 0740f5a16..17e9d7bf6 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-grid=1-1-area=sub-area.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=1/1 --area=10/0/0/10 diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test index 27e648a85..4896336d8 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=F80 --dont-compress-plan diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global.test index 6f40e3d28..c8c4cad34 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=global.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=F80 diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test index 7b653cf61..1f1394bad 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=F80 --area=10/0/0/10 --dont-compress-plan diff --git a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area.test b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area.test index 2cefda603..89e5c899c 100644 --- a/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area.test +++ b/tests/plans/MIR-178-scalar-truncation=none-intgrid=none-gridname=F80-area=sub-area.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=F80 --area=10/0/0/10 diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test index d375e0bfa..50ee18c7c 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global.test index f00d93426..465823171 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=global.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=1/1 diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test index 580dec3d4..a68a068cb 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=1/1 --area=10/0/0/10 --dont-compress-plan diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area.test index 96d19d97b..2cb282ef2 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-grid=1-1-area=sub-area.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=1/1 --area=10/0/0/10 diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test index 2f7217831..6d049ac4c 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=F80 --dont-compress-plan diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global.test index 106e8fbd8..cb8dbbb9d 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=global.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=F80 diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test index adf4b09bf..2cd332b60 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area-dont-compress-plan.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=F80 --area=10/0/0/10 --dont-compress-plan diff --git a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area.test b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area.test index 4199b0c2a..4a459a2a5 100644 --- a/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area.test +++ b/tests/plans/MIR-178-vod2uv-truncation=none-intgrid=none-gridname=F80-area=sub-area.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=F80 --area=10/0/0/10 diff --git a/tests/plans/MIR-216-scalar-truncation=auto-intgrid=none-grid=0.8-0.8.test b/tests/plans/MIR-216-scalar-truncation=auto-intgrid=none-grid=0.8-0.8.test index 1cda82e1e..ba9e00512 100644 --- a/tests/plans/MIR-216-scalar-truncation=auto-intgrid=none-grid=0.8-0.8.test +++ b/tests/plans/MIR-216-scalar-truncation=auto-intgrid=none-grid=0.8-0.8.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=auto --intgrid=none --grid=0.8/0.8 diff --git a/tests/plans/MIR-219-gridded-uv-from-spectral-uv-not-wind.test b/tests/plans/MIR-219-gridded-uv-from-spectral-uv-not-wind.test index 31684a40b..16ca9ee58 100644 --- a/tests/plans/MIR-219-gridded-uv-from-spectral-uv-not-wind.test +++ b/tests/plans/MIR-219-gridded-uv-from-spectral-uv-not-wind.test @@ -1,4 +1,4 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --grid=1/1 --truncation=19 --intgrid=none diff --git a/tests/plans/MIR-219-gridded-uv-from-spectral-uv.test b/tests/plans/MIR-219-gridded-uv-from-spectral-uv.test index 5e3b68ba2..516841418 100644 --- a/tests/plans/MIR-219-gridded-uv-from-spectral-uv.test +++ b/tests/plans/MIR-219-gridded-uv-from-spectral-uv.test @@ -1,4 +1,4 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --grid=1/1 --truncation=19 --intgrid=none --uv2uv diff --git a/tests/plans/MIR-219-gridded-uv-from-spectral-vod.test b/tests/plans/MIR-219-gridded-uv-from-spectral-vod.test index dfc62f98d..083c7a9a7 100644 --- a/tests/plans/MIR-219-gridded-uv-from-spectral-vod.test +++ b/tests/plans/MIR-219-gridded-uv-from-spectral-vod.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=1/1 --truncation=19 --intgrid=none --vod2uv diff --git a/tests/plans/MIR-219-scalar-grid=veryfine-1.test b/tests/plans/MIR-219-scalar-grid=veryfine-1.test index 778af2712..9e4659e26 100644 --- a/tests/plans/MIR-219-scalar-grid=veryfine-1.test +++ b/tests/plans/MIR-219-scalar-grid=veryfine-1.test @@ -1,5 +1,4 @@ -# mars -# this test a very high resolution so that truncation (in spectral linear order to grid increments) does not happen because it exceeds the input field truncation +# input param=t,level=1000 # mir --grid=0.1/0.1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-grid=veryfine-2.test b/tests/plans/MIR-219-scalar-grid=veryfine-2.test index 42350502d..a52689d32 100644 --- a/tests/plans/MIR-219-scalar-grid=veryfine-2.test +++ b/tests/plans/MIR-219-scalar-grid=veryfine-2.test @@ -1,5 +1,4 @@ -# mars -# this test a very high resolution so that truncation (in spectral linear order to grid increments) does not happen because it exceeds the input field truncation +# input param=t,level=1000 # mir --grid=0.01/0.01 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=1023-intgrid=none-grid=O400.test b/tests/plans/MIR-219-scalar-truncation=1023-intgrid=none-grid=O400.test index fecac3a35..86373d3af 100644 --- a/tests/plans/MIR-219-scalar-truncation=1023-intgrid=none-grid=O400.test +++ b/tests/plans/MIR-219-scalar-truncation=1023-intgrid=none-grid=O400.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=1023 --intgrid=none --grid=O400 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=255-intgrid=O320-grid=1-1.test b/tests/plans/MIR-219-scalar-truncation=255-intgrid=O320-grid=1-1.test index f1b6089d5..7291f3ee1 100644 --- a/tests/plans/MIR-219-scalar-truncation=255-intgrid=O320-grid=1-1.test +++ b/tests/plans/MIR-219-scalar-truncation=255-intgrid=O320-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=255 --intgrid=O320 --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=255-intgrid=auto-grid=1-1.test b/tests/plans/MIR-219-scalar-truncation=255-intgrid=auto-grid=1-1.test index 358b6f4d5..7f138e6c8 100644 --- a/tests/plans/MIR-219-scalar-truncation=255-intgrid=auto-grid=1-1.test +++ b/tests/plans/MIR-219-scalar-truncation=255-intgrid=auto-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=255 --intgrid=auto --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=399-intgrid=auto-grid=1-1.test b/tests/plans/MIR-219-scalar-truncation=399-intgrid=auto-grid=1-1.test index 9f9921e9e..966209346 100644 --- a/tests/plans/MIR-219-scalar-truncation=399-intgrid=auto-grid=1-1.test +++ b/tests/plans/MIR-219-scalar-truncation=399-intgrid=auto-grid=1-1.test @@ -1,5 +1,5 @@ # MIR-238 is related to MIR-219 -# mars +# input param=t,level=1000 # mir --truncation=399 --intgrid=auto --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=O320-grid=2-2.test b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=O320-grid=2-2.test index 0ad18bfe9..8f755c9bd 100644 --- a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=O320-grid=2-2.test +++ b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=O320-grid=2-2.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=auto --intgrid=O320 --grid=2/2 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=1-1.test b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=1-1.test index 4a7e9b8d2..4cc55c2c8 100644 --- a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=1-1.test +++ b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=auto --intgrid=auto --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=N80.test b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=N80.test index 6ea97b48b..10990218d 100644 --- a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=N80.test +++ b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=auto-grid=N80.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=auto --intgrid=auto --grid=N80 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=none-grid=1-1.test b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=none-grid=1-1.test index 2614ff7e2..144889989 100644 --- a/tests/plans/MIR-219-scalar-truncation=auto-intgrid=none-grid=1-1.test +++ b/tests/plans/MIR-219-scalar-truncation=auto-intgrid=none-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=auto --intgrid=none --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=none-intgrid=O400-grid=O200.test b/tests/plans/MIR-219-scalar-truncation=none-intgrid=O400-grid=O200.test index 5e2ff5907..62706a20d 100644 --- a/tests/plans/MIR-219-scalar-truncation=none-intgrid=O400-grid=O200.test +++ b/tests/plans/MIR-219-scalar-truncation=none-intgrid=O400-grid=O200.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=O400 --grid=O200 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=none-intgrid=auto-grid=1-1.test b/tests/plans/MIR-219-scalar-truncation=none-intgrid=auto-grid=1-1.test index c7550b71e..90f93fcd9 100644 --- a/tests/plans/MIR-219-scalar-truncation=none-intgrid=auto-grid=1-1.test +++ b/tests/plans/MIR-219-scalar-truncation=none-intgrid=auto-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=auto --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar-truncation=none-intgrid=none-grid=1-1.test b/tests/plans/MIR-219-scalar-truncation=none-intgrid=none-grid=1-1.test index 01c771878..db4525a05 100644 --- a/tests/plans/MIR-219-scalar-truncation=none-intgrid=none-grid=1-1.test +++ b/tests/plans/MIR-219-scalar-truncation=none-intgrid=none-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-scalar.test b/tests/plans/MIR-219-scalar.test index d05274be9..af0fb7c13 100644 --- a/tests/plans/MIR-219-scalar.test +++ b/tests/plans/MIR-219-scalar.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod-2-UV.test b/tests/plans/MIR-219-vod-2-UV.test index b5a12901c..e61fa49ea 100644 --- a/tests/plans/MIR-219-vod-2-UV.test +++ b/tests/plans/MIR-219-vod-2-UV.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv diff --git a/tests/plans/MIR-219-vod2UV-truncation=1023.test b/tests/plans/MIR-219-vod2UV-truncation=1023.test index a35957ca2..cc5b79074 100644 --- a/tests/plans/MIR-219-vod2UV-truncation=1023.test +++ b/tests/plans/MIR-219-vod2UV-truncation=1023.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=1023 diff --git a/tests/plans/MIR-219-vod2UV-truncation=auto.test b/tests/plans/MIR-219-vod2UV-truncation=auto.test index fce469007..81cdd2a6e 100644 --- a/tests/plans/MIR-219-vod2UV-truncation=auto.test +++ b/tests/plans/MIR-219-vod2UV-truncation=auto.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=auto diff --git a/tests/plans/MIR-219-vod2UV-truncation=none.test b/tests/plans/MIR-219-vod2UV-truncation=none.test index 8a849e9fb..eede22c7c 100644 --- a/tests/plans/MIR-219-vod2UV-truncation=none.test +++ b/tests/plans/MIR-219-vod2UV-truncation=none.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none diff --git a/tests/plans/MIR-219-vod2uv-truncation=1023-intgrid=none-grid=O400.test b/tests/plans/MIR-219-vod2uv-truncation=1023-intgrid=none-grid=O400.test index 52966774f..6a5257dda 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=1023-intgrid=none-grid=O400.test +++ b/tests/plans/MIR-219-vod2uv-truncation=1023-intgrid=none-grid=O400.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=1023 --intgrid=none --grid=O400 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=O320-grid=1-1.test b/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=O320-grid=1-1.test index 149e26311..e7794467b 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=O320-grid=1-1.test +++ b/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=O320-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=255 --intgrid=O320 --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=auto-grid=1-1.test b/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=auto-grid=1-1.test index 99b38c15e..59de940eb 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=auto-grid=1-1.test +++ b/tests/plans/MIR-219-vod2uv-truncation=255-intgrid=auto-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=255 --intgrid=auto --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=O320-grid=2-2.test b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=O320-grid=2-2.test index c2f2d5fb9..100d9862e 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=O320-grid=2-2.test +++ b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=O320-grid=2-2.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=auto --intgrid=O320 --grid=2/2 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=1-1.test b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=1-1.test index 3dec84dfb..404816414 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=1-1.test +++ b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=auto --intgrid=auto --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=N80.test b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=N80.test index ad3ea2183..50c052429 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=N80.test +++ b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=auto-grid=N80.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=auto --intgrid=auto --grid=N80 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=none-grid=1-1.test b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=none-grid=1-1.test index 7b25d6b03..a2642bc65 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=none-grid=1-1.test +++ b/tests/plans/MIR-219-vod2uv-truncation=auto-intgrid=none-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=auto --intgrid=none --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=O400-grid=O200.test b/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=O400-grid=O200.test index ad10caeb7..bb0a4f3e9 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=O400-grid=O200.test +++ b/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=O400-grid=O200.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=O400 --grid=O200 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=auto-grid=1-1.test b/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=auto-grid=1-1.test index fa49ad48e..33160496a 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=auto-grid=1-1.test +++ b/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=auto-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=auto --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=none-grid=1-1.test b/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=none-grid=1-1.test index d375e0bfa..50ee18c7c 100644 --- a/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=none-grid=1-1.test +++ b/tests/plans/MIR-219-vod2uv-truncation=none-intgrid=none-grid=1-1.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --truncation=none --intgrid=none --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-veryfine-1.test b/tests/plans/MIR-219-vod2uv-veryfine-1.test index c4f9796bd..1a49bce67 100644 --- a/tests/plans/MIR-219-vod2uv-veryfine-1.test +++ b/tests/plans/MIR-219-vod2uv-veryfine-1.test @@ -1,5 +1,4 @@ -# mars -# this test a very high resolution so that truncation (in spectral linear order to grid increments) does not happen because it exceeds the input field truncation +# input param=vo_d,level=1000 # mir --vod2uv --grid=0.1/0.1 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv-veryfine-2.test b/tests/plans/MIR-219-vod2uv-veryfine-2.test index 2765fabff..da0d1a53e 100644 --- a/tests/plans/MIR-219-vod2uv-veryfine-2.test +++ b/tests/plans/MIR-219-vod2uv-veryfine-2.test @@ -1,5 +1,4 @@ -# mars -# this test a very high resolution so that truncation (in spectral linear order to grid increments) does not happen because it exceeds the input field truncation +# input param=vo_d,level=1000 # mir --vod2uv --grid=0.01/0.01 --dont-compress-plan diff --git a/tests/plans/MIR-219-vod2uv.test b/tests/plans/MIR-219-vod2uv.test index 1156e265c..4fa3afad2 100644 --- a/tests/plans/MIR-219-vod2uv.test +++ b/tests/plans/MIR-219-vod2uv.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000 # mir --vod2uv --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-239-gridname=F64.test b/tests/plans/MIR-239-gridname=F64.test index b636535ec..f2b821092 100644 --- a/tests/plans/MIR-239-gridname=F64.test +++ b/tests/plans/MIR-239-gridname=F64.test @@ -1,5 +1,4 @@ -# MIR-239: check if intermediate grid is the same as the target grid, there is no "double" interpolation -# mars +# input param=t,level=1000 # mir --intgrid=auto --grid=F64 diff --git a/tests/plans/MIR-239-gridname=F640.test b/tests/plans/MIR-239-gridname=F640.test index 712174a2e..199f3e419 100644 --- a/tests/plans/MIR-239-gridname=F640.test +++ b/tests/plans/MIR-239-gridname=F640.test @@ -1,5 +1,4 @@ -# MIR-239: check if intermediate grid is the same as the target grid, there is no "double" interpolation -# mars +# input param=t,level=1000 # mir --intgrid=auto --grid=F640 diff --git a/tests/plans/MIR-239-gridname=O64.test b/tests/plans/MIR-239-gridname=O64.test index 10d36c8dd..e1ca6b8cc 100644 --- a/tests/plans/MIR-239-gridname=O64.test +++ b/tests/plans/MIR-239-gridname=O64.test @@ -1,5 +1,4 @@ -# MIR-239: check if intermediate grid is the same as the target grid, there is no "double" interpolation -# mars +# input param=t,level=1000 # mir --intgrid=auto --grid=O64 --dont-compress-plan diff --git a/tests/plans/MIR-239-gridname=O640.test b/tests/plans/MIR-239-gridname=O640.test index 0bc2555ba..9cf9544f0 100644 --- a/tests/plans/MIR-239-gridname=O640.test +++ b/tests/plans/MIR-239-gridname=O640.test @@ -1,5 +1,4 @@ -# MIR-239: check if intermediate grid is the same as the target grid, there is no "double" interpolation -# mars +# input param=t,level=1000 # mir --intgrid=auto --grid=O640 --dont-compress-plan diff --git a/tests/plans/MIR-240-area.test b/tests/plans/MIR-240-area.test index 6ba5ee763..4c52c5bdd 100644 --- a/tests/plans/MIR-240-area.test +++ b/tests/plans/MIR-240-area.test @@ -1,5 +1,4 @@ -# MIR-240: check if grid-related keywords are ignored for spectral-to-spectral -# mars +# input param=t,level=1000 # mir --area=90/-179/-90/180 diff --git a/tests/plans/MIR-240-bitmap.test b/tests/plans/MIR-240-bitmap.test index fb402c1ac..05f6cf01d 100644 --- a/tests/plans/MIR-240-bitmap.test +++ b/tests/plans/MIR-240-bitmap.test @@ -1,5 +1,4 @@ -# MIR-240: check if grid-related keywords are ignored for spectral-to-spectral -# mars +# input param=t,level=1000 # mir --bitmap=$tests_plans_dir/GAUSS400_EU_GL diff --git a/tests/plans/MIR-240-frame.test b/tests/plans/MIR-240-frame.test index b2868066e..aed5c26a7 100644 --- a/tests/plans/MIR-240-frame.test +++ b/tests/plans/MIR-240-frame.test @@ -1,5 +1,4 @@ -# MIR-240: check if grid-related keywords are ignored for spectral-to-spectral -# mars +# input param=t,level=1000 # mir --frame=2 diff --git a/tests/plans/MIR-268-u-only.test b/tests/plans/MIR-268-u-only.test index 525741c6a..626494a08 100644 --- a/tests/plans/MIR-268-u-only.test +++ b/tests/plans/MIR-268-u-only.test @@ -1,4 +1,4 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --truncation=none --intgrid=none --uv2uv --grid=1/1 --rotation=-89/1 --u-only diff --git a/tests/plans/MIR-268-v-only.test b/tests/plans/MIR-268-v-only.test index ad7e96ac5..f17108167 100644 --- a/tests/plans/MIR-268-v-only.test +++ b/tests/plans/MIR-268-v-only.test @@ -1,4 +1,4 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --truncation=none --intgrid=none --uv2uv --grid=1/1 --rotation=-89/1 --v-only diff --git a/tests/plans/MIR-294.uv2uv=false.test b/tests/plans/MIR-294.uv2uv=false.test index fd6d46997..e47d73a67 100644 --- a/tests/plans/MIR-294.uv2uv=false.test +++ b/tests/plans/MIR-294.uv2uv=false.test @@ -1,4 +1,4 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --grid=1/1 --rotation=-89/1 --uv2uv=false diff --git a/tests/plans/MIR-294.uv2uv=true.test b/tests/plans/MIR-294.uv2uv=true.test index c0366305a..a8bfabcc5 100644 --- a/tests/plans/MIR-294.uv2uv=true.test +++ b/tests/plans/MIR-294.uv2uv=true.test @@ -1,4 +1,4 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --grid=1/1 --rotation=-89/1 --uv2uv=true diff --git a/tests/plans/MIR-294.vod2uv=false.test b/tests/plans/MIR-294.vod2uv=false.test index b31f01c46..e604554b2 100644 --- a/tests/plans/MIR-294.vod2uv=false.test +++ b/tests/plans/MIR-294.vod2uv=false.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=1/1 --rotation=-89/1 --vod2uv=false diff --git a/tests/plans/MIR-294.vod2uv=true.test b/tests/plans/MIR-294.vod2uv=true.test index b9b446ab4..ae1c1be6d 100644 --- a/tests/plans/MIR-294.vod2uv=true.test +++ b/tests/plans/MIR-294.vod2uv=true.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=1/1 --rotation=-89/1 --vod2uv=true diff --git a/tests/plans/MIR-309.001.test b/tests/plans/MIR-309.001.test index 6e135aa0a..55bd114d2 100644 --- a/tests/plans/MIR-309.001.test +++ b/tests/plans/MIR-309.001.test @@ -1,4 +1,4 @@ -# mars +# input stream=wave,param=swh,domain=m # mir --area=28/-77/3/-43 --globalise --grid=1/1 diff --git a/tests/plans/MIR-309.002.test b/tests/plans/MIR-309.002.test index ad358d9f4..5bfe78d5c 100644 --- a/tests/plans/MIR-309.002.test +++ b/tests/plans/MIR-309.002.test @@ -1,4 +1,4 @@ -# mars +# input stream=wave,param=swh,domain=m # mir --area=28/-77/3/-43 --globalise --grid=1/1 --dont-compress-plan diff --git a/tests/plans/MIR-323.001.test b/tests/plans/MIR-323.001.test index de6fd6dd4..58ec74c7c 100644 --- a/tests/plans/MIR-323.001.test +++ b/tests/plans/MIR-323.001.test @@ -1,4 +1,4 @@ -# mars +# input stream=espd,param=ci,class=e2,date=19600201,expver=0003,levtype=sfc,number=0 # mir --grid=0.25/0.25 diff --git a/tests/plans/MIR-323.002.test b/tests/plans/MIR-323.002.test index 923da4548..6039019c8 100644 --- a/tests/plans/MIR-323.002.test +++ b/tests/plans/MIR-323.002.test @@ -1,4 +1,4 @@ -# mars +# input stream=espd,param=ci,class=e2,date=19600201,expver=0003,levtype=sfc,number=0 # mir --grid=1/0.25 diff --git a/tests/plans/MIR-361.001.test b/tests/plans/MIR-361.001.test index d44ffa4c2..669ba2198 100644 --- a/tests/plans/MIR-361.001.test +++ b/tests/plans/MIR-361.001.test @@ -1,4 +1,4 @@ -# mars +# input MIR-340.grib # mir --area=50/-21/25/6 diff --git a/tests/plans/MIR-361.002.test b/tests/plans/MIR-361.002.test index ca65c2401..784508f9e 100644 --- a/tests/plans/MIR-361.002.test +++ b/tests/plans/MIR-361.002.test @@ -1,4 +1,4 @@ -# mars +# input MIR-340.grib # mir --area=50/-21/24.8/6 diff --git a/tests/plans/MIR-361.003.test b/tests/plans/MIR-361.003.test index 521881cd8..6802c73f3 100644 --- a/tests/plans/MIR-361.003.test +++ b/tests/plans/MIR-361.003.test @@ -1,4 +1,4 @@ -# mars +# input MIR-360.grib # mir --area=85/-80/25/40 diff --git a/tests/plans/MIR-361.004.test b/tests/plans/MIR-361.004.test index 0f6d4244c..4485cd0ff 100644 --- a/tests/plans/MIR-361.004.test +++ b/tests/plans/MIR-361.004.test @@ -1,4 +1,4 @@ -# mars +# input MIR-360.grib # mir --area=85/-80.5/25.5/40 diff --git a/tests/plans/MIR-361.005.test b/tests/plans/MIR-361.005.test index 75ada8e98..279d0e4c6 100644 --- a/tests/plans/MIR-361.005.test +++ b/tests/plans/MIR-361.005.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=2/2 diff --git a/tests/plans/MIR-361.006.test b/tests/plans/MIR-361.006.test index 747641ec1..50ff1ee3f 100644 --- a/tests/plans/MIR-361.006.test +++ b/tests/plans/MIR-361.006.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --area=2/0/0/2 diff --git a/tests/plans/MIR-361.007.test b/tests/plans/MIR-361.007.test index b30f90bf2..8a028c4a0 100644 --- a/tests/plans/MIR-361.007.test +++ b/tests/plans/MIR-361.007.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --rotation=30/30 diff --git a/tests/plans/MIR-361.008.test b/tests/plans/MIR-361.008.test index bc45145dc..6959df018 100644 --- a/tests/plans/MIR-361.008.test +++ b/tests/plans/MIR-361.008.test @@ -1,4 +1,4 @@ -# mars +# input rotated_ll.3-3.grib1 # mir --rotation=30/30 diff --git a/tests/plans/MIR-361.009.test b/tests/plans/MIR-361.009.test index f8a565275..95ec7e9d2 100644 --- a/tests/plans/MIR-361.009.test +++ b/tests/plans/MIR-361.009.test @@ -1,4 +1,4 @@ -# mars +# input rotated_ll.3-3.grib1 # mir --area=3/0/0/3 --rotation=30/30 diff --git a/tests/plans/MIR-361.010.test b/tests/plans/MIR-361.010.test index 28c5156f5..f2d723d0e 100644 --- a/tests/plans/MIR-361.010.test +++ b/tests/plans/MIR-361.010.test @@ -1,4 +1,4 @@ -# mars +# input rotated_ll.3-3.grib1 # mir --rotation=10/10 diff --git a/tests/plans/MIR-361.011.test b/tests/plans/MIR-361.011.test index 2e0527d75..7bf6c291a 100644 --- a/tests/plans/MIR-361.011.test +++ b/tests/plans/MIR-361.011.test @@ -1,4 +1,4 @@ -# mars +# input MIR-361.grib # mir --area=89.5/-179.5/-89.5/179.5 diff --git a/tests/plans/MIR-361.012.test b/tests/plans/MIR-361.012.test index ae819cc12..a599743eb 100644 --- a/tests/plans/MIR-361.012.test +++ b/tests/plans/MIR-361.012.test @@ -1,4 +1,4 @@ -# mars +# input MIR-361.grib # mir --grid=1/1 --area=89.5/-179.5/-89.5/179.5 diff --git a/tests/plans/MIR-361.013.test b/tests/plans/MIR-361.013.test index e095ca75e..0871b1a14 100644 --- a/tests/plans/MIR-361.013.test +++ b/tests/plans/MIR-361.013.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-4.grib1 # mir --grid=2/2 diff --git a/tests/plans/MIR-361.014.test b/tests/plans/MIR-361.014.test index 95d02e340..cf3cacd52 100644 --- a/tests/plans/MIR-361.014.test +++ b/tests/plans/MIR-361.014.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-4.grib1 # mir --grid=2/4 diff --git a/tests/plans/MIR-361.015.test b/tests/plans/MIR-361.015.test index 433b35c3b..a1ba3a725 100644 --- a/tests/plans/MIR-361.015.test +++ b/tests/plans/MIR-361.015.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-4.grib1 # mir --grid=4/4 diff --git a/tests/plans/MIR-363.test b/tests/plans/MIR-363.test index 349dce18c..156ff140a 100644 --- a/tests/plans/MIR-363.test +++ b/tests/plans/MIR-363.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --truncation=21 diff --git a/tests/plans/MIR-380.O16-to-laea.test b/tests/plans/MIR-380.O16-to-laea.test index be64e0ca7..ed62470c7 100644 --- a/tests/plans/MIR-380.O16-to-laea.test +++ b/tests/plans/MIR-380.O16-to-laea.test @@ -1,4 +1,4 @@ -# mars +# input param=2t,levtype=sfc,grid=O16 # mir --grid=gridType=lambert_azimuthal_equal_area\;grid=5000./5000.\;standardParallelInDegrees=52.\;centralLongitudeInDegrees=10.\;latitudeOfFirstGridPointInDegrees=66.982143\;longitudeOfFirstGridPointInDegrees=-35.034024\;Ni=1000\;Nj=950\;gaussianNumber=1280 diff --git a/tests/plans/MIR-380.regular_ll-to-laea.test b/tests/plans/MIR-380.regular_ll-to-laea.test index 3ab0e2299..85c9e1131 100644 --- a/tests/plans/MIR-380.regular_ll-to-laea.test +++ b/tests/plans/MIR-380.regular_ll-to-laea.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=gridType=lambert_azimuthal_equal_area\;grid=5000./5000.\;standardParallelInDegrees=52.\;centralLongitudeInDegrees=10.\;latitudeOfFirstGridPointInDegrees=66.982143\;longitudeOfFirstGridPointInDegrees=-35.034024\;Ni=1000\;Nj=950\;gaussianNumber=1280 diff --git a/tests/plans/MIR-380.sh-to-laea.test b/tests/plans/MIR-380.sh-to-laea.test index 68af9ae57..bedba45e5 100644 --- a/tests/plans/MIR-380.sh-to-laea.test +++ b/tests/plans/MIR-380.sh-to-laea.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=gridType=lambert_azimuthal_equal_area\;grid=5000./5000.\;standardParallelInDegrees=52.\;centralLongitudeInDegrees=10.\;latitudeOfFirstGridPointInDegrees=66.982143\;longitudeOfFirstGridPointInDegrees=-35.034024\;Ni=1000\;Nj=950\;gaussianNumber=1280 diff --git a/tests/plans/MIR-403.test b/tests/plans/MIR-403.test index 2cbfeb590..59ff3bc57 100644 --- a/tests/plans/MIR-403.test +++ b/tests/plans/MIR-403.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --grid=0.25/0.25 --rotation=-40/22 --area=73.5/-27/33/45 diff --git a/tests/plans/MIR-454.001.test.atlas-orca b/tests/plans/MIR-454.001.test.atlas-orca index faf063a6f..a640c395b 100644 --- a/tests/plans/MIR-454.001.test.atlas-orca +++ b/tests/plans/MIR-454.001.test.atlas-orca @@ -1,4 +1,4 @@ -# file +# input ORCA.grib2 # mir --grid=eorca1_u diff --git a/tests/plans/MIR-454.002.test.atlas-orca b/tests/plans/MIR-454.002.test.atlas-orca index c491e713b..7073c496d 100644 --- a/tests/plans/MIR-454.002.test.atlas-orca +++ b/tests/plans/MIR-454.002.test.atlas-orca @@ -1,4 +1,4 @@ -# file +# input ORCA.grib2 # mir --grid=eorca1 diff --git a/tests/plans/MIR-454.003.test.atlas-orca b/tests/plans/MIR-454.003.test.atlas-orca index f9980e07e..3896aefe1 100644 --- a/tests/plans/MIR-454.003.test.atlas-orca +++ b/tests/plans/MIR-454.003.test.atlas-orca @@ -1,4 +1,4 @@ -# file +# input ORCA.grib2 # mir --grid=eorca2 diff --git a/tests/plans/MIR-459.nabla=scalar-gradient.param=u_v.test b/tests/plans/MIR-459.nabla=scalar-gradient.param=u_v.test index facd60e5c..1b064e608 100644 --- a/tests/plans/MIR-459.nabla=scalar-gradient.param=u_v.test +++ b/tests/plans/MIR-459.nabla=scalar-gradient.param=u_v.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --nabla=scalar-gradient diff --git a/tests/plans/MIR-459.nabla=scalar-gradient.param=z.gridded.test b/tests/plans/MIR-459.nabla=scalar-gradient.param=z.gridded.test index 5ef0840da..b89711dcf 100644 --- a/tests/plans/MIR-459.nabla=scalar-gradient.param=z.gridded.test +++ b/tests/plans/MIR-459.nabla=scalar-gradient.param=z.gridded.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=z # mir --nabla=scalar-gradient diff --git a/tests/plans/MIR-459.nabla=scalar-gradient.param=z.sh.test b/tests/plans/MIR-459.nabla=scalar-gradient.param=z.sh.test index 74506dcdc..f529636c1 100644 --- a/tests/plans/MIR-459.nabla=scalar-gradient.param=z.sh.test +++ b/tests/plans/MIR-459.nabla=scalar-gradient.param=z.sh.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=z # mir --grid=1/1 --nabla=scalar-gradient diff --git a/tests/plans/MIR-459.nabla=scalar-laplacian.param=u_v.test b/tests/plans/MIR-459.nabla=scalar-laplacian.param=u_v.test index 049857a8c..26fb2662d 100644 --- a/tests/plans/MIR-459.nabla=scalar-laplacian.param=u_v.test +++ b/tests/plans/MIR-459.nabla=scalar-laplacian.param=u_v.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --nabla=scalar-laplacian diff --git a/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.gridded.test b/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.gridded.test index fb95ef200..51268d86a 100644 --- a/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.gridded.test +++ b/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.gridded.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=z # mir --nabla=scalar-laplacian diff --git a/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.sh.test b/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.sh.test index ba52b4dbc..ec26bc5d8 100644 --- a/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.sh.test +++ b/tests/plans/MIR-459.nabla=scalar-laplacian.param=z.sh.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=z # mir --grid=1/1 --nabla=scalar-laplacian diff --git a/tests/plans/MIR-459.nabla=uv-divergence.param=u_v.test b/tests/plans/MIR-459.nabla=uv-divergence.param=u_v.test index 073a3f2a0..6296d8ad7 100644 --- a/tests/plans/MIR-459.nabla=uv-divergence.param=u_v.test +++ b/tests/plans/MIR-459.nabla=uv-divergence.param=u_v.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --uv2uv --nabla=uv-divergence diff --git a/tests/plans/MIR-459.nabla=uv-divergence.param=vo_d.test b/tests/plans/MIR-459.nabla=uv-divergence.param=vo_d.test index aad5d94e2..698065e6f 100644 --- a/tests/plans/MIR-459.nabla=uv-divergence.param=vo_d.test +++ b/tests/plans/MIR-459.nabla=uv-divergence.param=vo_d.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=vo_d # mir --vod2uv --grid=1/1 --nabla=uv-divergence diff --git a/tests/plans/MIR-459.nabla=uv-gradient.param=u_v.test b/tests/plans/MIR-459.nabla=uv-gradient.param=u_v.test index 56412f455..b78a5e3ef 100644 --- a/tests/plans/MIR-459.nabla=uv-gradient.param=u_v.test +++ b/tests/plans/MIR-459.nabla=uv-gradient.param=u_v.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --uv2uv --nabla=uv-gradient diff --git a/tests/plans/MIR-459.nabla=uv-gradient.param=vo_d.test b/tests/plans/MIR-459.nabla=uv-gradient.param=vo_d.test index a257efb8a..91f6cc7df 100644 --- a/tests/plans/MIR-459.nabla=uv-gradient.param=vo_d.test +++ b/tests/plans/MIR-459.nabla=uv-gradient.param=vo_d.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=vo_d # mir --vod2uv --grid=1/1 --nabla=uv-gradient diff --git a/tests/plans/MIR-459.nabla=uv-vorticity.param=u_v.test b/tests/plans/MIR-459.nabla=uv-vorticity.param=u_v.test index eb84ecd1b..2c7331cd8 100644 --- a/tests/plans/MIR-459.nabla=uv-vorticity.param=u_v.test +++ b/tests/plans/MIR-459.nabla=uv-vorticity.param=u_v.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --uv2uv --nabla=uv-vorticity diff --git a/tests/plans/MIR-459.nabla=uv-vorticity.param=vo_d.test b/tests/plans/MIR-459.nabla=uv-vorticity.param=vo_d.test index 5b134d80f..1ae1771ff 100644 --- a/tests/plans/MIR-459.nabla=uv-vorticity.param=vo_d.test +++ b/tests/plans/MIR-459.nabla=uv-vorticity.param=vo_d.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,truncation=20,param=vo_d # mir --vod2uv --grid=1/1 --nabla=uv-vorticity diff --git a/tests/plans/MIR-474.O16-to-lambert.test b/tests/plans/MIR-474.O16-to-lambert.test index 349cd5239..d47837edf 100644 --- a/tests/plans/MIR-474.O16-to-lambert.test +++ b/tests/plans/MIR-474.O16-to-lambert.test @@ -1,4 +1,4 @@ -# mars +# input param=2t,levtype=sfc,grid=O16 # mir --grid=gridType=lambert\;grid=2500./2500.\;writeLaDInDegrees=0\;LaDInDegrees=45.8\;LoVInDegrees=2.\;latitudeOfFirstGridPointInDegrees=37.333\;longitudeOfFirstGridPointInDegrees=-8.354\;Ni=1000\;Nj=950\;gaussianNumber=1280 diff --git a/tests/plans/MIR-474.regular_ll-to-lambert.test b/tests/plans/MIR-474.regular_ll-to-lambert.test index 0789ec487..59b1cba70 100644 --- a/tests/plans/MIR-474.regular_ll-to-lambert.test +++ b/tests/plans/MIR-474.regular_ll-to-lambert.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=gridType=lambert\;grid=2500./2500.\;writeLaDInDegrees=1\;LaDInDegrees=45.8\;LoVInDegrees=2.\;latitudeOfFirstGridPointInDegrees=37.333\;longitudeOfFirstGridPointInDegrees=-8.354\;Ni=1000\;Nj=950\;gaussianNumber=1280 diff --git a/tests/plans/MIR-474.sh-to-lambert.test b/tests/plans/MIR-474.sh-to-lambert.test index 1ae3024df..6f22c5d29 100644 --- a/tests/plans/MIR-474.sh-to-lambert.test +++ b/tests/plans/MIR-474.sh-to-lambert.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=gridType=lambert\;grid=2500./2500.\;writeLaDInDegrees=0\;LaDInDegrees=45.8\;LoVInDegrees=2.\;latitudeOfFirstGridPointInDegrees=37.333\;longitudeOfFirstGridPointInDegrees=-8.354\;Ni=1000\;Nj=950\;gaussianNumber=1280 diff --git a/tests/plans/MIR-487.001.test b/tests/plans/MIR-487.001.test index 1aa88a510..c96dbfcee 100644 --- a/tests/plans/MIR-487.001.test +++ b/tests/plans/MIR-487.001.test @@ -1,4 +1,4 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --accuracy=9 diff --git a/tests/plans/MIR-487.002.test b/tests/plans/MIR-487.002.test index 43134b4ce..d0b3a3271 100644 --- a/tests/plans/MIR-487.002.test +++ b/tests/plans/MIR-487.002.test @@ -1,4 +1,4 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --accuracy=10 diff --git a/tests/plans/MIR-487.003.test b/tests/plans/MIR-487.003.test index aeb0d7685..80bd1599e 100644 --- a/tests/plans/MIR-487.003.test +++ b/tests/plans/MIR-487.003.test @@ -1,4 +1,4 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --accuracy=10 --packing=simple diff --git a/tests/plans/MIR-487.004.test b/tests/plans/MIR-487.004.test index 1115394fa..452dd1d95 100644 --- a/tests/plans/MIR-487.004.test +++ b/tests/plans/MIR-487.004.test @@ -1,4 +1,4 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --accuracy=10 --grid=1/1 diff --git a/tests/plans/MIR-487.005.test b/tests/plans/MIR-487.005.test index 0db74a3e6..4a826c803 100644 --- a/tests/plans/MIR-487.005.test +++ b/tests/plans/MIR-487.005.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --packing=ieee diff --git a/tests/plans/MIR-487.006.test b/tests/plans/MIR-487.006.test index 4f60b92ff..767a5808b 100644 --- a/tests/plans/MIR-487.006.test +++ b/tests/plans/MIR-487.006.test @@ -1,4 +1,4 @@ -# mars +# input stream=wave,param=2dfd,direction=1,frequency=1 # mir --packing=ieee --grid=1/1 diff --git a/tests/plans/MIR-497.001.test b/tests/plans/MIR-497.001.test index 391b1bd22..49d1576f4 100644 --- a/tests/plans/MIR-497.001.test +++ b/tests/plans/MIR-497.001.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --intgrid=source --grid=O80 diff --git a/tests/plans/MIR-497.002.test b/tests/plans/MIR-497.002.test index 7eb022c92..ba8c5125e 100644 --- a/tests/plans/MIR-497.002.test +++ b/tests/plans/MIR-497.002.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --intgrid=source --truncation=159 --grid=O80 diff --git a/tests/plans/MIR-497.003.test b/tests/plans/MIR-497.003.test index 8aefb9a7f..da5189385 100644 --- a/tests/plans/MIR-497.003.test +++ b/tests/plans/MIR-497.003.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --intgrid=source --truncation=auto --grid=O80 diff --git a/tests/plans/MIR-510.001.test b/tests/plans/MIR-510.001.test index 57147b37a..d2bdd5798 100644 --- a/tests/plans/MIR-510.001.test +++ b/tests/plans/MIR-510.001.test @@ -1,4 +1,4 @@ -# mars +# input gridType=reduced_gg,gridName=O32,shortName=msl.grib1 # mir --grid=O64 diff --git a/tests/plans/MIR-510.002.test b/tests/plans/MIR-510.002.test index b3436d19c..d67de1e68 100644 --- a/tests/plans/MIR-510.002.test +++ b/tests/plans/MIR-510.002.test @@ -1,4 +1,4 @@ -# mars +# input gridType=reduced_gg,gridName=O32,shortName=msl.grib1 # mir --grid=o64 diff --git a/tests/plans/MIR-512.001.test b/tests/plans/MIR-512.001.test index 278fafe63..60b9f2167 100644 --- a/tests/plans/MIR-512.001.test +++ b/tests/plans/MIR-512.001.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --accuracy=32 diff --git a/tests/plans/MIR-512.002.test b/tests/plans/MIR-512.002.test index 3e162b391..dbe85afb6 100644 --- a/tests/plans/MIR-512.002.test +++ b/tests/plans/MIR-512.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --accuracy=64 diff --git a/tests/plans/MIR-512.003.test b/tests/plans/MIR-512.003.test index eb98df3ba..08245b7a2 100644 --- a/tests/plans/MIR-512.003.test +++ b/tests/plans/MIR-512.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=16 diff --git a/tests/plans/MIR-512.004.test b/tests/plans/MIR-512.004.test index 053a4fe38..6fedc388e 100644 --- a/tests/plans/MIR-512.004.test +++ b/tests/plans/MIR-512.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=32 diff --git a/tests/plans/MIR-512.005.test b/tests/plans/MIR-512.005.test index 97191200f..134ec1c31 100644 --- a/tests/plans/MIR-512.005.test +++ b/tests/plans/MIR-512.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=32 --packing=ieee diff --git a/tests/plans/MIR-512.006.test b/tests/plans/MIR-512.006.test index 03dfb7ebb..5196be787 100644 --- a/tests/plans/MIR-512.006.test +++ b/tests/plans/MIR-512.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --accuracy=32 --packing=av diff --git a/tests/plans/MIR-512.007.test b/tests/plans/MIR-512.007.test index 91584d432..81e59d126 100644 --- a/tests/plans/MIR-512.007.test +++ b/tests/plans/MIR-512.007.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --accuracy=16 --packing=av diff --git a/tests/plans/MIR-513.packingType=grid_ccsds.001.test b/tests/plans/MIR-513.packingType=grid_ccsds.001.test index e838c7655..c2a51ee78 100644 --- a/tests/plans/MIR-513.packingType=grid_ccsds.001.test +++ b/tests/plans/MIR-513.packingType=grid_ccsds.001.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=simple diff --git a/tests/plans/MIR-513.packingType=grid_ccsds.002.test b/tests/plans/MIR-513.packingType=grid_ccsds.002.test index 481a4c08c..af8e0a0b9 100644 --- a/tests/plans/MIR-513.packingType=grid_ccsds.002.test +++ b/tests/plans/MIR-513.packingType=grid_ccsds.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=so diff --git a/tests/plans/MIR-513.packingType=grid_ccsds.003.test b/tests/plans/MIR-513.packingType=grid_ccsds.003.test index 6886d02d5..75df805c9 100644 --- a/tests/plans/MIR-513.packingType=grid_ccsds.003.test +++ b/tests/plans/MIR-513.packingType=grid_ccsds.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=ccsds diff --git a/tests/plans/MIR-513.packingType=grid_ccsds.004.test b/tests/plans/MIR-513.packingType=grid_ccsds.004.test index 75ffe5e87..6bc9c6a65 100644 --- a/tests/plans/MIR-513.packingType=grid_ccsds.004.test +++ b/tests/plans/MIR-513.packingType=grid_ccsds.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=ieee diff --git a/tests/plans/MIR-513.packingType=grid_ccsds.005.test b/tests/plans/MIR-513.packingType=grid_ccsds.005.test index 403f67a11..2013380cd 100644 --- a/tests/plans/MIR-513.packingType=grid_ccsds.005.test +++ b/tests/plans/MIR-513.packingType=grid_ccsds.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=ieee --accuracy=32 diff --git a/tests/plans/MIR-513.packingType=grid_ccsds.006.test b/tests/plans/MIR-513.packingType=grid_ccsds.006.test index 2b620a92a..33701a43c 100644 --- a/tests/plans/MIR-513.packingType=grid_ccsds.006.test +++ b/tests/plans/MIR-513.packingType=grid_ccsds.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ccsds.grib2 # mir --packing=av diff --git a/tests/plans/MIR-513.packingType=grid_ieee.001.test b/tests/plans/MIR-513.packingType=grid_ieee.001.test index 347c9c126..4ab32fbc6 100644 --- a/tests/plans/MIR-513.packingType=grid_ieee.001.test +++ b/tests/plans/MIR-513.packingType=grid_ieee.001.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=simple diff --git a/tests/plans/MIR-513.packingType=grid_ieee.002.test b/tests/plans/MIR-513.packingType=grid_ieee.002.test index dc3a31ea8..f404d9689 100644 --- a/tests/plans/MIR-513.packingType=grid_ieee.002.test +++ b/tests/plans/MIR-513.packingType=grid_ieee.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=so diff --git a/tests/plans/MIR-513.packingType=grid_ieee.003.test b/tests/plans/MIR-513.packingType=grid_ieee.003.test index f7c1aff8c..95ecaebea 100644 --- a/tests/plans/MIR-513.packingType=grid_ieee.003.test +++ b/tests/plans/MIR-513.packingType=grid_ieee.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=ccsds diff --git a/tests/plans/MIR-513.packingType=grid_ieee.004.test b/tests/plans/MIR-513.packingType=grid_ieee.004.test index c2f37e91d..99bfd8ad9 100644 --- a/tests/plans/MIR-513.packingType=grid_ieee.004.test +++ b/tests/plans/MIR-513.packingType=grid_ieee.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=ieee diff --git a/tests/plans/MIR-513.packingType=grid_ieee.005.test b/tests/plans/MIR-513.packingType=grid_ieee.005.test index bd38f4c18..bbb3053a3 100644 --- a/tests/plans/MIR-513.packingType=grid_ieee.005.test +++ b/tests/plans/MIR-513.packingType=grid_ieee.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=ieee --accuracy=64 diff --git a/tests/plans/MIR-513.packingType=grid_ieee.006.test b/tests/plans/MIR-513.packingType=grid_ieee.006.test index 1c8118092..f1badc4c6 100644 --- a/tests/plans/MIR-513.packingType=grid_ieee.006.test +++ b/tests/plans/MIR-513.packingType=grid_ieee.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_ieee.grib2 # mir --packing=av diff --git a/tests/plans/MIR-513.packingType=grid_second_order.001.test b/tests/plans/MIR-513.packingType=grid_second_order.001.test index 648db9f6f..51ae73f98 100644 --- a/tests/plans/MIR-513.packingType=grid_second_order.001.test +++ b/tests/plans/MIR-513.packingType=grid_second_order.001.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=simple diff --git a/tests/plans/MIR-513.packingType=grid_second_order.002.test b/tests/plans/MIR-513.packingType=grid_second_order.002.test index d457dbd2d..7a25bb7e9 100644 --- a/tests/plans/MIR-513.packingType=grid_second_order.002.test +++ b/tests/plans/MIR-513.packingType=grid_second_order.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=so diff --git a/tests/plans/MIR-513.packingType=grid_second_order.003.test b/tests/plans/MIR-513.packingType=grid_second_order.003.test index a22b6c773..707839bc9 100644 --- a/tests/plans/MIR-513.packingType=grid_second_order.003.test +++ b/tests/plans/MIR-513.packingType=grid_second_order.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=ccsds diff --git a/tests/plans/MIR-513.packingType=grid_second_order.004.test b/tests/plans/MIR-513.packingType=grid_second_order.004.test index 391849c42..94d06668f 100644 --- a/tests/plans/MIR-513.packingType=grid_second_order.004.test +++ b/tests/plans/MIR-513.packingType=grid_second_order.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=ieee diff --git a/tests/plans/MIR-513.packingType=grid_second_order.005.test b/tests/plans/MIR-513.packingType=grid_second_order.005.test index b8b682356..92fa20340 100644 --- a/tests/plans/MIR-513.packingType=grid_second_order.005.test +++ b/tests/plans/MIR-513.packingType=grid_second_order.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=ieee --accuracy=32 diff --git a/tests/plans/MIR-513.packingType=grid_second_order.006.test b/tests/plans/MIR-513.packingType=grid_second_order.006.test index e555e402a..cab87ec0d 100644 --- a/tests/plans/MIR-513.packingType=grid_second_order.006.test +++ b/tests/plans/MIR-513.packingType=grid_second_order.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_second_order.grib2 # mir --packing=av diff --git a/tests/plans/MIR-513.packingType=grid_simple.001.test b/tests/plans/MIR-513.packingType=grid_simple.001.test index c52f49659..2ffb753cc 100644 --- a/tests/plans/MIR-513.packingType=grid_simple.001.test +++ b/tests/plans/MIR-513.packingType=grid_simple.001.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=simple diff --git a/tests/plans/MIR-513.packingType=grid_simple.002.test b/tests/plans/MIR-513.packingType=grid_simple.002.test index 0960a8e22..8ec16982b 100644 --- a/tests/plans/MIR-513.packingType=grid_simple.002.test +++ b/tests/plans/MIR-513.packingType=grid_simple.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=so diff --git a/tests/plans/MIR-513.packingType=grid_simple.003.test b/tests/plans/MIR-513.packingType=grid_simple.003.test index e14cc2703..a3d1bf265 100644 --- a/tests/plans/MIR-513.packingType=grid_simple.003.test +++ b/tests/plans/MIR-513.packingType=grid_simple.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=ccsds diff --git a/tests/plans/MIR-513.packingType=grid_simple.004.test b/tests/plans/MIR-513.packingType=grid_simple.004.test index 299157206..adaf73ecd 100644 --- a/tests/plans/MIR-513.packingType=grid_simple.004.test +++ b/tests/plans/MIR-513.packingType=grid_simple.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=ieee diff --git a/tests/plans/MIR-513.packingType=grid_simple.005.test b/tests/plans/MIR-513.packingType=grid_simple.005.test index e29d97548..1a4ae2342 100644 --- a/tests/plans/MIR-513.packingType=grid_simple.005.test +++ b/tests/plans/MIR-513.packingType=grid_simple.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=ieee --accuracy=32 diff --git a/tests/plans/MIR-513.packingType=grid_simple.006.test b/tests/plans/MIR-513.packingType=grid_simple.006.test index f8aa7afbf..6271acf52 100644 --- a/tests/plans/MIR-513.packingType=grid_simple.006.test +++ b/tests/plans/MIR-513.packingType=grid_simple.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=grid_simple.grib2 # mir --packing=av diff --git a/tests/plans/MIR-513.packingType=grid_simple.007.test b/tests/plans/MIR-513.packingType=grid_simple.007.test index c5352b7f8..068cae302 100644 --- a/tests/plans/MIR-513.packingType=grid_simple.007.test +++ b/tests/plans/MIR-513.packingType=grid_simple.007.test @@ -1,7 +1,7 @@ -# mars -tiny.grib +# input +tiny-2x2.grib # mir --area=0/0/0/1 --packing=so -# grib_get assertions +# plan AreaCropper[bbox=BoundingBox[north=0,west=0,south=0,east=1]]|Save[packing=second-order,output=...] AreaCropper[bbox=BoundingBox[north=0,west=0,south=0,east=1]]|Save[packing=second-order,output=...] diff --git a/tests/plans/MIR-513.packingType=spectral_complex.002.test b/tests/plans/MIR-513.packingType=spectral_complex.002.test index 3ea0154b4..715b5bae7 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.002.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=so diff --git a/tests/plans/MIR-513.packingType=spectral_complex.003.test b/tests/plans/MIR-513.packingType=spectral_complex.003.test index 9f02e6c50..3b7991112 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.003.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=ccsds --grib-edition-conversion=true diff --git a/tests/plans/MIR-513.packingType=spectral_complex.004.test b/tests/plans/MIR-513.packingType=spectral_complex.004.test index 82ab8be9c..8cd4c02f6 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.004.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee diff --git a/tests/plans/MIR-513.packingType=spectral_complex.005.test b/tests/plans/MIR-513.packingType=spectral_complex.005.test index e6ab0308d..a99379265 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.005.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee --accuracy=32 diff --git a/tests/plans/MIR-513.packingType=spectral_complex.006.test b/tests/plans/MIR-513.packingType=spectral_complex.006.test index 8b60cbb18..679cbd71b 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.006.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --grid=1/1 --intgrid=none diff --git a/tests/plans/MIR-513.packingType=spectral_complex.009.test b/tests/plans/MIR-513.packingType=spectral_complex.009.test index 468325762..33a6f2c10 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.009.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.009.test @@ -1,6 +1,6 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --packing=simple -# grib_get assertions +# plan Set[packing=simple,output=...] diff --git a/tests/plans/MIR-513.packingType=spectral_complex.010.test b/tests/plans/MIR-513.packingType=spectral_complex.010.test index f914c6c44..f191add27 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.010.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.010.test @@ -1,6 +1,6 @@ -# mars +# input packingType=spectral_complex.grib1 # mir --truncation=21 --packing=simple -# grib_get assertions +# plan ShTruncate[truncation=21]|Save[packing=simple,output=...] diff --git a/tests/plans/MIR-513.packingType=spectral_complex.011.test b/tests/plans/MIR-513.packingType=spectral_complex.011.test index db506b55a..4a34014a1 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.011.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.011.test @@ -1,6 +1,6 @@ -# mars +# input packingType=spectral_complex.grib2 # mir --packing=simple -# grib_get assertions +# plan Set[packing=simple,output=...] diff --git a/tests/plans/MIR-513.packingType=spectral_complex.012.test b/tests/plans/MIR-513.packingType=spectral_complex.012.test index 1c39c33d8..6de4b48df 100644 --- a/tests/plans/MIR-513.packingType=spectral_complex.012.test +++ b/tests/plans/MIR-513.packingType=spectral_complex.012.test @@ -1,6 +1,6 @@ -# mars +# input packingType=spectral_complex.grib2 # mir --truncation=21 --packing=simple -# grib_get assertions +# plan ShTruncate[truncation=21]|Save[packing=simple,output=...] diff --git a/tests/plans/MIR-513.packingType=spectral_simple.001.test b/tests/plans/MIR-513.packingType=spectral_simple.001.test index 0be2d1ccc..b2ac173bf 100644 --- a/tests/plans/MIR-513.packingType=spectral_simple.001.test +++ b/tests/plans/MIR-513.packingType=spectral_simple.001.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=simple diff --git a/tests/plans/MIR-513.packingType=spectral_simple.002.test b/tests/plans/MIR-513.packingType=spectral_simple.002.test index 64340f176..59dcb5a15 100644 --- a/tests/plans/MIR-513.packingType=spectral_simple.002.test +++ b/tests/plans/MIR-513.packingType=spectral_simple.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=so diff --git a/tests/plans/MIR-513.packingType=spectral_simple.003.test b/tests/plans/MIR-513.packingType=spectral_simple.003.test index 6f6eb1767..c913b983a 100644 --- a/tests/plans/MIR-513.packingType=spectral_simple.003.test +++ b/tests/plans/MIR-513.packingType=spectral_simple.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=ccsds --grib-edition-conversion=true diff --git a/tests/plans/MIR-513.packingType=spectral_simple.004.test b/tests/plans/MIR-513.packingType=spectral_simple.004.test index d2f04cc3e..031b85343 100644 --- a/tests/plans/MIR-513.packingType=spectral_simple.004.test +++ b/tests/plans/MIR-513.packingType=spectral_simple.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee diff --git a/tests/plans/MIR-513.packingType=spectral_simple.005.test b/tests/plans/MIR-513.packingType=spectral_simple.005.test index 882d443ea..0e4e1c3a1 100644 --- a/tests/plans/MIR-513.packingType=spectral_simple.005.test +++ b/tests/plans/MIR-513.packingType=spectral_simple.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=ieee --accuracy=32 diff --git a/tests/plans/MIR-513.packingType=spectral_simple.006.test b/tests/plans/MIR-513.packingType=spectral_simple.006.test index d09b3f856..5f614a05e 100644 --- a/tests/plans/MIR-513.packingType=spectral_simple.006.test +++ b/tests/plans/MIR-513.packingType=spectral_simple.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none diff --git a/tests/plans/MIR-513.packingType=spectral_simple.007.test b/tests/plans/MIR-513.packingType=spectral_simple.007.test index ddd31e334..f2a85240d 100644 --- a/tests/plans/MIR-513.packingType=spectral_simple.007.test +++ b/tests/plans/MIR-513.packingType=spectral_simple.007.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_simple.grib1 # mir --grid=1/1 --intgrid=none --packing=av diff --git a/tests/plans/MIR-527.test b/tests/plans/MIR-527.test index 0ad785f67..1511d9d08 100644 --- a/tests/plans/MIR-527.test +++ b/tests/plans/MIR-527.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --cesaro --cesaro-k=2 --cesaro-truncation=10 diff --git a/tests/plans/MIR-544.test b/tests/plans/MIR-544.test index 4f407910b..0df458c33 100644 --- a/tests/plans/MIR-544.test +++ b/tests/plans/MIR-544.test @@ -1,6 +1,6 @@ -# Mars request +# input param=2t,levtype=sfc,grid=O16 -# Mir tool options +# mir --grid=2/2 --interpolation=k-nearest-neighbours --distance-weighting=pseudo-laplace --nearest-method=nclosest-or-nearest # plan Gridded2RegularLL[increments=Increments[west_east=2,south_north=2],bbox=BoundingBox[north=90,west=0,south=-90,east=358],interpolation=k-nearest-neighbours,method=KNearestNeighbours[nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0,nearestMethod=NClosestOrNearest[nclosest=4,distanceTolerance=1],distanceWeighting=PseudoLaplace[]]]|Save[output=...] diff --git a/tests/plans/MIR-553.001.test b/tests/plans/MIR-553.001.test index a93dfb6ca..1b555cd83 100644 --- a/tests/plans/MIR-553.001.test +++ b/tests/plans/MIR-553.001.test @@ -1,4 +1,4 @@ -# GRIB +# input MIR-553.grib2 # mir --area=66.6/-24.4/63.4/-13.6 diff --git a/tests/plans/MIR-553.002.test b/tests/plans/MIR-553.002.test index ef2b0efcb..1846003de 100644 --- a/tests/plans/MIR-553.002.test +++ b/tests/plans/MIR-553.002.test @@ -1,4 +1,4 @@ -# GRIB +# input MIR-553.grib2 # mir --area=germany diff --git a/tests/plans/MIR-555.test b/tests/plans/MIR-555.test index 8b4a845cd..1d75e1204 100644 --- a/tests/plans/MIR-555.test +++ b/tests/plans/MIR-555.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000 # mir --truncation=none --intgrid=none --grid=F640 --area=54/-16.5/50.5/-3 diff --git a/tests/plans/MIR-586.test b/tests/plans/MIR-586.test index 9f99862a4..d55d10de8 100644 --- a/tests/plans/MIR-586.test +++ b/tests/plans/MIR-586.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --area=11/-1/-1/11 --interpolation=none diff --git a/tests/plans/MIR-592.001.test b/tests/plans/MIR-592.001.test index cfb9f46b8..067a2bffb 100644 --- a/tests/plans/MIR-592.001.test +++ b/tests/plans/MIR-592.001.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=3/3 --interpolation=linear --vod2uv=false diff --git a/tests/plans/MIR-592.002.test b/tests/plans/MIR-592.002.test index d0878a158..e379a56ea 100644 --- a/tests/plans/MIR-592.002.test +++ b/tests/plans/MIR-592.002.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=3/3 --interpolation=linear --vod2uv diff --git a/tests/plans/MIR-592.003.test b/tests/plans/MIR-592.003.test index 85cb40b32..459e446ba 100644 --- a/tests/plans/MIR-592.003.test +++ b/tests/plans/MIR-592.003.test @@ -1,4 +1,4 @@ -# mars +# input param=u_v,level=1000,resol=20 # mir --grid=3/3 --interpolation=linear diff --git a/tests/plans/MIR-592.004.test b/tests/plans/MIR-592.004.test index 5aff6941b..c688fd6cf 100644 --- a/tests/plans/MIR-592.004.test +++ b/tests/plans/MIR-592.004.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=3/3 --interpolation=linear diff --git a/tests/plans/MIR-592.005.test b/tests/plans/MIR-592.005.test index 3d385a349..3efc85a63 100644 --- a/tests/plans/MIR-592.005.test +++ b/tests/plans/MIR-592.005.test @@ -1,4 +1,4 @@ -# mars +# input date=20200308,level=1000,grid=O80,param=u_v # mir --grid=3/3 --interpolation=linear diff --git a/tests/plans/MIR-595.001.core.test b/tests/plans/MIR-595.001.core.test index 8473e7101..e264df42d 100644 --- a/tests/plans/MIR-595.001.core.test +++ b/tests/plans/MIR-595.001.core.test @@ -1,6 +1,6 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=43/-1/-10/3 --interpolation=none -# grib_get assertions +# plan AreaCropper[bbox=BoundingBox[north=43,west=-1,south=-10,east=3]]|Save[output=...] diff --git a/tests/plans/MIR-595.002.core.test b/tests/plans/MIR-595.002.core.test index 07c3eec25..b019e2578 100644 --- a/tests/plans/MIR-595.002.core.test +++ b/tests/plans/MIR-595.002.core.test @@ -1,6 +1,6 @@ -# mars +# input ukmo-tigge.count=4.grib # mir --area=1/-1/-1/1 --interpolation=none -# grib_get assertions +# plan AreaCropper[bbox=BoundingBox[north=1,west=-1,south=-1,east=1]]|Save[output=...] diff --git a/tests/plans/MIR-597.test b/tests/plans/MIR-597.test index eba5a5728..b2c9d690c 100644 --- a/tests/plans/MIR-597.test +++ b/tests/plans/MIR-597.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --bandpass=1/5/2/6 diff --git a/tests/plans/MIR-632.001.test b/tests/plans/MIR-632.001.test index 38f034ed0..5635fcffe 100644 --- a/tests/plans/MIR-632.001.test +++ b/tests/plans/MIR-632.001.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=H2 diff --git a/tests/plans/MIR-632.002.test b/tests/plans/MIR-632.002.test index cd1b5d603..ddf822b27 100644 --- a/tests/plans/MIR-632.002.test +++ b/tests/plans/MIR-632.002.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=2/2 diff --git a/tests/plans/MIR-632.003.test b/tests/plans/MIR-632.003.test index 7c1c4d2a0..1ab68a4a9 100644 --- a/tests/plans/MIR-632.003.test +++ b/tests/plans/MIR-632.003.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=H32 diff --git a/tests/plans/MIR-632.004.test b/tests/plans/MIR-632.004.test index 96d67ef67..de333ed5c 100644 --- a/tests/plans/MIR-632.004.test +++ b/tests/plans/MIR-632.004.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --packing=ccsds diff --git a/tests/plans/MIR-632.005.test b/tests/plans/MIR-632.005.test index 40c12291d..f6a517c8f 100644 --- a/tests/plans/MIR-632.005.test +++ b/tests/plans/MIR-632.005.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --interpolation=grid-box-average --grid=H32 diff --git a/tests/plans/MIR-632.006.test.disabled b/tests/plans/MIR-632.006.test.disabled index 215ee3e65..918cbd288 100644 --- a/tests/plans/MIR-632.006.test.disabled +++ b/tests/plans/MIR-632.006.test.disabled @@ -1,4 +1,4 @@ -# mars +# input ORCA.grib2 # mir --grid=H2 diff --git a/tests/plans/MIR-632.007.test b/tests/plans/MIR-632.007.test index c831a2ec9..6e83d8f58 100644 --- a/tests/plans/MIR-632.007.test +++ b/tests/plans/MIR-632.007.test @@ -1,4 +1,4 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir --grid=H2 diff --git a/tests/plans/MIR-632.008.test b/tests/plans/MIR-632.008.test index 55edc5076..076bba888 100644 --- a/tests/plans/MIR-632.008.test +++ b/tests/plans/MIR-632.008.test @@ -1,4 +1,4 @@ -# mars +# input gridType=regular_gg,gridName=F8,shortName=q.grib2 # mir --grid=H2 diff --git a/tests/plans/MIR-632.009.test b/tests/plans/MIR-632.009.test index f1dff3a6a..51800cf59 100644 --- a/tests/plans/MIR-632.009.test +++ b/tests/plans/MIR-632.009.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=O8 diff --git a/tests/plans/MIR-632.010.test b/tests/plans/MIR-632.010.test index 038b1a4cb..9557ff252 100644 --- a/tests/plans/MIR-632.010.test +++ b/tests/plans/MIR-632.010.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir --grid=F8 diff --git a/tests/plans/MIR-632.011.test b/tests/plans/MIR-632.011.test index 03110ea40..595f5753d 100644 --- a/tests/plans/MIR-632.011.test +++ b/tests/plans/MIR-632.011.test @@ -1,6 +1,6 @@ -# mars +# input regular_ll.2-2.grib2 # mir --interpolation=grid-box-average --grid=H2 # plan -Gridded2NamedGrid[grid=H2,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] +Gridded2NamedGrid[grid=H2,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] diff --git a/tests/plans/MIR-632.012.test b/tests/plans/MIR-632.012.test index 9b9e0c2fa..f4239d83d 100644 --- a/tests/plans/MIR-632.012.test +++ b/tests/plans/MIR-632.012.test @@ -1,6 +1,6 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir --interpolation=grid-box-average --grid=H2 # plan -Gridded2NamedGrid[grid=H2,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] +Gridded2NamedGrid[grid=H2,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] diff --git a/tests/plans/MIR-632.013.test b/tests/plans/MIR-632.013.test index 19db890dc..d5cbaf946 100644 --- a/tests/plans/MIR-632.013.test +++ b/tests/plans/MIR-632.013.test @@ -1,6 +1,6 @@ -# mars +# input gridType=regular_gg,gridName=F8,shortName=q.grib2 # mir --interpolation=grid-box-average --grid=H2 # plan -Gridded2NamedGrid[grid=H2,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] +Gridded2NamedGrid[grid=H2,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] diff --git a/tests/plans/MIR-632.014.test b/tests/plans/MIR-632.014.test index 62984342b..86666613e 100644 --- a/tests/plans/MIR-632.014.test +++ b/tests/plans/MIR-632.014.test @@ -1,6 +1,6 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir ---interpolation=grid-box-average --grid=O8 +--interpolation=grid-box-average --grid=O8 # plan -Gridded2NamedGrid[grid=O8,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] +Gridded2NamedGrid[grid=O8,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] diff --git a/tests/plans/MIR-632.015.test b/tests/plans/MIR-632.015.test index c3b6b6110..d35151042 100644 --- a/tests/plans/MIR-632.015.test +++ b/tests/plans/MIR-632.015.test @@ -1,6 +1,6 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=ring.grib2 # mir ---interpolation=grid-box-average --grid=F8 +--interpolation=grid-box-average --grid=F8 # plan -Gridded2NamedGrid[grid=F8,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] +Gridded2NamedGrid[grid=F8,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] diff --git a/tests/plans/MIR-632.016.test b/tests/plans/MIR-632.016.test index 58847143f..5680cfb11 100644 --- a/tests/plans/MIR-632.016.test +++ b/tests/plans/MIR-632.016.test @@ -1,6 +1,6 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir --interpolation=grid-box-average --grid=H36 --accuracy=8 # plan -Gridded2NamedGrid[grid=H36,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[accuracy=8,output=...] +Gridded2NamedGrid[grid=H36,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[accuracy=8,output=...] diff --git a/tests/plans/MIR-632.017.test b/tests/plans/MIR-632.017.test index ed91fbbcb..1530111a6 100644 --- a/tests/plans/MIR-632.017.test +++ b/tests/plans/MIR-632.017.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1,levtype=ml,resol=20.grib2 # mir --grid=H36 --intgrid=none diff --git a/tests/plans/MIR-632.018.test b/tests/plans/MIR-632.018.test index 818fd02d5..8313fd3ef 100644 --- a/tests/plans/MIR-632.018.test +++ b/tests/plans/MIR-632.018.test @@ -1,6 +1,6 @@ -# mars +# input gridType=reduced_gg,gridName=O8,shortName=q.grib2 # mir ---grid=H36 --interpolation=grid-box-average --packing=ccsds +--grid=H36 --interpolation=grid-box-average --packing=ccsds # plan -Gridded2NamedGrid[grid=H36,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] +Gridded2NamedGrid[grid=H36,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] diff --git a/tests/plans/MIR-632.019.test b/tests/plans/MIR-632.019.test index b7b3c2707..19af435a8 100644 --- a/tests/plans/MIR-632.019.test +++ b/tests/plans/MIR-632.019.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=H36 --vod2uv diff --git a/tests/plans/MIR-632.020.test b/tests/plans/MIR-632.020.test index 2ff9534d8..95be9ec51 100644 --- a/tests/plans/MIR-632.020.test +++ b/tests/plans/MIR-632.020.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=H36 diff --git a/tests/plans/MIR-632.021.test b/tests/plans/MIR-632.021.test index 28703ae72..9c6c3e300 100644 --- a/tests/plans/MIR-632.021.test +++ b/tests/plans/MIR-632.021.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1000,resol=20 # mir --grid=H36 --intgrid=none --vod2uv diff --git a/tests/plans/MIR-632.022.test b/tests/plans/MIR-632.022.test index b2632161b..361bff4d3 100644 --- a/tests/plans/MIR-632.022.test +++ b/tests/plans/MIR-632.022.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --grid=H36 --intgrid=none diff --git a/tests/plans/MIR-632.023.test b/tests/plans/MIR-632.023.test index 106b96c06..b2c00d44f 100644 --- a/tests/plans/MIR-632.023.test +++ b/tests/plans/MIR-632.023.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1,levtype=ml,resol=20.grib2 # mir --grid=H36 --vod2uv diff --git a/tests/plans/MIR-632.024.test b/tests/plans/MIR-632.024.test index d5ff0ce0d..bf87ffed4 100644 --- a/tests/plans/MIR-632.024.test +++ b/tests/plans/MIR-632.024.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1,levtype=ml,resol=20.grib2 # mir --grid=H36 diff --git a/tests/plans/MIR-632.025.test b/tests/plans/MIR-632.025.test index 13cbbb531..04ba5e10b 100644 --- a/tests/plans/MIR-632.025.test +++ b/tests/plans/MIR-632.025.test @@ -1,4 +1,4 @@ -# mars +# input param=vo_d,level=1,levtype=ml,resol=20.grib2 # mir --grid=H36 --intgrid=none --vod2uv diff --git a/tests/plans/MIR-634.001.test b/tests/plans/MIR-634.001.test index 7be6870d1..05265f9b0 100644 --- a/tests/plans/MIR-634.001.test +++ b/tests/plans/MIR-634.001.test @@ -1,4 +1,4 @@ -# mars +# input param=t,level=1000,resol=20 # mir --truncation=none --intgrid=none --latitudes=1/2/3 --longitudes=4/5/6 diff --git a/tests/plans/MIR-634.002.test b/tests/plans/MIR-634.002.test index f482db71a..8e6eb185b 100644 --- a/tests/plans/MIR-634.002.test +++ b/tests/plans/MIR-634.002.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --truncation=none --intgrid=none --latitudes=1/2/3 --longitudes=4/5/6 diff --git a/tests/plans/MIR-643.001.test b/tests/plans/MIR-643.001.test index 63c29d036..97d1ff1b4 100644 --- a/tests/plans/MIR-643.001.test +++ b/tests/plans/MIR-643.001.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=nested.grib2 # mir --grid=1/1 --interpolation=nn diff --git a/tests/plans/MIR-643.002.test b/tests/plans/MIR-643.002.test index 2d9e0ed78..e06a39a14 100644 --- a/tests/plans/MIR-643.002.test +++ b/tests/plans/MIR-643.002.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=nested.grib2 # mir --grid=h32 --interpolation=nn diff --git a/tests/plans/MIR-643.003.test b/tests/plans/MIR-643.003.test index 93c7fd855..3002a18fd 100644 --- a/tests/plans/MIR-643.003.test +++ b/tests/plans/MIR-643.003.test @@ -1,6 +1,6 @@ -# mars +# input gridType=healpix,Nside=32,orderingConvention=nested.grib2 # mir --grid=h16_nested --interpolation=grid-box-average # plan -Gridded2NamedGrid[grid=H16_nested,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] +Gridded2NamedGrid[grid=H16_nested,interpolation=grid-box-average,method=GridBoxMethod[name=grid-box-average,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0]]|Save[output=...] diff --git a/tests/plans/MIR-643.004.test b/tests/plans/MIR-643.004.test index 55dceb40a..a90c04692 100644 --- a/tests/plans/MIR-643.004.test +++ b/tests/plans/MIR-643.004.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=h16 --interpolation=nn diff --git a/tests/plans/MIR-643.005.test b/tests/plans/MIR-643.005.test index c7c77c5fe..2a143d921 100644 --- a/tests/plans/MIR-643.005.test +++ b/tests/plans/MIR-643.005.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=h16_nested --interpolation=nn diff --git a/tests/plans/MIR-647.001.test b/tests/plans/MIR-647.001.test index 41ab6ddcb..ac622ba5b 100644 --- a/tests/plans/MIR-647.001.test +++ b/tests/plans/MIR-647.001.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=2,orderingConvention=nested.grib2 # mir --grid=H2 --interpolation=linear diff --git a/tests/plans/MIR-647.002.test b/tests/plans/MIR-647.002.test index 02696c7b2..217633e7a 100644 --- a/tests/plans/MIR-647.002.test +++ b/tests/plans/MIR-647.002.test @@ -1,4 +1,4 @@ -# mars +# input gridType=healpix,Nside=2,orderingConvention=ring.grib2 # mir --grid=H2 --interpolation=linear diff --git a/tests/plans/MIR-651.packingType=spectral_ieee.001.test b/tests/plans/MIR-651.packingType=spectral_ieee.001.test index dff5a30a8..bd81df48d 100644 --- a/tests/plans/MIR-651.packingType=spectral_ieee.001.test +++ b/tests/plans/MIR-651.packingType=spectral_ieee.001.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=simple diff --git a/tests/plans/MIR-651.packingType=spectral_ieee.002.test b/tests/plans/MIR-651.packingType=spectral_ieee.002.test index e42375239..24e2db0fd 100644 --- a/tests/plans/MIR-651.packingType=spectral_ieee.002.test +++ b/tests/plans/MIR-651.packingType=spectral_ieee.002.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=so diff --git a/tests/plans/MIR-651.packingType=spectral_ieee.003.test b/tests/plans/MIR-651.packingType=spectral_ieee.003.test index 2b80e6728..29349361a 100644 --- a/tests/plans/MIR-651.packingType=spectral_ieee.003.test +++ b/tests/plans/MIR-651.packingType=spectral_ieee.003.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=ccsds --grib-edition-conversion=true diff --git a/tests/plans/MIR-651.packingType=spectral_ieee.004.test b/tests/plans/MIR-651.packingType=spectral_ieee.004.test index 6b1b1b94f..eba05bcb1 100644 --- a/tests/plans/MIR-651.packingType=spectral_ieee.004.test +++ b/tests/plans/MIR-651.packingType=spectral_ieee.004.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=ieee diff --git a/tests/plans/MIR-651.packingType=spectral_ieee.005.test b/tests/plans/MIR-651.packingType=spectral_ieee.005.test index 176a3de3b..22215829f 100644 --- a/tests/plans/MIR-651.packingType=spectral_ieee.005.test +++ b/tests/plans/MIR-651.packingType=spectral_ieee.005.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=ieee --accuracy=32 diff --git a/tests/plans/MIR-651.packingType=spectral_ieee.006.test b/tests/plans/MIR-651.packingType=spectral_ieee.006.test index 4995324a8..fd4032893 100644 --- a/tests/plans/MIR-651.packingType=spectral_ieee.006.test +++ b/tests/plans/MIR-651.packingType=spectral_ieee.006.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none diff --git a/tests/plans/MIR-651.packingType=spectral_ieee.007.test b/tests/plans/MIR-651.packingType=spectral_ieee.007.test index 136844612..a3d2e8953 100644 --- a/tests/plans/MIR-651.packingType=spectral_ieee.007.test +++ b/tests/plans/MIR-651.packingType=spectral_ieee.007.test @@ -1,4 +1,4 @@ -# mars +# input packingType=spectral_ieee.grib2 # mir --grid=1/1 --intgrid=none --packing=av diff --git a/tests/plans/different-interpolation-methods.0000.test b/tests/plans/different-interpolation-methods.0000.test index 4c9bd5e77..25910a357 100644 --- a/tests/plans/different-interpolation-methods.0000.test +++ b/tests/plans/different-interpolation-methods.0000.test @@ -1,4 +1,4 @@ -# mars +# input different-interpolation-methods.grib1 # mir --grid=3/3 --area=3/0/0/3 diff --git a/tests/plans/different-interpolation-methods.0001.test b/tests/plans/different-interpolation-methods.0001.test index 923756580..17d685744 100644 --- a/tests/plans/different-interpolation-methods.0001.test +++ b/tests/plans/different-interpolation-methods.0001.test @@ -1,4 +1,4 @@ -# mars +# input different-interpolation-methods.grib1 # mir --grid=3/3 --area=3/0/0/3 --dont-compress-plan diff --git a/tests/plans/different-interpolation-methods.0002.test b/tests/plans/different-interpolation-methods.0002.test index d1d92a9c0..287a6a436 100644 --- a/tests/plans/different-interpolation-methods.0002.test +++ b/tests/plans/different-interpolation-methods.0002.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=nearest-lsm diff --git a/tests/plans/different-interpolation-methods.0003.test b/tests/plans/different-interpolation-methods.0003.test index 2d2790192..599811227 100644 --- a/tests/plans/different-interpolation-methods.0003.test +++ b/tests/plans/different-interpolation-methods.0003.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=nearest-lsm --distance-weighting-with-lsm=nearest-lsm-with-lowest-index diff --git a/tests/plans/different-interpolation-methods.0004.test b/tests/plans/different-interpolation-methods.0004.test index 76a760a27..1886cb847 100644 --- a/tests/plans/different-interpolation-methods.0004.test +++ b/tests/plans/different-interpolation-methods.0004.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=nearest-lsm --distance-weighting-with-lsm=nearest-lsm diff --git a/tests/plans/different-interpolation-methods.0005.test b/tests/plans/different-interpolation-methods.0005.test index fc92e393e..cdf9ed910 100644 --- a/tests/plans/different-interpolation-methods.0005.test +++ b/tests/plans/different-interpolation-methods.0005.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=k-nearest diff --git a/tests/plans/different-interpolation-methods.0006.test b/tests/plans/different-interpolation-methods.0006.test index 196b9e507..d95f6a2c2 100644 --- a/tests/plans/different-interpolation-methods.0006.test +++ b/tests/plans/different-interpolation-methods.0006.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=k-nearest --distance-weighting=gaussian diff --git a/tests/plans/different-interpolation-methods.0007.test b/tests/plans/different-interpolation-methods.0007.test index f4245dd3c..85a62b6da 100644 --- a/tests/plans/different-interpolation-methods.0007.test +++ b/tests/plans/different-interpolation-methods.0007.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=k-nearest --distance-weighting=gaussian --distance-weighting-gaussian-stddev=2 diff --git a/tests/plans/different-interpolation-methods.0008.test b/tests/plans/different-interpolation-methods.0008.test index af84595fe..be36f13f2 100644 --- a/tests/plans/different-interpolation-methods.0008.test +++ b/tests/plans/different-interpolation-methods.0008.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=k-nearest --distance-weighting=shepard diff --git a/tests/plans/different-interpolation-methods.0009.test b/tests/plans/different-interpolation-methods.0009.test index f56ede320..5ab82e477 100644 --- a/tests/plans/different-interpolation-methods.0009.test +++ b/tests/plans/different-interpolation-methods.0009.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=3/3 --dont-compress-plan --interpolation=k-nearest --distance-weighting=shepard --distance-weighting-shepard-power=3 diff --git a/tests/plans/griddef-from-gridded.test b/tests/plans/griddef-from-gridded.test index 97fd6b529..dff7d29be 100644 --- a/tests/plans/griddef-from-gridded.test +++ b/tests/plans/griddef-from-gridded.test @@ -1,6 +1,6 @@ -# Mars request +# input param=2t,levtype=sfc -# Mir tool options +# mir --griddef=$tests_plans_dir/weather-params.pts # plan Gridded2GridDef[griddef=.../weather-params.pts]|Save[output=...] diff --git a/tests/plans/griddef-from-spectral.test b/tests/plans/griddef-from-spectral.test index 52bb6cdab..05e1dba60 100644 --- a/tests/plans/griddef-from-spectral.test +++ b/tests/plans/griddef-from-spectral.test @@ -1,6 +1,6 @@ -# Mars request +# input param=t,level=1000 -# Mir tool options +# mir --griddef=$tests_plans_dir/weather-params.pts -# plan (at the moment, intermediate Gaussian N grid is hardcoded) +# plan ShTruncate[truncation=127]|ShToNamedGrid[type=local,cropping=none,options=[4886829aa871a5c38f41fff09ed0970e],invtrans=,grid=F64]|Gridded2GridDef[griddef=.../weather-params.pts]|Save[output=...] diff --git a/tests/plans/no-interpolation-O1280-to-gridname=O1280.test b/tests/plans/no-interpolation-O1280-to-gridname=O1280.test index 562c2760a..5177a25ff 100644 --- a/tests/plans/no-interpolation-O1280-to-gridname=O1280.test +++ b/tests/plans/no-interpolation-O1280-to-gridname=O1280.test @@ -1,4 +1,4 @@ -# mars (this is an O1280 grid) +# input param=2t,levtype=sfc # mir --grid=O1280 diff --git a/tests/plans/no-interpolation-O1280-to-octahedral=1280.test b/tests/plans/no-interpolation-O1280-to-octahedral=1280.test index 8f670a07a..3f81ca9be 100644 --- a/tests/plans/no-interpolation-O1280-to-octahedral=1280.test +++ b/tests/plans/no-interpolation-O1280-to-octahedral=1280.test @@ -1,4 +1,4 @@ -# mars (this is an O1280 grid) +# input param=2t,levtype=sfc # mir --octahedral=1280 diff --git a/tests/plans/no-interpolation-O16-to-pl.test b/tests/plans/no-interpolation-O16-to-pl.test index aed0add4c..ecc5fd008 100644 --- a/tests/plans/no-interpolation-O16-to-pl.test +++ b/tests/plans/no-interpolation-O16-to-pl.test @@ -1,4 +1,4 @@ -# mars (this is an O16 grid) +# input param=2t,levtype=sfc,grid=O16 # mir --pl=20/24/28/32/36/40/44/48/52/56/60/64/68/72/76/80/80/76/72/68/64/60/56/52/48/44/40/36/32/28/24/20 diff --git a/tests/plans/no-interpolation-mars_client_tests_retrieve_issame.test b/tests/plans/no-interpolation-mars_client_tests_retrieve_issame.test index 562c2760a..5177a25ff 100644 --- a/tests/plans/no-interpolation-mars_client_tests_retrieve_issame.test +++ b/tests/plans/no-interpolation-mars_client_tests_retrieve_issame.test @@ -1,4 +1,4 @@ -# mars (this is an O1280 grid) +# input param=2t,levtype=sfc # mir --grid=O1280 diff --git a/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib1.test b/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib1.test index 75ada8e98..279d0e4c6 100644 --- a/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib1.test +++ b/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib1.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib1 # mir --grid=2/2 diff --git a/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib2.test b/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib2.test index db77d8dbf..097491086 100644 --- a/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib2.test +++ b/tests/plans/no-interpolation-regular_ll-to-regular_ll.grib2.test @@ -1,4 +1,4 @@ -# mars +# input regular_ll.2-2.grib2 # mir --grid=2/2 diff --git a/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.1.test b/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.1.test index 7fa391e07..05f66527e 100644 --- a/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.1.test +++ b/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.1.test @@ -1,4 +1,4 @@ -# mars +# input rotated_ll.3-3.grib1 # mir --grid=3/3 --rotation=30/30 diff --git a/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.2.test b/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.2.test index 20ad4190a..c393a5ecc 100644 --- a/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.2.test +++ b/tests/plans/no-interpolation-rotated_ll-to-rotated_ll.2.test @@ -1,4 +1,4 @@ -# mars +# input rotated_ll.3-3.grib1 # mir --grid=3/3 diff --git a/tests/plans/tiny-2x2.grib b/tests/plans/tiny-2x2.grib new file mode 120000 index 000000000..cbbaac929 --- /dev/null +++ b/tests/plans/tiny-2x2.grib @@ -0,0 +1 @@ +../data/tiny-2x2.grib \ No newline at end of file diff --git a/tests/plans/tiny.grib b/tests/plans/tiny.grib deleted file mode 120000 index 6e9bb617f..000000000 --- a/tests/plans/tiny.grib +++ /dev/null @@ -1 +0,0 @@ -../data/tiny.grib \ No newline at end of file diff --git a/tests/tool/MIR-475.test b/tests/tool/MIR-475.test index 020e7fdb5..a0763fbf0 100644 --- a/tests/tool/MIR-475.test +++ b/tests/tool/MIR-475.test @@ -1,6 +1,6 @@ -# data +# input date=20200308,level=1000,grid=O80,param=u_v # mir --only=132 -# assertions +# grib_get paramId=132 diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index df9d805df..892b6ca23 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -59,4 +59,4 @@ if(ENABLE_BUILD_TOOLS) set_tests_properties(mir_tests_unit_grib_fail_decode_${_t} PROPERTIES WILL_FAIL TRUE) endforeach() endif() - + diff --git a/tests/unit/bounding_box.cc b/tests/unit/bounding_box.cc index d3ed08c8e..b26e5539c 100644 --- a/tests/unit/bounding_box.cc +++ b/tests/unit/bounding_box.cc @@ -314,7 +314,8 @@ CASE("Representation::extendBoundingBox") { for (const auto& bbox : _bbox) { BoundingBox extended = repres->extendBoundingBox(bbox); - log << name << "\t > " << *repres << " + extendBoundingBox(" << "\n\t " << bbox << ")" + log << name << "\t > " << *repres << " + extendBoundingBox(" + << "\n\t " << bbox << ")" << "\n\t = " << extended << std::endl; EXPECT(extended.contains(bbox)); diff --git a/tests/unit/increments.cc b/tests/unit/increments.cc index 7086eae66..efada351c 100644 --- a/tests/unit/increments.cc +++ b/tests/unit/increments.cc @@ -189,10 +189,11 @@ CASE("Increments::correctBoundingBox") { repres::latlon::LatLon::correctBoundingBox(corrected, ni, nj, inc, reference); static size_t c = 1; - log << "Test " << c++ << ":" << "\n\t " << inc << "\n\t + " << box << "\n\t > " << corrected - << " corrected with reference " << reference << "\n\t > ni = " << ni << "\n\t > nj = " << nj - << "\n\t = shifted in latitude? " << inc.isLatitudeShifted(corrected) - << "\n\t = shifted in longitude? " << inc.isLongitudeShifted(corrected) << std::endl; + log << "Test " << c++ << ":" + << "\n\t " << inc << "\n\t + " << box << "\n\t > " << corrected << " corrected with reference " + << reference << "\n\t > ni = " << ni << "\n\t > nj = " << nj << "\n\t = shifted in latitude? " + << inc.isLatitudeShifted(corrected) << "\n\t = shifted in longitude? " + << inc.isLongitudeShifted(corrected) << std::endl; EXPECT(box.contains(corrected)); EXPECT(ni >= 1); @@ -245,7 +246,8 @@ CASE("Increments::correctBoundingBox") { repres::latlon::LatLon::correctBoundingBox(corrected, ni, nj, inc, reference); static size_t c = 1; - log << "Test " << c++ << ":" << "\n\t " << inc << "\n\t + " << equator << "\n\t > " << corrected + log << "Test " << c++ << ":" + << "\n\t " << inc << "\n\t + " << equator << "\n\t > " << corrected << " corrected with reference " << reference << "\n\t > ni = " << ni << "\n\t > nj = " << nj << "\n\t = shifted in latitude? " << inc.isLatitudeShifted(corrected) << "\n\t = shifted in longitude? " << inc.isLongitudeShifted(corrected) << std::endl; @@ -385,7 +387,8 @@ struct UserAndGlobalisedCase { repres::RepresentationHandle maybe = new RegularLL(increments_, maybe_box, ref); const auto& maybe_ll = dynamic_cast(*maybe); - log << "globaliseBoundingBox should maybe result in (CONFIRM FIRST!):" << "\n\t" << maybe_box + log << "globaliseBoundingBox should maybe result in (CONFIRM FIRST!):" + << "\n\t" << maybe_box << "\n\t" "Ni=" << maybe_ll.Ni() @@ -628,7 +631,8 @@ CASE("MIR-309") { const BoundingBox& corrected = rep->boundingBox(); static size_t c = 1; - log << "Test " << c++ << ":" << "\n\t " << t.bbox << "\n\t > " << corrected << "\n\t = " << t.corrected + log << "Test " << c++ << ":" + << "\n\t " << t.bbox << "\n\t > " << corrected << "\n\t = " << t.corrected << "\n\t = shifted in latitude? " << t.increments.isLatitudeShifted(corrected) << (t.allowLatitudeShift ? "" : " (should be false)") << "\n\t = shifted in longitude? " << t.increments.isLongitudeShifted(corrected) << (t.allowLongitudeShift ? "" : " (should be false)") diff --git a/tests/unit/wind.cc b/tests/unit/wind.cc index 511f6d6c5..705df5796 100644 --- a/tests/unit/wind.cc +++ b/tests/unit/wind.cc @@ -76,10 +76,11 @@ CASE("MIR-324") { Wind::paramIds(input, u, v); static size_t c = 1; - log << "Test " << c++ << ":" << "\n\t input paramId = " << input.paramId() << "\n\t + paramId.u " + log << "Test " << c++ << ":" + << "\n\t input paramId = " << input.paramId() << "\n\t + paramId.u " << (user_u != 0 ? "(set)" : "(not set)") << " = " << user_u << "\n\t + paramId.v " - << (user_v != 0 ? "(set)" : "(not set)") << " = " << user_v << "\n\t = " << "\n\t u = " << u - << "\n\t v = " << v << std::endl; + << (user_v != 0 ? "(set)" : "(not set)") << " = " << user_v << "\n\t = " + << "\n\t u = " << u << "\n\t v = " << v << std::endl; EXPECTV(u == (user_u != 0 ? user_u : PARAMID_U + table * 1000)); EXPECTV(v == (user_v != 0 ? user_v : PARAMID_V + table * 1000));