Merge pull request #67 from andrsd/virt-private

More private methods/data

.github/workflows/qa.yml

@@ -47,6 +47,7 @@ jobs:
         id: linter
         with:
           style: file
+          tidy-checks: ''
           version: 14
           lines-changed-only: true
           ignore: 'cmake|contrib|docs|python'

.gitignore

@@ -1,36 +1,3 @@
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
 # cmake
 build-*
 cmake-build-*
@@ -40,8 +7,9 @@ __pycache__
 python/src/pyfprops.egg-info
 python/src/fprops.egg-info
 
-# CLion
+# Editors/IDEs
 .idea
+.zed
 
 # docs
 docs/pyplots/*.png

include/fprops/Air.h

@@ -20,18 +20,16 @@ class Air : public Helmholtz {
 public:
     Air();
 
-protected:
+private:
     [[nodiscard]] double alpha(double delta, double tau) const override;
     [[nodiscard]] double dalpha_ddelta(double delta, double tau) const override;
     [[nodiscard]] double dalpha_dtau(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddelta2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_dtau2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddeltatau(double delta, double tau) const override;
-
     [[nodiscard]] double mu_from_rho_T(double rho, double T) const override;
     [[nodiscard]] double k_from_rho_T(double rho, double T) const override;
 
-private:
     IdealGasLead<double> lead;
     IdealGasPower<double> power_0;
     IdealGasLogTau<double> log_tau;

include/fprops/CarbonDioxide.h

@@ -23,18 +23,16 @@ class CarbonDioxide : public Helmholtz {
 public:
     CarbonDioxide();
 
-protected:
+private:
     [[nodiscard]] double alpha(double delta, double tau) const override;
     [[nodiscard]] double dalpha_ddelta(double delta, double tau) const override;
     [[nodiscard]] double dalpha_dtau(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddelta2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_dtau2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddeltatau(double delta, double tau) const override;
-
     [[nodiscard]] double mu_from_rho_T(double rho, double T) const override;
     [[nodiscard]] double k_from_rho_T(double rho, double T) const override;
 
-private:
     IdealGasLead<double> lead;
     IdealGasLogTau<double> log_tau;
     IdealGasPlanckEinstein<double> pe;

include/fprops/Helium.h

@@ -22,18 +22,16 @@ class Helium : public Helmholtz {
 public:
     Helium();
 
-protected:
+private:
     [[nodiscard]] double alpha(double delta, double tau) const override;
     [[nodiscard]] double dalpha_ddelta(double delta, double tau) const override;
     [[nodiscard]] double dalpha_dtau(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddelta2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_dtau2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddeltatau(double delta, double tau) const override;
-
     [[nodiscard]] double mu_from_rho_T(double rho, double T) const override;
     [[nodiscard]] double k_from_rho_T(double rho, double T) const override;
 
-private:
     IdealGasLead<double> lead;
     IdealGasLogTau<double> log_tau;
     IdealEnthalpyEntropyOffset<double> offset;

include/fprops/Helmholtz.h

@@ -29,7 +29,7 @@ class Helmholtz : public SinglePhaseFluidProperties {
     [[nodiscard]] State v_u(double v, double u) const override;
     [[nodiscard]] State h_s(double h, double s) const override;
 
-protected:
+private:
     /// Helmholtz free energy
     ///
     /// @param delta Scaled density \f$[-]\f$
@@ -116,6 +116,7 @@ class Helmholtz : public SinglePhaseFluidProperties {
     /// Critical temperature \f$[K]\f$
     const double T_c;
 
+protected:
     /// The leading term in the EOS used to set the desired reference state
     ///
     /// @tparam T The basic data type
@@ -993,6 +994,11 @@ class Helmholtz : public SinglePhaseFluidProperties {
         std::vector<T> D;
     };
 
+protected:
+    double delta(double rho) const;
+    double tau(double T) const;
+
+private:
     double temperature(double u, double tau, double da_dt) const;
     double pressure(double rho, double T, double delta, double da_dd) const;
     double internal_energy(double T, double tau, double da_dt) const;

include/fprops/Nitrogen.h

@@ -20,18 +20,16 @@ class Nitrogen : public Helmholtz {
 public:
     Nitrogen();
 
-protected:
+private:
     [[nodiscard]] double alpha(double delta, double tau) const override;
     [[nodiscard]] double dalpha_ddelta(double delta, double tau) const override;
     [[nodiscard]] double dalpha_dtau(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddelta2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_dtau2(double delta, double tau) const override;
     [[nodiscard]] double d2alpha_ddeltatau(double delta, double tau) const override;
-
     [[nodiscard]] double mu_from_rho_T(double rho, double T) const override;
     [[nodiscard]] double k_from_rho_T(double rho, double T) const override;
 
-private:
     IdealGasLead<double> lead;
     IdealGasLogTau<double> log_tau;
     IdealGasPower<double> power_0;

src/Air.cpp

@@ -145,24 +145,24 @@ Air::d2alpha_ddeltatau(double delta, double tau) const
 double
 Air::mu_from_rho_T(double rho, double T) const
 {
-    const double delta = rho / this->rho_c;
-    const double tau = this->T_c / T;
+    auto d = delta(rho);
+    auto t = tau(T);
 
-    double eta = this->eta_0.value(T) + this->eta_r.value(delta, tau);
+    double eta = this->eta_0.value(T) + this->eta_r.value(d, t);
     // [Pa-s]
     return eta * 1.0e-6;
 }
 
 double
 Air::k_from_rho_T(double rho, double T) const
 {
-    const double delta = rho / this->rho_c;
-    const double tau = this->T_c / T;
+    const double d = delta(rho);
+    const double t = tau(T);
 
     double eta0 = this->eta_0.value(T);
     double lambda = 0;
-    lambda += this->lambda_0.value(eta0, tau);
-    lambda += this->lambda_r.value(delta, tau);
+    lambda += this->lambda_0.value(eta0, t);
+    lambda += this->lambda_r.value(d, t);
     // [W/(m-K)]
     return lambda * 1.0e-3;
 }

src/CarbonDioxide.cpp

@@ -173,21 +173,21 @@ CarbonDioxide::d2alpha_ddeltatau(double delta, double tau) const
 double
 CarbonDioxide::mu_from_rho_T(double rho, double T) const
 {
-    const double delta = rho / this->rho_c;
-    const double tau = this->T_c / T;
+    const double d = delta(rho);
+    const double t = tau(T);
 
-    double eta = this->eta_0.value(T) + this->eta_r.value(delta, tau);
+    double eta = this->eta_0.value(T) + this->eta_r.value(d, t);
     // [Pa-s]
     return eta * 1.0e-6;
 }
 
 double
 CarbonDioxide::k_from_rho_T(double rho, double T) const
 {
-    const double delta = rho / this->rho_c;
-    const double tau = this->T_c / T;
+    const double d = delta(rho);
+    const double t = tau(T);
 
-    double lambda = this->lambda_r.value(delta, tau);
+    double lambda = this->lambda_r.value(d, t);
     // [W/(m-K)]
     return lambda * 1.0e-3;
 }

src/Helmholtz.cpp

@@ -213,6 +213,18 @@ Helmholtz::tau_from_v_u(double v, double u) const
     return newton::root(1e-1, f, df);
 }
 
+double
+Helmholtz::delta(double rho) const
+{
+    return rho / this->rho_c;
+}
+
+double
+Helmholtz::tau(double T) const
+{
+    return this->T_c / T;
+}
+
 double
 Helmholtz::temperature(double u, double tau, double da_dt) const
 {

src/Nitrogen.cpp

@@ -143,24 +143,24 @@ Nitrogen::d2alpha_ddeltatau(double delta, double tau) const
 double
 Nitrogen::mu_from_rho_T(double rho, double T) const
 {
-    const double delta = rho / this->rho_c;
-    const double tau = this->T_c / T;
+    const double d = delta(rho);
+    const double t = tau(T);
 
-    double eta = this->eta_0.value(T) + this->eta_r.value(delta, tau);
+    double eta = this->eta_0.value(T) + this->eta_r.value(d, t);
     // [Pa-s]
     return eta * 1.0e-6;
 }
 
 double
 Nitrogen::k_from_rho_T(double rho, double T) const
 {
-    const double delta = rho / this->rho_c;
-    const double tau = this->T_c / T;
+    const double d = delta(rho);
+    const double t = tau(T);
 
     double eta0 = this->eta_0.value(T);
     double lambda = 0;
-    lambda += this->lambda_0.value(eta0, tau);
-    lambda += this->lambda_r.value(delta, tau);
+    lambda += this->lambda_0.value(eta0, t);
+    lambda += this->lambda_r.value(d, t);
     // [W/(m-K)]
     return lambda * 1.0e-3;
 }