fix merge conflict with develop

Author: RHammond2

.gitignore

@@ -27,7 +27,7 @@ junit-xml-report.xml
 
 examples/operational_AEP_analysis/data/*.csv
 examples/turbine_analysis/data/*.csv
-examples/cleansed
+examples/data/cleansed
 
 examples/data/kelmarsh/
 examples/data/penmanshiel/

examples/02c_augmented_plant_aep_analysis.ipynb

@@ -37,7 +37,23 @@
       "cell_type": "code",
       "execution_count": 2,
       "metadata": {},
-      "outputs": [],
+      "outputs": [
+        {
+          "name": "stderr",
+          "output_type": "stream",
+          "text": [
+            "WARNING:py.warnings:/Users/rhammond/GitHub_Public/OpenOA/openoa/utils/plot.py:1514: DeprecationWarning: invalid escape sequence '\\c'\n",
+            "  label=f\"Max. Power Vane Angle = {round(curve_fit_params_ws[:,i,1].mean(),1)}$^\\circ$\",  # noqa: W605\n",
+            "\n",
+            "WARNING:py.warnings:/Users/rhammond/GitHub_Public/OpenOA/openoa/analysis/electrical_losses.py:374: DeprecationWarning: invalid escape sequence '\\m'\n",
+            "  label=f\"Electrical Losses\\n$\\mu$={mean:.2%}, $\\sigma$={std:.2%}\",  # noqa: W605\n",
+            "\n",
+            "WARNING:py.warnings:/Users/rhammond/GitHub_Public/OpenOA/openoa/analysis/electrical_losses.py:374: DeprecationWarning: invalid escape sequence '\\s'\n",
+            "  label=f\"Electrical Losses\\n$\\mu$={mean:.2%}, $\\sigma$={std:.2%}\",  # noqa: W605\n",
+            "\n"
+          ]
+        }
+      ],
       "source": [
         "# Import required packages\n",
         "import numpy as np\n",
@@ -231,7 +247,9 @@
         "\n",
         "Next we create a TIE object which will contain the analysis to be performed. The method has the ability to calculate uncertainty in the TIE metric through a Monte Carlo sampling of filtering thresholds, power data, and reanalysis product choices. For now, we turn this option off and run the method a single time.\n",
         "\n",
-        "**NOTE**: The inputs `wind_bin_threshold`, `max_power_filter`, and `correction_threshold` all default to UQ inputs, and so inputs must be provided to these parameters when running a single case (`UQ=False`)."
+        "```{note}\n",
+        "The inputs `wind_bin_threshold`, `max_power_filter`, and `correction_threshold` all default to UQ inputs, and so inputs must be provided to these parameters when running a single case (`UQ=False`).\n",
+        "```"
       ]
     },
     {
@@ -276,7 +294,7 @@
           "name": "stderr",
           "output_type": "stream",
           "text": [
-            "100%|\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588| 2/2 [00:03<00:00,  1.61s/it]\n"
+            "100%|\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588| 2/2 [00:02<00:00,  1.22s/it]\n"
           ]
         }
       ],
@@ -450,11 +468,14 @@
         "\n",
         "Now we will create a TIE object for calculating TIE and quantifying the uncertainty in our estimate. The method estimates uncertainty in the TIE metric through a Monte Carlo sampling of filtering thresholds, power data, and reanalysis product choices.\n",
         "\n",
-        "Note that we set the number of Monte Carlo simulations to only 100 in this example because of the relatively high computational effort required to perform a single iteration. In practice, a larger number of simulations is recommended (the default value is 2000).\n",
+        "Note that we set the number of Monte Carlo simulations to only 75 in this example because of the relatively high computational effort required to perform a single iteration. In practice, a larger number of simulations is recommended (the default value is 2000).\n",
         "\n",
         "With uncertainty quantification enabled (UQ=True), we can specify the assumed uncertainty of the SCADA power data (0.5% by default) and ranges of two key filtering thresholds from which the Monte Carlo simulations will sample. Specifically, these thresholds are applied to the bin_filter() function in the toolkits.filtering class of OpenOA.\n",
         "\n",
-        "Note that the following parameters are the default values."
+        "```{note}\n",
+        "1. The following parameters are the default values, except `num_sim`, which has been reduced to optimize runtime in the examples.\n",
+        "2. `num_sim` is recommended to be significantly higher so that results will converge (the default value is 2000).\n",
+        "```"
       ]
     },
     {
@@ -466,7 +487,7 @@
         "ta=TurbineLongTermGrossEnergy(\n",
         "    project,\n",
         "    UQ=True,  # enable uncertainty quantification\n",
-        "    num_sim=100,  # number of Monte Carlo simulations to perform\n",
+        "    num_sim=75,  # number of Monte Carlo simulations to perform\n",
         "    wind_bin_threshold=(1, 3),  # Data outside of a range of +-1 to +-3 standard deviations from the median for each power bin are discarded\n",
         "    max_power_filter=(0.8, 0.9),  # The bin filter will be applied up to fractions of turbine capacity from 80% to 90%\n",
         "    uncertainty_scada=0.005,  # Assumed uncertainty of SCADA power data (0.5%)\n",
@@ -499,7 +520,7 @@
           "name": "stderr",
           "output_type": "stream",
           "text": [
-            "100%|\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588| 100/100 [02:57<00:00,  1.78s/it]\n"
+            "100%|\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588| 75/75 [02:05<00:00,  1.68s/it]\n"
           ]
         }
       ],
@@ -524,7 +545,7 @@
         {
           "data": {
             "text/plain": [
-              "13574203.044895409"
+              "13544928.004463477"
             ]
           },
           "execution_count": 13,
@@ -544,7 +565,7 @@
         {
           "data": {
             "text/plain": [
-              "533395.2405247269"
+              "147320.39759589723"
             ]
           },
           "execution_count": 14,
@@ -565,8 +586,8 @@
           "name": "stdout",
           "output_type": "stream",
           "text": [
-            "Mean long-term turbine ideal energy is 13.6 GWh/year\n",
-            "Uncertainty in long-term turbine ideal energy is 0.5 GWh/year, or 3.9% percent\n"
+            "Mean long-term turbine ideal energy is 13.5 GWh/year\n",
+            "Uncertainty in long-term turbine ideal energy is 0.1 GWh/year, or 1.1% percent\n"
           ]
         }
       ],
@@ -582,7 +603,6 @@
       "cell_type": "markdown",
       "metadata": {},
       "source": [
-        "\n",
         "As expected, the mean long-term TIE is close to the earlier estimate without uncertainty quantification. A relatively low uncertainty has been estimated for the TIE calculations. This is a result of the relatively close agreement between the two reanalysis products and the clean power curves plotted earlier."
       ]
     },