eckit::geo::Grid generalise use of grids by name/uid

Author: pmaciel

src/eckit/geo/Grid.cc

@@ -264,13 +264,21 @@ void Grid::fill_spec(spec::Custom& custom) const {
 }
 
 
+ShareEckitGeoGridInit::ShareEckitGeoGridInit() {
+    // ensure load of supporting files
+    share::Grid::instance();
+}
+
+
 const Grid* GridFactory::make_from_string(const std::string& str) {
     std::unique_ptr<Spec> spec(spec::Custom::make_from_value(YAMLParser::decodeString(str)));
     return instance().make_from_spec_(*spec);
 }
 
 
 GridFactory& GridFactory::instance() {
+    share::Grid::instance();
+
     static GridFactory INSTANCE;
     return INSTANCE;
 }
@@ -282,7 +290,7 @@ const Grid* GridFactory::make_from_spec_(const Spec& spec) const {
     std::unique_ptr<Spec> cfg(make_spec_(spec));
 
     if (std::string type; cfg->get("type", type)) {
-        return GridFactoryType::instance().get(type).create(*cfg);
+        return Factory<Grid>::instance().get(type).create(*cfg);
     }
 
     list(Log::error() << "Grid: cannot build grid without 'type', choices are: ");
@@ -292,7 +300,6 @@ const Grid* GridFactory::make_from_spec_(const Spec& spec) const {
 
 Spec* GridFactory::make_spec_(const Spec& spec) const {
     lock_type lock;
-    share::Grid::instance();
 
     auto* cfg = new spec::Layered(spec);
     ASSERT(cfg != nullptr);
@@ -344,11 +351,10 @@ bool Grid::NextIterator::next(Point& point) {
 
 std::ostream& GridFactory::list_(std::ostream& out) const {
     lock_type lock;
-    share::Grid::instance();
 
     out << GridSpecByUID::instance() << std::endl;
     out << GridSpecByName::instance() << std::endl;
-    out << GridFactoryType::instance() << std::endl;
+    out << Factory<Grid>::instance() << std::endl;
 
     return out;
 }

src/eckit/geo/Grid.h

@@ -203,9 +203,15 @@ class Grid {
 };
 
 
-using GridFactoryType = Factory<Grid>;
-using GridSpecByName  = spec::GeneratorT<spec::SpecGeneratorT1<const std::string&>>;
-using GridSpecByUID   = spec::GeneratorT<spec::SpecGeneratorT0>;
+struct ShareEckitGeoGridInit {
+private:
+
+    ShareEckitGeoGridInit();
+};
+
+
+struct GridSpecByName : spec::GeneratorT<spec::SpecGeneratorT1<const std::string&>>, private ShareEckitGeoGridInit {};
+struct GridSpecByUID : spec::GeneratorT<spec::SpecGeneratorT0>, private ShareEckitGeoGridInit {};
 
 
 template <typename T>