Improve internal error handling, add unit tests for WiRoot and Airy

app/include/Structs.h

@@ -25,7 +25,7 @@ struct LFMFParams {
         double d__km;        /**<  Path distance, in km                       */
         double epsilon;      /**<  Relative permittivity                      */
         double sigma;        /**<  Conductivity, in siemens per meter         */
-        int pol;             /**<  Polarization, 0 = Horizontal, 1 = Vertical */
+        ITS::Propagation::LFMF::Polarization pol;  /**<  Polarization (enum)  */
 };
 
 /** Key names for LFMF Model input file parameters */

app/src/LFMFModel.cpp

@@ -31,7 +31,7 @@ const std::string LFMFInputKeys::pol = "pol";
  ******************************************************************************/
 ReturnCode CallLFMFModel(LFMFParams &lfmf_params, Result &result) {
     ReturnCode rtn;
-    rtn = LFMF(
+    rtn = LFMF_CPP(
         lfmf_params.h_tx__meter,
         lfmf_params.h_rx__meter,
         lfmf_params.f__mhz,
@@ -94,9 +94,13 @@ DrvrReturnCode
             if (rtn == DRVRERR__PARSE)
                 rtn = DRVRERR__PARSE_SIGMA;
         } else if (key.compare(LFMFInputKeys::pol) == 0) {
-            rtn = ParseInteger(value, lfmf_params.pol);
-            if (rtn == DRVRERR__PARSE)
+            int pol_int;
+            rtn = ParseInteger(value, pol_int);
+            if (rtn == DRVRERR__PARSE) {
                 rtn = DRVRERR__PARSE_POLARIZATION;
+            } else {
+                lfmf_params.pol = static_cast<Polarization>(pol_int);
+            }
         } else {
             std::cerr << "Unknown parameter: " << key << std::endl;
             rtn = DRVRERR__PARSE;
@@ -143,7 +147,7 @@ void WriteLFMFInputs(std::ofstream &fp, const LFMFParams &params) {
     fp PRINT LFMFInputKeys::d__km SETW13 params.d__km << "[km]";
     fp PRINT LFMFInputKeys::epsilon SETW13 params.epsilon;
     fp PRINT LFMFInputKeys::sigma SETW13 params.sigma;
-    fp PRINT LFMFInputKeys::pol SETW13 params.pol
+    fp PRINT LFMFInputKeys::pol SETW13 static_cast<int>(params.pol)
         << "[0 = Horizontal, 1 = Vertical]";
 }
 
@@ -161,6 +165,6 @@ void WriteLFMFOutputs(std::ofstream &fp, const Result &result) {
     fp PRINT "Received power" SETW13 std::fixed << std::setprecision(2)
                                                 << result.P_rx__dbm << "[dB]";
     fp PRINT "Solution method" SETW13 std::fixed
-        << std::setprecision(0) << result.method
+        << std::setprecision(0) << static_cast<int>(result.method)
         << "[0 = Flat earth with curve correction, 1 = Residue series]";
 }

include/LFMF.h

@@ -25,13 +25,13 @@ namespace LFMF {
 // Enums
 
 /** Valid RF polarizations for use of this model */
-enum Polarization {
+enum class Polarization {
     HORIZONTAL = 0, /**< Horizontal polarization */
     VERTICAL = 1,   /**< Vertical polarization */
 };
 
 /** Solution method used to generate model result */
-enum SolutionMethod {
+enum class SolutionMethod {
     FLAT_EARTH_CURVE, /**< Flat earth curve method */
     RESIDUE_SERIES,   /**< Residue series method */
 };
@@ -49,10 +49,10 @@ enum SolutionMethod {
  * the same as Wait's @f$ w_2 @f$ and @f$ w_1 @f$.
  * @see ITS::Propagation::LFMF::Airy
  * @see ITS::Propagation::LFMF::WiRoot
- * @see ITS::Propagation::LFMF::AiryFunctionScaling
+ * @see ITS::Propagation::LFMF::AiryScaling
  ******************************************************************************/
 // clang-format off
-enum AiryFunctionKind {
+enum class AiryKind {
     AIRY = 1, /**< Airy function of the first kind, @f$ \mathrm{Ai}(x) @f$ */
     AIRYD,    /**< Derivative of `AIRY`, @f$ \mathrm{Ai}'(x) @f$ */
     BAIRY,    /**< Airy function of the second kind, @f$ \mathrm{Bi}(x) @f$ */
@@ -72,9 +72,9 @@ enum AiryFunctionKind {
  * 
  * @see ITS::Propagation::LFMF::Airy
  * @see ITS::Propagation::LFMF::WiRoot
- * @see ITS::Propagation::LFMF::AiryFunctionKind
+ * @see ITS::Propagation::LFMF::AiryKind
  ******************************************************************************/
-enum AiryFunctionScaling {
+enum class AiryScaling {
     HUFFORD, /**< Use Hufford scaling */
     WAIT,    /**< Use Wait scaling */
     NONE,    /**< No Scaling */
@@ -175,17 +175,15 @@ double ResidueSeries(
 );
 std::complex<double> wofz(const std::complex<double> z);
 std::complex<double> Airy(
-    const std::complex<double> Z,
-    const AiryFunctionKind kind,
-    const AiryFunctionScaling scaling
+    const std::complex<double> Z, const AiryKind kind, const AiryScaling scaling
 );
 std::complex<double> WiRoot(
     const int i,
     std::complex<double> &DWi,
     const std::complex<double> q,
     std::complex<double> &Wi,
-    const AiryFunctionKind kind,
-    const AiryFunctionScaling scaling
+    const AiryKind kind,
+    const AiryScaling scaling
 );
 ReturnCode ValidateInput(
     const double h_tx__meter,
@@ -197,7 +195,7 @@ ReturnCode ValidateInput(
     const double epsilon,
     const double sigma
 );
-ReturnCode ValidatePolarization(const int pol);
+ReturnCode ValidatePolarization(const Polarization pol);
 bool AlmostEqualRelative(
     const double A, const double B, const double maxRelDiff = DBL_EPSILON
 );