Format macros, they keep getting picked incrementally by clang format + Strip trailing whitespaces

```
find . -regextype posix-extended -regex '.*\.(cpp|hpp|c|h|cxx|hxx|py)$' | xargs -I@ sed -i 's/[ \t]*$//' "@"
```

Author: jmarrec

Web/scripts/CPWeb/SphinxTools.py

@@ -23,15 +23,15 @@
    :widths: 40, 60
    :delim: ;
    :file: {fluid:s}-info.csv
-   
+
 REFPROP Validation Data
 =======================
 
 .. note::
 
     This figure compares the results generated from CoolProp and those generated from REFPROP.  They are all results obtained in the form :math:`Y(T,\\rho)`, where :math:`Y` is the parameter of interest and which for all EOS is a direct evaluation of the EOS
-    
-    You can download the script that generated the following figure here: :download:`(link to script)<REFPROPplots/{fluid:s}.py>`, right-click the link and then save as... or the equivalent in your browser.  You can also download this figure :download:`as a PDF<REFPROPplots/{fluid:s}.pdf>`. 
+
+    You can download the script that generated the following figure here: :download:`(link to script)<REFPROPplots/{fluid:s}.py>`, right-click the link and then save as... or the equivalent in your browser.  You can also download this figure :download:`as a PDF<REFPROPplots/{fluid:s}.pdf>`.
 
 .. image:: REFPROPplots/{fluid:s}.png
 
@@ -44,7 +44,7 @@
 
 .. note::
 
-    You can download the script that generated the following figure here: :download:`(link to script)<Consistencyplots/{fluid:s}.py>`, right-click the link and then save as... or the equivalent in your browser.  You can also download this figure :download:`as a PDF<Consistencyplots/{fluid:s}.pdf>`. 
+    You can download the script that generated the following figure here: :download:`(link to script)<Consistencyplots/{fluid:s}.py>`, right-click the link and then save as... or the equivalent in your browser.  You can also download this figure :download:`as a PDF<Consistencyplots/{fluid:s}.pdf>`.
 
 .. image:: Consistencyplots/{fluid:s}.png
 
@@ -218,7 +218,7 @@ def write(self, path):
         ITG.write(path)
 
         del_old = CP.get_config_string(CP.LIST_STRING_DELIMITER)
-       
+
         CP.set_config_string(CP.LIST_STRING_DELIMITER, '|')
         try:
             aliases = ', '.join(['``' + a.strip() + '``' for a in CoolProp.CoolProp.get_fluid_param_string(self.fluid, 'aliases').strip().split('|') if a])

dev/Tickets/1820.py

@@ -5,7 +5,7 @@
 T = HAPropsSI('T','P',101325,'H',h,'R',1.0); print(T)
 T = HAPropsSI('T','H',h,'R',1.0,'P',101325); print(T)
 
-# Verification script 
+# Verification script
 import CoolProp.CoolProp as CP
 import numpy as np
 import itertools

dev/environmental_data_from_DTU/build_DTU_JSON.py

@@ -58,7 +58,7 @@
 HEPTANE	heptane	n-Heptane	540.13		*	*	*	-	-	-	2.58	0.5	0.5	0.592		-	-	-	-	-	-	-	-	-
 HEXANE	hexane	n-Hexane	507.82		*	3.1	*	-	-	-	2.57	0.5	0.4	0.495	4.94E-01	-	-	-	-	-	-	-	-	-
 HYDROGEN		Hydrogen	33.145	R-702	-	-	-	-	-	-	N/A	-	-	-	4.94E-01	-	-	-	-	-	-	-	-	-
-IBUTENE	2-methyl-1-propene/methylpropene/isobutene/isobutylene	Isobutene	418.09		*	*	*	-	-	-	N/A	0.6	0.6		6.27E-01	-	-	-	-	-	-	6.67E+04		
+IBUTENE	2-methyl-1-propene/methylpropene/isobutene/isobutylene	Isobutene	418.09		*	*	*	-	-	-	N/A	0.6	0.6		6.27E-01	-	-	-	-	-	-	6.67E+04
 IHEXANE	2-methylpentane (methylpentane)	Isohexane	497.7		*	*	*	-	-	-	N/A	-	-	-		-	-	-	-	-	-	-	-	-
 IPENTANE	2-methylbutane	Isopentane	460.35		*	*	*	-	-	-	1.8	0.3	0.3		4.05E-01	-	-	-	-	-	-	-	-	-
 ISOBUTAN	2-methylpropane	IsoButane	407.817		*	*	*	-	-	-	1.74	0.4	0.3		3.07E-01	-	-	-	-	-	-	-	-	-
@@ -246,7 +246,7 @@
 :'1','1','1','NA','2',
 :'1','NA','1','NA','2',
 :'NA','1','1','1','1',
-:'3','0','2','0','0',  
+:'3','0','2','0','0',
 :'1','1','NA','NA','NA','1',
 :'1','1','1','2','1','1',
 :'1','1','1','1'"""
@@ -269,7 +269,7 @@
 :'1','1','1','NA','1',
 :'0','NA','0','NA','0',
 :'NA','1','2','2','0',
-:'0','4','3','0','0',  
+:'0','4','3','0','0',
 :'1','1','NA','NA','NA','1',
 :'1','0','0','1','1','4',
 :'1','1','1','0' """
@@ -292,7 +292,7 @@
 :'0','0','0','NA','1',
 :'0','NA','1','NA','1',
 :'NA','0','0','0','0',
-:'0','1','0','0','3',  
+:'0','1','0','0','3',
 :'0','0','NA','NA','NA','0',
 :'0','0','0','0','0','1',
 :'0','0','0','2'"""

dev/incompressible_liquids/CPIncomp/WriterObjects.py

@@ -393,7 +393,7 @@ def default(self, obj):
                     # Let the base class default method raise the TypeError
                     return json.JSONEncoder.default(self, obj)
             dump = json.dumps(jobj, indent=2, sort_keys=True, cls=RoundingEncoder)
-        
+
 
         # print dump
         hashes = self.load_hashes()

dev/scripts/ECS_fitter.py

@@ -62,26 +62,26 @@ def arrayize(*args):
 
 def HFO():
     # Data from Zhao et al. dx.doi.org/10.1021/je5001457 | J. Chem. Eng. Data 2014, 59, 1366-1371
-    data_R1234yf = """293.15 1109.9 32.8 12.04 0.1442 6.82 
-    303.09 1073.5 43.6 12.53 0.1319 5.71 
-    313.20 1033.6 57.8 13.16 0.1223 4.60 
-    323.19 990.2 76.0 13.88 0.1126 3.55 
-    333.14 941.4 99.7 14.82 0.1016 2.55 
-    343.11 883.5 132.2 16.12 0.0899 1.64 
-    353.08 809.6 179.9 18.17 0.0820 0.81 
-    358.05 761.5 214.8 19.78 0.0770 0.46 
-    363.05 695.7 267.7 22.44 0.0700 0.15 
+    data_R1234yf = """293.15 1109.9 32.8 12.04 0.1442 6.82
+    303.09 1073.5 43.6 12.53 0.1319 5.71
+    313.20 1033.6 57.8 13.16 0.1223 4.60
+    323.19 990.2 76.0 13.88 0.1126 3.55
+    333.14 941.4 99.7 14.82 0.1016 2.55
+    343.11 883.5 132.2 16.12 0.0899 1.64
+    353.08 809.6 179.9 18.17 0.0820 0.81
+    358.05 761.5 214.8 19.78 0.0770 0.46
+    363.05 695.7 267.7 22.44 0.0700 0.15
     365.05 657.4 301.0 24.26 0.0624 0.05"""
 
     # Data from Zhao et al. dx.doi.org/10.1021/je5001457 | J. Chem. Eng. Data 2014, 59, 1366-1371
-    data_R1234zeE = """295.23 1172.5 24.1 12.11 0.1776 8.88 
-    303.19 1146.1 30.6 12.46 0.1607 7.91 
-    313.21 1111.1 40.8 12.93 0.1429 6.66 
-    323.19 1073.6 53.6 13.46 0.1319 5.48 
-    333.00 1033.3 69.8 14.06 0.1193 4.36 
-    343.05 986.7 91.3 14.82 0.1132 3.30 
-    353.00 924.0 119.7 15.80 0.1051 2.26 
-    363.12 866.8 160.4 17.28 0.0924 1.35 
+    data_R1234zeE = """295.23 1172.5 24.1 12.11 0.1776 8.88
+    303.19 1146.1 30.6 12.46 0.1607 7.91
+    313.21 1111.1 40.8 12.93 0.1429 6.66
+    323.19 1073.6 53.6 13.46 0.1319 5.48
+    333.00 1033.3 69.8 14.06 0.1193 4.36
+    343.05 986.7 91.3 14.82 0.1132 3.30
+    353.00 924.0 119.7 15.80 0.1051 2.26
+    363.12 866.8 160.4 17.28 0.0924 1.35
     373.14 776.9 225.2 19.89 0.0817 0.54"""
 
     for fluid, data, e_k, sigma_nm in zip(['R1234yf', 'R1234ze(E)'], [data_R1234yf, data_R1234zeE], [281.14, 292.11], [0.5328, 0.5017]):
@@ -126,14 +126,14 @@ def HFO():
 def pentanes():
     # from doi 10.1021/je0202174 | J. Chem. Eng. Data 2003, 48, 1418-1421
     # T (K), rhoL (kg/m^3), rhoV (kg/m^3), eta (mPa-s)
-    data_cyclopentane = """253.15 258.15 263.15 268.15 273.15 278.15 283.15 288.15 293.15 298.15 303.15 308.15 313.15 318.15 323.15 328.15 333.15 338.15 343.15 348.15 353.15 
+    data_cyclopentane = """253.15 258.15 263.15 268.15 273.15 278.15 283.15 288.15 293.15 298.15 303.15 308.15 313.15 318.15 323.15 328.15 333.15 338.15 343.15 348.15 353.15
     784.64 779.53 774.59 769.77 765.12 760.20 755.32 750.27 745.02 738.63 731.97 725.15 718.32 711.59 705.11 699.08 693.40 688.44 684.25 680.96 678.71
     0.0881 0.1127 0.1443 0.1848 0.2368 0.3036 0.3894 0.4999 0.6421 0.8255 1.062 1.368 1.764 2.279 2.950 3.827 4.980 6.509 8.554 11.33 15.20
     0.7268 0.6786 0.6347 0.5930 0.5567 0.5224 0.4922 0.4646 0.4382 0.4148 0.3923 0.3714 0.3521 0.3350 0.3190 0.3048 0.2912 0.2793 0.2690 0.2590 0.2502"""
 
     # from doi 10.1021/je0202174 | J. Chem. Eng. Data 2003, 48, 1418-1421
     # T (K), rhoL (kg/m^3), rhoV (kg/m^3), eta (mPa-s)
-    data_isopentane = """253.15 258.15 263.15 268.15 273.15 278.15 283.15 288.15 293.15 298.15 303.15 308.15 313.15 318.15 323.15 328.15 333.15 338.15 343.15 348.15 353.15 
+    data_isopentane = """253.15 258.15 263.15 268.15 273.15 278.15 283.15 288.15 293.15 298.15 303.15 308.15 313.15 318.15 323.15 328.15 333.15 338.15 343.15 348.15 353.15
     658.32 653.55 648.73 643.87 639.01 634.15 629.35 624.63 620.05 615.69 610.87 605.63 600.05 594.23 588.24 582.18 576.13 570.18 564.41 558.92 553.79
     0.4655 0.5889 0.7372 0.9137 1.122 1.366 1.650 1.979 2.356 2.788 3.278 3.833 4.459 5.162 5.949 6.827 7.803 8.886 10.09 11.41 12.87
     0.3893 0.3661 0.3439 0.3201 0.3023 0.2859 0.2703 0.2547 0.2399 0.2289 0.2144 0.2023 0.1910 0.1813 0.1724 0.1611 0.1543 0.1480 0.1411 0.1332 0.1287"""

dev/scripts/fit_shape_factor.py

@@ -161,35 +161,35 @@ def write_output(c, d, theta_MAE, phi_MAE):
     template = textwrap.dedent(
     """
     double {name:s}Class::viscosity_Trho(double T, double rho)
-    {{ 
+    {{
         /*
         Fitting of shape factor curves to R134a data. This method is employed because solving
         for the shape factors is computationally very expensive and not very nice
         convergence behavior is experienced.  Thus we can use the ECS method,
         but with about the execution time of a conventional viscosity correlation.
-        
-        This function code was automatically generated by the fit_shape_factor.py 
+
+        This function code was automatically generated by the fit_shape_factor.py
         script in the dev/ folder on {timestamp:s}
-        
+
         Mean absolute errors of shape factor prediction:
         theta = {theta_MAE:g} %
         phi = {phi_MAE:g} %
         */
-        
-        double e_k, sigma, tau, delta, A1, A2, A3, A4, theta, Tc, Tc0, T0, rho0; 
+
+        double e_k, sigma, tau, delta, A1, A2, A3, A4, theta, Tc, Tc0, T0, rho0;
         double DELTA, PSI_theta, psi, f, h, F_eta, M, M0, delta_omega, rho0bar;
         double B1, B2, B3, B4, PSI_phi, Zc, Zc0, rhoc0, rhoc, log_tau, phi, rhobar;
-        
+
         double c[] = {{{cdata:s}}};
         double d[] = {{{ddata:s}}};
-        
+
         tau = reduce.T/T;
         delta = rho/reduce.rho;
-        
+
         R134aClass R134a = R134aClass();
         R134a.post_load();
         delta_omega = params.accentricfactor-R134a.params.accentricfactor;
-        
+
         Zc = reduce.p/(reduce.rho*R()*reduce.T);
         Zc0 = R134a.reduce.p/(R134a.reduce.rho*R134a.R()*R134a.reduce.T);
         Tc = reduce.T;
@@ -198,21 +198,21 @@ def write_output(c, d, theta_MAE, phi_MAE):
         rhoc0 = R134a.reduce.rho;
         M = params.molemass;
         M0 = R134a.params.molemass;
-        
+
         rhobar = rho/M;
-        
+
         if (rho > {rhomin:g})
         {{
             DELTA = pow(delta-1,2)+pow(tau-1,2);
             log_tau = log(tau);
-            
+
             A1 = c[0]-c[1]*log_tau;
             A2 = c[2]-c[3]*log_tau;
             A3 = c[4]-c[5]*log_tau;
             A4 = c[6]-c[7]*pow(log_tau,2);
             PSI_theta = c[8]*delta*exp(-c[9]*pow(DELTA,2));
             theta = 1+(delta_omega)*(A1+A2*exp(-pow(delta,2))+A3*exp(-pow(delta,c[10]))+A4*exp(-pow(delta,c[11]))+PSI_theta);
-            
+
             B1 = d[0]-d[1]*log_tau;
             B2 = d[2]-d[3]*log_tau;
             B3 = d[4]-d[5]*log_tau;
@@ -229,13 +229,13 @@ def write_output(c, d, theta_MAE, phi_MAE):
         h = M/M0*rhoc0/rhoc*phi;
         rho0bar = rhobar*h;
         rho0 = M0*rho0bar;
-        
+
         psi = ECS_psi_viscosity(delta);
         f = T/T0;
         F_eta = sqrt(f)*pow(h,-2.0/3.0)*sqrt(M/M0);
         ECSParams(&e_k,&sigma);
         return viscosity_dilute(T,e_k,sigma) + R134a.viscosity_background(T0,rho0*psi)*F_eta;
-    }} 
+    }}
     """
     )
 

dev/scripts/inject_states.py

@@ -117,7 +117,7 @@ def inject_acentric(fluid, i, json_data):
 def inject_states(fluid):
     fluid_path = '../fluids/' + fluid + '.json'
 
-    # AS = 
+    # AS =
 
     # Open the fluid JSON file
     with open(fluid_path, 'r') as fp:
@@ -137,7 +137,7 @@ def inject_states(fluid):
         fp.write(json.dumps(json_data, **json_options))
 
 if __name__ == '__main__':
-    
-    
+
+
     for fld in ['MD2M','MD3M','MD4M','R1243zf','R1234ze(Z)','Neon','HydrogenChloride','HeavyWater']:
       inject_states(fld)

dev/scripts/set_reference_state.py

@@ -20,7 +20,7 @@ def get_offset_NBP(name):
     import json
     a1, a2 = get_offset_NBP(name)
     print(json.dumps({
-      "a1": a1, 
-      "a2": a2, 
+      "a1": a1,
+      "a2": a2,
       "type": "IdealGasHelmholtzLead"
     }, indent=2))

include/Ancillaries.h

@@ -58,25 +58,25 @@ class SurfaceTensionCorrelation
     }
 };
 /**
- * 
- * This is generalized class that can be used to manage an ancillary curve, 
+ *
+ * This is generalized class that can be used to manage an ancillary curve,
  * here they are ancillary curves for saturation pressure, density, enthalpy, entropy.
- * 
+ *
  * The form of the ancillary equation can take one of a number of forms:
- * 
+ *
  * a) So-called "exponential" form (type = TYPE_EXPONENTIAL) that has a form like
- * 
- * \f[ y = y_c\exp\left(\frac{T_c}{T}\sum(n_i \theta^{t_i})\right) \f] 
- * or 
+ *
+ * \f[ y = y_c\exp\left(\frac{T_c}{T}\sum(n_i \theta^{t_i})\right) \f]
+ * or
  * \f[ y = y_c\exp\left(\sum(n_i \theta^{t_i})\right) \f]
- * 
+ *
  * b) A non-exponential form (type = TYPE_NOT_EXPONENTIAL) that has a form of
  *
  * \f[ y = y_c\left(1+\sum_i(n_i\theta^t_i)\right) \f]
  * with
  * \f[ \theta = \left(1-\frac{T}{T_c}\right) \f]
  * which is conveniently equal to zero at the critical point
- * 
+ *
  * c) Rational polynomial form (type = TYPE_RATIONAL_POLYNOMIAL) that has a form of
  * \f[ y = \frac{\sum_iA_iT^i}{\sum_iB_iT^i}\f]
  * where i is an integer, and the coefficients are in increasing order in both numerator and denominator
@@ -190,7 +190,7 @@ struct MeltingLinePiecewisePolynomialInTrData
     std::vector<MeltingLinePiecewisePolynomialInTrSegment> parts;
 };
 
-/** 
+/**
  \brief The evaluator class for a melting curve formed of segments in the form
 
  \f[
@@ -242,7 +242,7 @@ class MeltingLineVariables
 
     MeltingLineVariables() : Tmin(_HUGE), Tmax(_HUGE), pmin(_HUGE), pmax(_HUGE), T_m(_HUGE), type(MELTING_LINE_NOT_SET){};
 
-    /** 
+    /**
      * \brief Evaluate the melting line
      * @param OF The output variable
      * @param GIVEN The given variable

include/CPnumerics.h

@@ -212,7 +212,7 @@ std::vector<T> logspace(T xmin, T xmax, std::size_t n) {
 
 /**
  * @brief Use bisection to find the inputs that bisect the value you want, the trick
- * here is that this function is allowed to have "holes" where parts of the the array are 
+ * here is that this function is allowed to have "holes" where parts of the the array are
  * also filled with invalid numbers for which ValidNumber(x) is false
  * @param vec The vector to be bisected
  * @param val The value to be found
@@ -291,7 +291,7 @@ void bisect_vector(const std::vector<T>& vec, T val, std::size_t& i) {
 
 /**
  * @brief Use bisection to find the inputs that bisect the value you want, the trick
- * here is that this function is allowed to have "holes" where parts of the the array are 
+ * here is that this function is allowed to have "holes" where parts of the the array are
  * also filled with invalid numbers for which ValidNumber(x) is false
  * @param matrix The vector to be bisected
  * @param j The index of the matric in the off-grain dimension
@@ -553,9 +553,9 @@ T is_in_closed_range(T x1, T x2, T x) {
 };
 
 /** \brief Solve a cubic with coefficients in decreasing order
-    * 
+    *
     * 0 = ax^3 + b*x^2 + c*x + d
-    * 
+    *
     * @param a The x^3 coefficient
     * @param b The x^2 coefficient
     * @param c The x^1 coefficient
@@ -649,10 +649,10 @@ void sort3(T& a, T& b, T& c) {
 * Due to the periodicity of angles, you need to handle the case where the
 * angles wrap around - suppose theta_d is 6.28 and you are at an angles of 0.1 rad,
 * the difference should be around 0.1, not -6.27
-* 
+*
 * This brilliant method is from http://blog.lexique-du-net.com/index.php?post/Calculate-the-real-difference-between-two-angles-keeping-the-sign
 * and the comment of user tk
-* 
+*
 * Originally implemented in PDSim
 */
 template <class T>

include/Configuration.h

@@ -12,10 +12,10 @@
  * See http://stackoverflow.com/questions/147267/easy-way-to-use-variables-of-enum-types-as-string-in-c#202511
  * This will be used to generate an enum like:
  * enum configuration_keys {NORMALIZE_GAS_CONSTANTS, CRITICAL_SPLINES_ENABLED};
- * 
+ *
  * The values in this list are given by:
  * enum, string representation of enum, default value, description
- * 
+ *
  * The type of the default value specifies the only type that will be accepted for this parameter
  */
 #define CONFIGURATION_KEYS_ENUM                                                                                                                      \