Pysam 4.2.0 (#151)

* start

* revert adjustment factors changes

* update Examples

* update files

* update build_win.bat

Examples/BatteryWithCustomDispatch.py

@@ -4,7 +4,7 @@
 
 Additional financial models, inputs, and outputs can be found at https://nrel-pysam.readthedocs.io/en/master/modules/Battery.html
 
-Most recently tested against PySAM 4.1.0
+Most recently tested against PySAM 4.2.0
 
 @author: brtietz
 """

Examples/FetchResourceFileExample.py

@@ -10,7 +10,7 @@
 To use the `FetchResourceFile` function, register an email address to receive a
 free API key at at https://developer.nrel.gov/signup/.
 
-Most recently tested against PySAM 4.0.0
+Most recently tested against PySAM 4.2.0
 
 @authors: skoeb, cpaulgilman
 '''

Examples/GenericSystemSingleOwnerExample.py

@@ -3,7 +3,7 @@
 """
 Created on Wed Mar  4 13:47:58 2020
 
-Most recently tested against PySAM 4.1.0
+Most recently tested against PySAM 4.2.0
 
 @author: frohro
 """

Examples/LoadToolsExample.py

@@ -6,7 +6,7 @@
 
 """
 A usage example for LoadTools.get_monthly peaks with hourly annual data
-Requires PySAM 4.1.0 or greater
+Requires PySAM 4.2.0 or greater
 """
 if __name__ == "__main__":
     df = pd.read_csv(str(Path(__file__).parent / "sample_load.csv"), dtype=float)

Examples/Marine energy examples/WaveFileReader_example.ipynb

@@ -1,6 +1,7 @@
 {
  "cells": [
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -19,7 +20,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "4.1.0\n"
+      "4.2.0\n"
      ]
     }
    ],
@@ -161,7 +162,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.0"
+   "version": "3.8.13"
   },
   "vscode": {
    "interpreter": {

Examples/NonAnnualSimulation.ipynb

@@ -6,7 +6,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Most recently tested against PySAM 4.1.0\n",
+    "# Most recently tested against PySAM 4.2.0\n",
     "\n",
     "import pandas as pd\n",
     "import json\n",
@@ -16,6 +16,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -288,6 +289,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -331,6 +333,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [

Examples/PySAMWorkshop.ipynb

@@ -13,10 +13,11 @@
     "\n",
     "https://sam.nrel.gov/software-development-kit-sdk/pysam.html\n",
     "\n",
-    "Edit: Most recently tested with Version 4.1.0"
+    "Edit: Most recently tested with Version 4.2.0"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -36,6 +37,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -68,6 +70,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -110,6 +113,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -236,6 +240,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -294,6 +299,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -360,7 +366,7 @@
       " (0.0, 0.0, 0.0, 0.0, 0.0, -0.0, 6.389046797900428, 37.94398351785478, 67.06449907636099, 92.89776429848214)\n",
       "\n",
       "annual energy value\n",
-      " (0.0, 19406.19405690556, 19800.52382533316, 20202.44148167006, 20612.079886380227, 21029.57424662404, 21455.061069906493, 21888.678750448922, 22330.56790184979, 22780.871493923893, 23239.73432549519, 23707.302537008927, 24183.72454046737, 24669.151054164817, 25162.80184412058, 25665.452721768244, 26177.509583152998, 26699.12880537708, 27230.46804522286, 27771.6872915576, 28322.60044366972)\n"
+      " (0.0, 19406.19405690556, 19800.52382533316, 20202.441481670056, 20612.079886380227, 21029.57424662404, 21455.061069906493, 21888.678750448922, 22330.56790184979, 22780.871493923893, 23239.73432549519, 23707.302537008924, 24183.724540467367, 24669.151054164817, 25162.80184412058, 25665.45272176825, 26177.509583152998, 26699.128805377077, 27230.468045222864, 27771.6872915576, 28322.60044366972)\n"
      ]
     }
    ],
@@ -375,6 +381,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -417,6 +424,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -496,10 +504,15 @@
      "output_type": "stream",
      "text": [
       "batt_kw\tbatt_kwh\tavg_npv\n",
-      "10\t40\t-131785.9623201237\n",
-      "20\t80\t-128677.60802359802\n",
-      "30\t120\t-126139.5470983437\n",
-      "40\t160\t-124008.21375974927\n"
+      "10\t40\t-131785.96232012415\n",
+      "20\t80\t-128677.60802319663\n",
+      "30\t120\t-126139.54922129444\n",
+      "40\t160\t-124008.20675169432\n",
+      "50\t200\t-122370.41001778266\n",
+      "60\t240\t-121195.93805275756\n",
+      "70\t280\t-120204.21032777404\n",
+      "80\t320\t-119364.54637950887\n",
+      "90\t360\t-118652.09661186521\n"
      ]
     }
    ],

Examples/ResidentialPVBatteryWithCustomDispatch.py

@@ -8,7 +8,7 @@
 * PV: https://nrel-pysam.readthedocs.io/en/master/modules/Pvsamv1.html
 * Battery: https://nrel-pysam.readthedocs.io/en/master/modules/Battery.html
 
-Most recently tested against PySAM 4.1.0
+Most recently tested against PySAM 4.2.0
 
 @author: brtietz
 """

Examples/SAMsimPVWattsCommercialExample.py

@@ -13,7 +13,7 @@
     Run the simulations.
     Print the results.
 
-Most recently tested against PySAM 4.1.0
+Most recently tested against PySAM 4.2.0
 
 @author: frohro
 """