Skip to content

Commit

Permalink
Merge pull request #68 from fmahebert/feature/normalise_lats_across_p…
Browse files Browse the repository at this point in the history 
…oles

Enable convertSphericalToCartesian to handle latitudes across poles
  • Loading branch information
@tlmquintino @pmaciel
tlmquintino authored and pmaciel committed Jun 5, 2023
2 parents 525555b + ee49447 commit 2160a04
Showing 1 changed file with 80 additions and 63 deletions.
143 changes: 80 additions & 63 deletions tests/geometry/test_sphere.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <cmath>
#include <limits>

#include "eckit/geometry/Point2.h"
#include "eckit/geometry/Point3.h"
#include "eckit/geometry/PointLonLat.h"
#include "eckit/geometry/SphereT.h"
#include "eckit/geometry/UnitSphere.h"
#include "eckit/testing/Test.h"
Expand All @@ -21,6 +21,19 @@ namespace eckit::test {

using namespace geometry;

struct PointLonLat : Point2 {
PointLonLat(double x, double y) :
Point2(x, y) {}
const double& lon() const { return x_[0]; }
const double& lat() const { return x_[1]; }
};

struct PointXYZ : Point3 {
const double& x() const { return x_[0]; }
const double& y() const { return x_[1]; }
const double& z() const { return x_[2]; }
};

// set sphere
struct DatumTwoUnits {
static double radius() { return 2.; }
Expand All @@ -43,20 +56,22 @@ CASE("test unit sphere radius") {

CASE("test unit sphere north pole") {
const PointLonLat ll1(0., 90.);
auto p = UnitSphere::convertSphericalToCartesian(ll1);
PointXYZ p;
UnitSphere::convertSphericalToCartesian(ll1, p);

EXPECT(p.X == 0);
EXPECT(p.Y == 0);
EXPECT(p.Z == R);
EXPECT(p.x() == 0);
EXPECT(p.y() == 0);
EXPECT(p.z() == R);
}

CASE("test unit sphere south pole") {
const PointLonLat ll1(0., -90.);
auto p = UnitSphere::convertSphericalToCartesian(ll1);
PointXYZ p;
UnitSphere::convertSphericalToCartesian(ll1, p);

EXPECT(p.X == 0);
EXPECT(p.Y == 0);
EXPECT(p.Z == -R);
EXPECT(p.x() == 0);
EXPECT(p.y() == 0);
EXPECT(p.z() == -R);
}

// -----------------------------------------------------------------------------
Expand All @@ -65,55 +80,57 @@ CASE("test unit sphere south pole") {
CASE("test unit sphere lon 0") {
const PointLonLat ll1(0., 0.);
const PointLonLat ll2(-360., 0.);
auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

EXPECT(p.X == R);
EXPECT(p.Y == 0);
EXPECT(p.Z == 0);
EXPECT(p.x() == R);
EXPECT(p.y() == 0);
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}

CASE("test unit sphere lon 90") {
const PointLonLat ll1(90., 0.);
const PointLonLat ll2(-270., 0.);
auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

EXPECT(p.X == 0);
EXPECT(p.Y == R);
EXPECT(p.Z == 0);
EXPECT(p.x() == 0);
EXPECT(p.y() == R);
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}

CASE("test unit sphere lon 180") {
const PointLonLat ll1(180., 0.);
const PointLonLat ll2(-180., 0.);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);

EXPECT(p.X == -R);
EXPECT(p.Y == 0);
EXPECT(p.Z == 0);
EXPECT(p.x() == -R);
EXPECT(p.y() == 0);
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}

CASE("test unit sphere lon 270") {
const PointLonLat ll1(270., 0.);
const PointLonLat ll2(-90., 0.);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);

EXPECT(p.X == 0);
EXPECT(p.Y == -R);
EXPECT(p.Z == 0);
EXPECT(p.x() == 0);
EXPECT(p.y() == -R);
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}


Expand All @@ -125,57 +142,57 @@ const double L = R * std::sqrt(2) / 2.;
CASE("test unit sphere lon 45") {
const PointLonLat ll1(45., 0.);
const PointLonLat ll2(-315., 0.);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);

EXPECT(eckit::types::is_approximately_equal(p.X, L));
EXPECT(eckit::types::is_approximately_equal(p.Y, L));
EXPECT(p.Z == 0);
EXPECT(eckit::types::is_approximately_equal(p.x(), L));
EXPECT(eckit::types::is_approximately_equal(p.y(), L));
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}

CASE("test unit sphere lon 135") {
const PointLonLat ll1(135., 0.);
const PointLonLat ll2(-225., 0.);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);

EXPECT(eckit::types::is_approximately_equal(p.X, -L));
EXPECT(eckit::types::is_approximately_equal(p.Y, L));
EXPECT(p.Z == 0);
EXPECT(eckit::types::is_approximately_equal(p.x(), -L));
EXPECT(eckit::types::is_approximately_equal(p.y(), L));
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}

CASE("test unit sphere lon 225") {
const PointLonLat ll1(225., 0.);
const PointLonLat ll2(-135., 0.);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);

EXPECT(eckit::types::is_approximately_equal(p.X, -L));
EXPECT(eckit::types::is_approximately_equal(p.Y, -L));
EXPECT(p.Z == 0);
EXPECT(eckit::types::is_approximately_equal(p.x(), -L));
EXPECT(eckit::types::is_approximately_equal(p.y(), -L));
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}

CASE("test unit sphere lon 315") {
const PointLonLat ll1(315., 0.);
const PointLonLat ll2(-45., 0.);
PointXYZ p, q;
UnitSphere::convertSphericalToCartesian(ll1, p);
UnitSphere::convertSphericalToCartesian(ll2, q);

auto p = UnitSphere::convertSphericalToCartesian(ll1);
auto q = UnitSphere::convertSphericalToCartesian(ll2);

EXPECT(eckit::types::is_approximately_equal(p.X, L));
EXPECT(eckit::types::is_approximately_equal(p.Y, -L));
EXPECT(p.Z == 0);
EXPECT(eckit::types::is_approximately_equal(p.x(), L));
EXPECT(eckit::types::is_approximately_equal(p.y(), -L));
EXPECT(p.z() == 0);

EXPECT(points_equal(p, q));
EXPECT(PointXYZ::equal(p, q));
}

// -----------------------------------------------------------------------------
Expand Down

0 comments on commit 2160a04

Please sign in to comment.