MIR-645 HEALPix support for earthkit-regrid

ecmwf · Feb 29, 2024 · 01a89b3 · 01a89b3
1 parent d7309c3
commit 01a89b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/mir/repres/proxy/HEALPix.cc b/src/mir/repres/proxy/HEALPix.cc
@@ -286,7 +286,7 @@ void HEALPix::json(eckit::JSON& j) const {
 
 
 void HEALPix::print(std::ostream& out) const {
-    out << "HEALPix[name=" << name() << "]";
+    out << "HEALPix[name=" << name() << ",ordering=" << orderingConvention_ << "]";
 }
 
 

diff --git a/src/mir/repres/unsupported/HEALPixNested.cc b/src/mir/repres/unsupported/HEALPixNested.cc
@@ -25,13 +25,8 @@
 namespace mir::repres::unsupported {
 
 
-std::string HEALPixNested::name() const {
-    return "H" + std::to_string(ring_.Nside()) + "_nested";
-}
-
-
 void HEALPixNested::makeName(std::ostream& out) const {
-    out << name();
+    out << "H" << std::to_string(ring_.Nside()) << "_nested";
 }
 
 
@@ -47,15 +42,15 @@ void HEALPixNested::fillGrib(grib_info& info) const {
 
 void HEALPixNested::json(eckit::JSON& j) const {
     j.startObject();
-    j << "grid" << name();
+    j << "grid" << ring_.uniqueName();
     j << "type" << "healpix";
     j << "ordering" << "nested";
     j.endObject();
 }
 
 
 void HEALPixNested::print(std::ostream& out) const {
-    out << "HEALPixNested[name=" << name() << "]";
+    out << "HEALPixNested[name=" << ring_.uniqueName() << "]";
 }
 
 

diff --git a/src/mir/repres/unsupported/HEALPixNested.h b/src/mir/repres/unsupported/HEALPixNested.h
@@ -63,7 +63,6 @@ class HEALPixNested final : public Gridded {
     // -- Methods
 
     inline const Representation& ring() const { return static_cast<const Representation&>(ring_); }
-    std::string name() const;
 
     // -- Overridden methods
-Original file line number
+Diff line change
@@ Expand Up / @@ -286,7 +286,7 @@ void HEALPix::json(eckit::JSON& j) const { @@
     void HEALPix::print(std::ostream& out) const {
-        out << "HEALPix[name=" << name() << "]";
+        out << "HEALPix[name=" << name() << ",ordering=" << orderingConvention_ << "]";
     }
@@ Expand Down @@