V3.0.2 (#121)

* files for pysam 2.2.4 * update build_manylinux.sh * update tests and conda build * update SAM_api files * closes #89 certifi certificates in fetchresource * fixes #94 * start v 2.3.0 * fix #69 * changes from 2021.12.2 release * add VersionChanges.rst * add version_differ.py * add more release info * update version_differ.py doc str * correct version_differ.py with PySSC * add python 3.10 * fix getting env variables during build and remove pandas dependency * fix test_ResouceTools.py * switch to manylinux2010 for Python 3.10 support * update pysam files * update PySAM files * Update docs for Version 3.0.1 * close #109 * remove stubs package dependency * removal of stubs package * Apple Silicon and Intel Wheel pip3 install --extra-index-url https://test.pypi.org/simple/ NREL_PySAM * update files and test * PySAM documentation revisions * update setup and tests * update files * update versions.rst * update rsts * updates for v3.0.2 * update examples Co-authored-by: sjanzou <[email protected]> Co-authored-by: sjanzou <[email protected]> Co-authored-by: Paul Gilman <[email protected]>
NREL · Sep 27, 2022 · 2e257f8 · 2e257f8
1 parent d269cab
commit 2e257f8
Show file tree

Hide file tree

Showing 214 changed files with 19,512 additions and 16,864 deletions.
diff --git a/Examples/BatteryStateful.ipynb b/Examples/BatteryStateful.ipynb
diff --git a/Examples/BatteryWithCustomDispatch.py b/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 3.0.1
+Most recently tested against PySAM 3.0.2
 
 @author: brtietz
 """

diff --git a/Examples/FetchResourceFileExample.py b/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 3.0.1
+Most recently tested against PySAM 3.0.2
 
 @authors: skoeb, cpaulgilman
 '''

diff --git a/Examples/GenericSystemSingleOwnerExample.py b/Examples/GenericSystemSingleOwnerExample.py
@@ -3,7 +3,7 @@
 """
 Created on Wed Mar  4 13:47:58 2020
 
-Most recently tested against PySAM 3.0.1
+Most recently tested against PySAM 3.0.2
 
 @author: frohro
 """

diff --git a/Examples/Marine energy examples/WaveFileReader_example.ipynb b/Examples/Marine energy examples/WaveFileReader_example.ipynb
@@ -19,7 +19,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "3.0.1\n"
+      "3.0.2\n"
      ]
     }
    ],
@@ -56,7 +56,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -77,7 +77,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -90,7 +90,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -101,7 +101,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -147,7 +147,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3.7.12 ('hybrid')",
    "language": "python",
    "name": "python3"
   },
@@ -161,7 +161,12 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.7.12"
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "be2cbe8f104d9ac6d9fabf42fbeb31737fdd025c22f444174f4d7205615d859d"
+   }
   }
  },
  "nbformat": 4,

diff --git a/Examples/NonAnnualSimulation.ipynb b/Examples/NonAnnualSimulation.ipynb
@@ -6,7 +6,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Most recently tested against PySAM 3.0.1\n",
+    "# Most recently tested against PySAM 3.0.2\n",
     "\n",
     "import pandas as pd\n",
     "import json\n",
@@ -421,7 +421,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3.7.12 ('hybrid')",
    "language": "python",
    "name": "python3"
   },
@@ -436,6 +436,11 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.7.12"
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "be2cbe8f104d9ac6d9fabf42fbeb31737fdd025c22f444174f4d7205615d859d"
+   }
   }
  },
  "nbformat": 4,

diff --git a/Examples/PySAMWorkshop.ipynb b/Examples/PySAMWorkshop.ipynb
@@ -10,7 +10,9 @@
     "\n",
     "dguittet\n",
     "\n",
-    "https://sam.nrel.gov/software-development-kit-sdk/pysam.html"
+    "https://sam.nrel.gov/software-development-kit-sdk/pysam.html\n",
+    "\n",
+    "Most recently tested with Version 3.0.2"
    ]
   },
   {
@@ -19,7 +21,7 @@
    "source": [
     "## How to Get Started\n",
     "\n",
-    "64-bit Python 3.5-3.8 for Linux, Mac and Windows\n",
+    "64-bit Python 3.6-3.8 for Linux, Mac and Windows\n",
     "\n",
     "PyPi: \n",
     "```\n",
@@ -28,7 +30,7 @@
     "\n",
     "Anaconda:\n",
     "```\n",
-    "conda install -u nrel nrel-pysam\n",
+    "conda install -c nrel nrel-pysam\n",
     "```"
    ]
   },
@@ -131,27 +133,47 @@
       "default(...)\n",
       "    default(config) -> Pvwattsv8\n",
       "    \n",
-      "    Use default attributes\n",
-      "    `config` options:\n",
+      "    Load defaults for the configuration ``config``. Available configurations are:\n",
+      "    \n",
+      "                    - *\"FuelCellCommercial\"*\n",
+      "    \n",
+      "                    - *\"FuelCellSingleOwner\"*\n",
+      "    \n",
+      "                    - *\"PVWattsBatteryCommercial\"*\n",
+      "    \n",
+      "                    - *\"PVWattsBatteryHostDeveloper\"*\n",
+      "    \n",
+      "                    - *\"PVWattsBatteryResidential\"*\n",
+      "    \n",
+      "                    - *\"PVWattsBatteryThirdParty\"*\n",
+      "    \n",
+      "                    - *\"PVWattsAllEquityPartnershipFlip\"*\n",
+      "    \n",
+      "                    - *\"PVWattsCommercial\"*\n",
+      "    \n",
+      "                    - *\"PVWattsCommunitySolar\"*\n",
+      "    \n",
+      "                    - *\"PVWattsHostDeveloper\"*\n",
       "    \n",
-      "    - \"FuelCellCommercial\"\n",
-      "    - \"FuelCellSingleOwner\"\n",
-      "    - \"PVWattsBatteryCommercial\"\n",
-      "    - \"PVWattsBatteryHostDeveloper\"\n",
-      "    - \"PVWattsBatteryResidential\"\n",
-      "    - \"PVWattsBatteryThirdParty\"\n",
-      "    - \"PVWattsAllEquityPartnershipFlip\"\n",
-      "    - \"PVWattsCommercial\"\n",
-      "    - \"PVWattsCommunitySolar\"\n",
-      "    - \"PVWattsHostDeveloper\"\n",
-      "    - \"PVWattsLCOECalculator\"\n",
-      "    - \"PVWattsLeveragedPartnershipFlip\"\n",
-      "    - \"PVWattsMerchantPlant\"\n",
-      "    - \"PVWattsNone\"\n",
-      "    - \"PVWattsResidential\"\n",
-      "    - \"PVWattsSaleLeaseback\"\n",
-      "    - \"PVWattsSingleOwner\"\n",
-      "    - \"PVWattsThirdParty\"\n",
+      "                    - *\"PVWattsLCOECalculator\"*\n",
+      "    \n",
+      "                    - *\"PVWattsLeveragedPartnershipFlip\"*\n",
+      "    \n",
+      "                    - *\"PVWattsMerchantPlant\"*\n",
+      "    \n",
+      "                    - *\"PVWattsNone\"*\n",
+      "    \n",
+      "                    - *\"PVWattsResidential\"*\n",
+      "    \n",
+      "                    - *\"PVWattsSaleLeaseback\"*\n",
+      "    \n",
+      "                    - *\"PVWattsSingleOwner\"*\n",
+      "    \n",
+      "                    - *\"PVWattsThirdParty\"*\n",
+      "    \n",
+      "    .. note::\n",
+      "    \n",
+      "            Some inputs do not have default values and may be assigned a value from the variable's **Required** attribute. See variable attribute descriptions below.\n",
       "\n"
      ]
     }
@@ -397,7 +419,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "3.0.1\n"
+      "3.0.2\n"
      ]
     }
    ],
@@ -461,15 +483,15 @@
      "output_type": "stream",
      "text": [
       "batt_kw\tbatt_kwh\tavg_npv\n",
-      "10\t40\t-153954.84677918305\n",
-      "20\t80\t-150850.42788635375\n",
-      "30\t120\t-148314.47573871858\n",
-      "40\t160\t-146182.89481951922\n",
-      "50\t200\t-144544.3197297429\n",
-      "60\t240\t-143366.7813592981\n",
-      "70\t280\t-142359.27146820037\n",
-      "80\t320\t-141531.54877402788\n",
-      "90\t360\t-140815.95125104045\n"
+      "10\t40\t-154353.26606867867\n",
+      "20\t80\t-151244.90880068636\n",
+      "30\t120\t-148706.81120574806\n",
+      "40\t160\t-146575.43792525906\n",
+      "50\t200\t-144937.62361062184\n",
+      "60\t240\t-143763.20766567587\n",
+      "70\t280\t-142771.29847063648\n",
+      "80\t320\t-141931.5901346006\n",
+      "90\t360\t-141218.5235190545\n"
      ]
     }
    ],
@@ -504,7 +526,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3.7.12 ('hybrid')",
    "language": "python",
    "name": "python3"
   },
@@ -519,6 +541,11 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.7.12"
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "be2cbe8f104d9ac6d9fabf42fbeb31737fdd025c22f444174f4d7205615d859d"
+   }
   }
  },
  "nbformat": 4,

diff --git a/Examples/ResidentialPVBatteryWithCustomDispatch.py b/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 3.0.1
+Most recently tested against PySAM 3.0.2
 
 @author: brtietz
 """
@@ -29,6 +29,7 @@
 
 # Default model does not include a weather file, so set that based on the command line path
 system_model.SolarResource.solar_resource_file = weather_file
+system_model.SolarResource.use_wf_albedo = 0
 
 # 24 hours of dispatch data, duplicated for each day. Would need to extend daily_dispatch for subhourly
 lifetime_dispatch = []

diff --git a/Examples/SAMsimPVWattsCommercialExample.py b/Examples/SAMsimPVWattsCommercialExample.py
@@ -13,7 +13,7 @@
     Run the simulations.
     Print the results.
 
-Most recently tested against PySAM 3.0.1
+Most recently tested against PySAM 3.0.2
 
 @author: frohro
 """