Use appropriate type aliases more thoroughly

NOAA-OWP · Nov 26, 2024 · 61be140 · 61be140
1 parent 6f7fc16
commit 61be140
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/include/forcing/NetCDFMeshPointsDataProvider.hpp b/include/forcing/NetCDFMeshPointsDataProvider.hpp
@@ -72,9 +72,9 @@ namespace data_access
          * @return The value of the forcing property for the described time period, with units converted if needed.
          * @throws std::out_of_range If data for the time period is not available.
          */
-        double get_value(const selection_type& selector, ReSampleMethod m) override;
+        data_type get_value(const selection_type& selector, ReSampleMethod m) override;
 
-        void get_values(const selection_type& selector, boost::span<double> data) override;
+        void get_values(const selection_type& selector, boost::span<data_type> data) override;
 
         // And an implementation of the usual version using it
         std::vector<data_type> get_values(const selection_type& selector, data_access::ReSampleMethod) override

diff --git a/include/realizations/coastal/CoastalFormulation.hpp b/include/realizations/coastal/CoastalFormulation.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
-#include <forcing/DataProvider.hpp>
-#include <forcing/MeshPointsSelectors.hpp>
+#include <forcing/GenericDataProvider.hpp>
 
 #include <string>
 #include <boost/core/span.hpp>
 
-class CoastalFormulation : public data_access::DataProvider<double, MeshPointsSelector>
+class CoastalFormulation : public data_access::MeshPointsDataProvider
 {
 public:
     CoastalFormulation(std::string id)

diff --git a/include/realizations/coastal/SchismFormulation.hpp b/include/realizations/coastal/SchismFormulation.hpp
@@ -13,15 +13,16 @@
 class SchismFormulation final : public CoastalFormulation
 {
 public:
-    using MeshPointsDataProvider = data_access::DataProvider<double, MeshPointsSelector>;
+    using ProviderType = data_access::MeshPointsDataProvider;
+
     SchismFormulation(
                       std::string const& id
                       , std::string const& library_path
                       , std::string const& init_config_path
                       , MPI_Comm mpi_comm
-                      , std::shared_ptr<MeshPointsDataProvider> met_forcings
-                      , std::shared_ptr<MeshPointsDataProvider> offshore_boundary
-                      , std::shared_ptr<MeshPointsDataProvider> inflow_boundary
+                      , std::shared_ptr<ProviderType> met_forcings
+                      , std::shared_ptr<ProviderType> offshore_boundary
+                      , std::shared_ptr<ProviderType> inflow_boundary
                       );
 
     ~SchismFormulation();
@@ -41,7 +42,7 @@ class SchismFormulation final : public CoastalFormulation
     void finalize() override;
     void update() override;
 
-    void get_values(const selection_type& selector, boost::span<double> data) override;
+    void get_values(const selection_type& selector, boost::span<data_type> data) override;
 
 protected:
     size_t mesh_size(std::string const& variable_name) override;
@@ -71,7 +72,6 @@ class SchismFormulation final : public CoastalFormulation
     // area-averaged RAINRATE over elements, but we're going to make
     // do with point values at the element centroids
 
-    using ProviderType = data_access::DataProvider<double, MeshPointsSelector>;
     std::shared_ptr<ProviderType> meteorological_forcings_provider_;
     std::shared_ptr<ProviderType> offshore_boundary_provider_;
     std::shared_ptr<ProviderType> inflows_boundary_provider_;

diff --git a/src/forcing/NetCDFMeshPointsDataProvider.cpp b/src/forcing/NetCDFMeshPointsDataProvider.cpp
@@ -135,7 +135,7 @@ size_t NetCDFMeshPointsDataProvider::get_ts_index_for_time(const time_t &epoch_t
     }
 }
 
-void NetCDFMeshPointsDataProvider::get_values(const selection_type& selector, boost::span<double> data)
+void NetCDFMeshPointsDataProvider::get_values(const selection_type& selector, boost::span<data_type> data)
 {
     if (!boost::get<AllPoints>(&selector.points)) throw std::runtime_error("Not implemented - only all_points");
 
@@ -148,7 +148,7 @@ void NetCDFMeshPointsDataProvider::get_values(const selection_type& selector, bo
 
     metadata.ncVar.getVar({time_index, 0}, {1, data.size()}, data.data());
 
-    for (double& value : data) {
+    for (auto& value : data) {
         value = value * metadata.scale_factor + metadata.offset;
     }
 
@@ -165,7 +165,7 @@ void NetCDFMeshPointsDataProvider::get_values(const selection_type& selector, bo
     }
 }
 
-double NetCDFMeshPointsDataProvider::get_value(const selection_type& selector, ReSampleMethod m)
+NetCDFMeshPointsDataProvider::data_type NetCDFMeshPointsDataProvider::get_value(const selection_type& selector, ReSampleMethod m)
 {
     throw std::runtime_error("Not implemented - access chunks of the mesh");
 

diff --git a/src/realizations/coastal/SchismFormulation.cpp b/src/realizations/coastal/SchismFormulation.cpp
@@ -42,9 +42,9 @@ SchismFormulation::SchismFormulation(
                                      , std::string const& library_path
                                      , std::string const& init_config_path
                                      , MPI_Comm mpi_comm
-                                     , std::shared_ptr<MeshPointsDataProvider> met_forcings
-                                     , std::shared_ptr<MeshPointsDataProvider> offshore_boundary
-                                     , std::shared_ptr<MeshPointsDataProvider> inflow_boundary
+                                     , std::shared_ptr<ProviderType> met_forcings
+                                     , std::shared_ptr<ProviderType> offshore_boundary
+                                     , std::shared_ptr<ProviderType> inflow_boundary
                                      )
     : CoastalFormulation(id)
     , meteorological_forcings_provider_(met_forcings)