Change function signatures of CouplingDataUser::Read and ::Write. Modernize buffer to be a span instead of a pointer.

Author: vidulejs

CHT/HeatFlux.C

@@ -18,7 +18,7 @@ preciceAdapter::CHT::HeatFlux::HeatFlux(
     dataType_ = scalar;
 }
 
-std::size_t preciceAdapter::CHT::HeatFlux::write(double* buffer, bool meshConnectivity, const unsigned int dim)
+std::size_t preciceAdapter::CHT::HeatFlux::write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim)
 {
     int bufferIndex = 0;
 
@@ -71,7 +71,7 @@ std::size_t preciceAdapter::CHT::HeatFlux::write(double* buffer, bool meshConnec
     return bufferIndex;
 }
 
-void preciceAdapter::CHT::HeatFlux::read(double* buffer, const unsigned int dim)
+void preciceAdapter::CHT::HeatFlux::read(precice::span<double> buffer, const unsigned int dim)
 {
     int bufferIndex = 0;
 

CHT/HeatFlux.H

@@ -33,11 +33,11 @@ public:
 
     //- Compute heat flux values from the temperature field
     //  and write them into the buffer
-    std::size_t write(double* buffer, bool meshConnectivity, const unsigned int dim) final;
+    std::size_t write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim) final;
 
     //- Read heat flux values from the buffer and assign them to
     //  the gradient of the temperature field
-    void read(double* buffer, const unsigned int dim) final;
+    void read(precice::span<double> buffer, const unsigned int dim) final;
 
     bool isLocationTypeSupported(const bool meshConnectivity) const final;
 

CHT/HeatTransferCoefficient.C

@@ -20,7 +20,7 @@ preciceAdapter::CHT::HeatTransferCoefficient::HeatTransferCoefficient(
 }
 
 
-std::size_t preciceAdapter::CHT::HeatTransferCoefficient::write(double* buffer, bool meshConnectivity, const unsigned int dim)
+std::size_t preciceAdapter::CHT::HeatTransferCoefficient::write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim)
 {
     int bufferIndex = 0;
 
@@ -73,7 +73,7 @@ std::size_t preciceAdapter::CHT::HeatTransferCoefficient::write(double* buffer,
 }
 
 
-void preciceAdapter::CHT::HeatTransferCoefficient::read(double* buffer, const unsigned int dim)
+void preciceAdapter::CHT::HeatTransferCoefficient::read(precice::span<double> buffer, const unsigned int dim)
 {
     int bufferIndex = 0;
 

CHT/HeatTransferCoefficient.H

@@ -35,10 +35,10 @@ public:
         const std::string nameT);
 
     //- Write the heat transfer coefficient values into the buffer
-    std::size_t write(double* buffer, bool meshConnectivity, const unsigned int dim) final;
+    std::size_t write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim) final;
 
     //- Read the heat transfer coefficient values from the buffer
-    void read(double* buffer, const unsigned int dim) final;
+    void read(precice::span<double> buffer, const unsigned int dim) final;
 
     bool isLocationTypeSupported(const bool meshConnectivity) const final;
 

CHT/SinkTemperature.C

@@ -14,7 +14,7 @@ preciceAdapter::CHT::SinkTemperature::SinkTemperature(
     dataType_ = scalar;
 }
 
-std::size_t preciceAdapter::CHT::SinkTemperature::write(double* buffer, bool meshConnectivity, const unsigned int dim)
+std::size_t preciceAdapter::CHT::SinkTemperature::write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim)
 {
     int bufferIndex = 0;
 
@@ -66,7 +66,7 @@ std::size_t preciceAdapter::CHT::SinkTemperature::write(double* buffer, bool mes
     return bufferIndex;
 }
 
-void preciceAdapter::CHT::SinkTemperature::read(double* buffer, const unsigned int dim)
+void preciceAdapter::CHT::SinkTemperature::read(precice::span<double> buffer, const unsigned int dim)
 {
     int bufferIndex = 0;
 

CHT/SinkTemperature.H

@@ -26,10 +26,10 @@ public:
         const std::string nameT);
 
     //- Write the sink temperature values into the buffer
-    std::size_t write(double* buffer, bool meshConnectivity, const unsigned int dim) final;
+    std::size_t write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim) final;
 
     //- Read the sink temperature values from the buffer
-    void read(double* buffer, const unsigned int dim) final;
+    void read(precice::span<double> buffer, const unsigned int dim) final;
 
     bool isLocationTypeSupported(const bool meshConnectivity) const final;
 

CHT/Temperature.C

@@ -15,7 +15,7 @@ preciceAdapter::CHT::Temperature::Temperature(
     dataType_ = scalar;
 }
 
-std::size_t preciceAdapter::CHT::Temperature::write(double* buffer, bool meshConnectivity, const unsigned int dim)
+std::size_t preciceAdapter::CHT::Temperature::write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim)
 {
     int bufferIndex = 0;
 
@@ -82,7 +82,7 @@ std::size_t preciceAdapter::CHT::Temperature::write(double* buffer, bool meshCon
     return bufferIndex;
 }
 
-void preciceAdapter::CHT::Temperature::read(double* buffer, const unsigned int dim)
+void preciceAdapter::CHT::Temperature::read(precice::span<double> buffer, const unsigned int dim)
 {
     int bufferIndex = 0;
 

CHT/Temperature.H

@@ -27,10 +27,10 @@ public:
         const std::string nameT);
 
     //- Write the temperature values into the buffer
-    std::size_t write(double* buffer, bool meshConnectivity, const unsigned int dim) final;
+    std::size_t write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim) final;
 
     //- Read the temperature values from the buffer
-    void read(double* buffer, const unsigned int dim) final;
+    void read(precice::span<double> buffer, const unsigned int dim) final;
 
     bool isLocationTypeSupported(const bool meshConnectivity) const final;
 

CouplingDataUser.H

@@ -2,6 +2,7 @@
 #define COUPLINGDATAUSER_H
 
 #include "Utilities.H"
+#include <precice/precice.hpp>
 #include <vector>
 #include <string>
 
@@ -75,10 +76,10 @@ public:
 
     //- Write the coupling data to the buffer
     // Returns the number of entries that were filles in the buffer (nComp * vertices)
-    virtual std::size_t write(double* dataBuffer, bool meshConnectivity, const unsigned int dim) = 0;
+    virtual std::size_t write(precice::span<double> dataBuffer, bool meshConnectivity, const unsigned int dim) = 0;
 
     //- Read the coupling data from the buffer
-    virtual void read(double* dataBuffer, const unsigned int dim) = 0;
+    virtual void read(precice::span<double> dataBuffer, const unsigned int dim) = 0;
 
     //- Given the meshConnectivity, return if the underlying loactionType of the
     //- interface nodes is supported by the data set

FF/Alpha.C

@@ -12,7 +12,7 @@ preciceAdapter::FF::Alpha::Alpha(
     dataType_ = scalar;
 }
 
-std::size_t preciceAdapter::FF::Alpha::write(double* buffer, bool meshConnectivity, const unsigned int dim)
+std::size_t preciceAdapter::FF::Alpha::write(precice::span<double> buffer, bool meshConnectivity, const unsigned int dim)
 {
     int bufferIndex = 0;
 
@@ -57,7 +57,7 @@ std::size_t preciceAdapter::FF::Alpha::write(double* buffer, bool meshConnectivi
     return bufferIndex;
 }
 
-void preciceAdapter::FF::Alpha::read(double* buffer, const unsigned int dim)
+void preciceAdapter::FF::Alpha::read(precice::span<double> buffer, const unsigned int dim)
 {
     int bufferIndex = 0;