Merge branch 'main' of https://github.com/NREL/pysam into build_improvements

Author: brtietz

.github/workflows/test_pkg.yml

@@ -44,7 +44,7 @@ jobs:
         run: |
           cd ..
           git config --global url.https://github.com/.insteadOf git://github.com/
-          git clone https://github.com/NREL/SAM.git
+          git clone https://github.com/natlabrockies/SAM.git
 
       - name: Unit tests
         run: |
@@ -95,7 +95,7 @@ jobs:
         run: |
           cd ..
           git config --global url.https://github.com/.insteadOf git://github.com/
-          git clone https://github.com/NREL/SAM.git
+          git clone https://github.com/natlabrockies/SAM.git
 
       - name: Unit tests
         run: |
@@ -148,7 +148,7 @@ jobs:
         run: |
           cd ..
           git config --global url.https://github.com/.insteadOf git://github.com/
-          git clone https://github.com/NREL/SAM.git
+          git clone https://github.com/natlabrockies/SAM.git
 
       - name: Unit tests
         run: |

CONTRIBUTING.md

@@ -2,8 +2,8 @@
 
 NREL welcomes your contribution to the PySAM project! 
 
-You can contribute by letting us know about problems, suggesting new features, or by making your own changes or additions to the code. To see a list of issues or report a new one, see the [PySAM Issues page](https://github.com/NREL/pysam/issues). 
+You can contribute by letting us know about problems, suggesting new features, or by making your own changes or additions to the code. To see a list of issues or report a new one, see the [PySAM Issues page](https://github.com/natlabrockies/pysam/issues). 
 
-If you have a question about using PySAM, you can ask us on the [SAM SDK support forum](https://sam.nrel.gov/forum/forum-sdk.html).
+If you have a question about using PySAM, you can ask us on the [SAM SDK support forum](https://sam.nlr.gov/forum/forum-sdk.html).
 
-Please see the SAM wiki page for our contribution policy: [https://github.com/NREL/SAM/wiki/Contribution-Policy](https://github.com/NREL/SAM/wiki/Contribution-Policy).
+Please see the SAM wiki page for our contribution policy: [https://github.com/natlabrockies/SAM/wiki/Contribution-Policy](https://github.com/natlabrockies/SAM/wiki/Contribution-Policy).

Examples/FetchResourceFileExample.py

@@ -8,7 +8,7 @@
 to `data`.
 
 To use the `FetchResourceFile` function, register an email address to receive a
-free API key at at https://developer.nrel.gov/signup/.
+free API key at at https://developer.nlr.gov/signup/.
 
 Most recently tested against PySAM 7.1.0
 
@@ -23,7 +23,8 @@
 
 import geocoder
 
-# replace with key and email address from https://developer.nrel.gov/signup/
+
+# replace with key and email address from https://developer.nlr.gov/signup/
 sam_api_key = os.environ.get('NREL_API_KEY')
 sam_email = os.environ.get('NREL_API_EMAIL')
 geocode_api_key = ''  # optional, may be required for geocoder
@@ -39,7 +40,7 @@
     lat = g.latlng[0]
 else:
     lon = -105.22
-    lat = 39.75
+    lat = 45
 
 # --- Wind Example ---
 
@@ -83,6 +84,7 @@
 nsrdbfetcher = tools.FetchResourceFiles(
                 tech='solar',
                 nrel_api_key=sam_api_key,
+                resource_type = 'nsrdb-GOES-tmy-v4-0-0',
                 nrel_api_email=sam_email)
 
 # --- List of (lon, lat) tuples or Shapely points ---

Examples/PVsamv1Tools.ipynb

@@ -41,7 +41,7 @@
     "\n",
     "This function downloads weather files from the NREL National Solar Radiation Database (NSRDB). In this example, we are downloading a file for a single location and storing it in the current folder to use in the next example.\n",
     "\n",
-    "Register on the NREL Developer Network to get an NREL API key: https://developer.nrel.gov/signup/ and replace `DEMO_KEY` and `test_email.email.org` with your key and email address. `DEMO_KEY` only allows limited access to the API for testing."
+    "Register on the NREL Developer Network to get an NREL API key: https://developer.nlr.gov/signup/ and replace `DEMO_KEY` and `test_email.email.org` with your key and email address. `DEMO_KEY` only allows limited access to the API for testing."
    ]
   },
   {
@@ -156,7 +156,7 @@
     "\n",
     "This requires that you look up the module name in the \"Name\" column of the CSV file for the module you want to select. In this example, we are downloading parameters for a module with the name \"AIMS POWER PV555MONO\".\n",
     "\n",
-    "https://github.com/NREL/SAM/blob/patch/deploy/libraries/CEC%20Modules.csv"
+    "https://github.com/NatLabRockies/SAM/blob/patch/deploy/libraries/CEC%20Modules.csv"
    ]
   },
   {

Examples/PySAMWorkshop.ipynb

@@ -11,7 +11,7 @@
     "\n",
     "dguittet\n",
     "\n",
-    "https://sam.nrel.gov/software-development-kit-sdk/pysam.html\n",
+    "https://sam.nlr.gov/software-development-kit-sdk/pysam.html\n",
     "\n",
     "Edit: Most recently tested with Version 7.10"
    ]

Examples/SelectingModuleandInverterExample/Modeling the NREL bifacial PV HSAT system.ipynb

@@ -9050,7 +9050,7 @@
    "source": [
     "The URL you see when you navigate to the github looks like:\n",
     "\n",
-    "    >> https://github.com/NREL/SAM/blob/master/deploy/libraries/CEC%20Modules.csv\n",
+    "    >> https://github.com/NatLabRockies/SAM/blob/master/deploy/libraries/CEC%20Modules.csv\n",
     "    \n",
     "However, to access it you must rename the github.com to raw.githubusercontent.com, and also remove the 'blob' part, so\n",
     "\n",

Examples/UtilityRatesExample.py

@@ -1,7 +1,7 @@
 """
 This example script shows how to set up the utility rate module using a rate downloaded from the Utility Rate
 
-This example requires an NREL developer key, which can be obtained from https://developer.nrel.gov/signup/
+This example requires an NREL developer key, which can be obtained from https://developer.nlr.gov/signup/
 
 Additional financial models, inputs, and outputs can be found at:
 * PV: https://nrel-pysam.readthedocs.io/en/master/modules/Utilityrate5.html

Examples/Windpower_Example/readme.md

@@ -4,7 +4,7 @@ This example illustrates how to work with PySAM's Windpower module for wind turb
 
 The Python script reads Windpower model inputs from the `wind-power-inputs.json` file, which was created by exporting inputs from the `windpower-example.sam` file using SAM's Code Generator with the "PySAM JSON" option.
 
-It then loads wind resource data from the `wind-resource-file.csv` file, which is a file from the NREL WIND Toolkit API: https://developer.nrel.gov/docs/wind/wind-toolkit/wtk-download/.
+It then loads wind resource data from the `wind-resource-file.csv` file, which is a file from the NREL WIND Toolkit API: https://developer.nlr.gov/docs/wind/wind-toolkit/wtk-download/.
 
 Next it loads a set of wind turbine parameters from the `wind-turbines.json` file that has data for three wind turbines. You can use this file as a model to create your own file of wind turbine parameters.