Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove earth shape hard coding for MEPS domains #14

Closed
wants to merge 2 commits into from
Closed

remove earth shape hard coding for MEPS domains #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2886c43
remove earth shape hard coding for MEPS domains
tackandr Sep 25, 2023
0a16f08
Merge branch 'master' into STU-22330
tackandr Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 4 additions & 35 deletions himan-plugins/source/grib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,40 +48,6 @@ double ApplyScaling(long val, long exp)
return dval * std::pow(10., static_cast<double>(exp));
}

earth_shape<double> DetermineEarthShapeForProducer(const producer& prod, const earth_shape<double>& defaultShape)
{
// The curated list below is confirmed to be correct and different from for
// example grib information. This ellipsoid information refers to the value
// used when coordinates are derived for the output data (not for example
// what earth shape is used by the physics core)
//
// Using producer-level granularity should be enough for now, because even if
// a producer has multiple different projections/geoms (like ecmwf), they are
// all using the same reference ellipsoid (as far as we know). Of course a case
// might arise where data is projected to different ellipsoids by some producer,
// but we can deal with that when it happens.

switch (prod.Id())
{
case 4: // MEPS
case 5: // MEPSCALIB
case 7: // MNWC
case 8: // MNWC_PREOP
case 10: // MEPS_PREOP
case 11: // CMEPS_PREOP
case 260: // MEPSMTA
case 261: // MEPS_PREOPMTA
case 262: // MEPSCALIBMTA
case 265: // CMEPS_PREOPMTA
case 270: // MNWCMTA
case 271: // MNWCMTA_DEV
case 272: // MNWC_PREOPMTA
return ELLIPS_WGS84;
default:
return defaultShape;
}
}

long DetermineProductDefinitionTemplateNumber(long agg, long proc, long ftype)
{
// Determine which code table to use to represent our data
Expand Down Expand Up @@ -705,6 +671,10 @@ void WriteAreaAndGrid(NFmiGribMessage& message, const shared_ptr<himan::grid>& g
{
message.SetLongKey("shapeOfTheEarth", 0);
}
else if (earth.A() == 6371229)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also check that A() == B() so we know it's a sphere.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually checked couple of lines above but not part of the diff.

{
message.SetLongKey("shapeOfTheEarth", 6);
}
else
{
message.SetLongKey("scaleFactorOfRadiusOfSphericalEarth", 0);
Expand Down Expand Up @@ -2081,7 +2051,6 @@ unique_ptr<himan::grid> ReadAreaAndGrid(const NFmiGribMessage& message, const pr
unique_ptr<grid> newGrid;

auto earth = ReadEarthShape(message);
earth = DetermineEarthShapeForProducer(prod, earth);

switch (message.NormalizedGridType())
{
Expand Down