Updates to install requirements.txt and multiple files for NASA POWER API integration

examples/simulate_hybrid.py

@@ -21,14 +21,15 @@
                 },
                 'wind': {
                     'num_turbines': 10,
-                    'turbine_rating_kw': 2000
+                    'turbine_rating_kw': 2000,
+                    'hub_height': 80
                 }}
 
 # Get resource
 lat = flatirons_site['lat']
 lon = flatirons_site['lon']
 prices_file = examples_dir.parent / "resource_files" / "grid" / "pricing-data-2015-IronMtn-002_factors.csv"
-site = SiteInfo(flatirons_site, grid_resource_file=prices_file)
+site = SiteInfo(flatirons_site, grid_resource_file=prices_file, api='nrel', hub_height=80)
 
 # Create model
 hybrid_plant = HybridSimulation(technologies, site, interconnect_kw=interconnection_size_mw * 1000)

hybrid/resource/resource.py

@@ -3,6 +3,7 @@
 import json
 import requests
 import time
+import datetime
 
 
 class Resource(metaclass=ABCMeta):
@@ -11,7 +12,7 @@ class Resource(metaclass=ABCMeta):
     it is downloaded and saved to 'resource_files' folder. The resource file is then read
     to the appropriate SAM resource data format.
     """
-    def __init__(self, lat, lon, year, **kwargs):
+    def __init__(self, lat, lon, year, api='nrel', **kwargs):
         """
         Parameters
         ---------
@@ -21,11 +22,16 @@ def __init__(self, lat, lon, year, **kwargs):
             The longitude
         year: int
             The year of resource_files data
+        api: string
+            'nrel' for NREL Developer network APIs or 'nasa' for NASA POWER API
         """
 
         self.latitude = lat
         self.longitude = lon
         self.year = year
+        self.start_date = str(datetime.date.min.replace(year=int(self.year))).replace("-","")
+        self.end_date = str(datetime.date.max.replace(year=int(self.year))).replace("-","")
+        self.api = api
 
         self.n_timesteps = 8760
 

hybrid/resource/solar_resource.py

@@ -13,17 +13,18 @@ class SolarResource(Resource):
         Class to manage Solar Resource data
         """
 
-    def __init__(self, lat, lon, year, path_resource="", filepath="", **kwargs):
+    def __init__(self, lat, lon, year, api='nrel', path_resource="", filepath="", **kwargs):
         """
 
         :param lat: float
         :param lon: float
         :param year: int
+        :param api : string ('nrel' or 'nasa')
         :param path_resource: directory where to save downloaded files
         :param filepath: file path of resource file to load
         :param kwargs:
         """
-        super().__init__(lat, lon, year)
+        super().__init__(lat, lon, year, api)
 
         if os.path.isdir(path_resource):
             self.path_resource = path_resource
@@ -37,9 +38,14 @@ def __init__(self, lat, lon, year, path_resource="", filepath="", **kwargs):
 
         # resource_files files
         if filepath == "":
-            filepath = os.path.join(self.path_resource,
-                                    str(lat) + "_" + str(lon) + "_psmv3_" + str(self.interval) + "_" + str(
-                                        year) + ".csv")
+            if self.api == 'nrel':
+                filepath = os.path.join(self.path_resource,
+                                        str(lat) + "_" + str(lon) + "_psmv3_" + str(self.interval) + "_" + str(
+                                            year) + ".csv")
+            elif self.api == 'nasa':
+                filepath = os.path.join(self.path_resource,
+                                        str(lat) + "_" + str(lon) + "_nasa_" + str(self.interval) + "_" + str(
+                                            year) + ".csv")                
         self.filename = filepath
 
         self.check_download_dir()
@@ -51,13 +57,21 @@ def __init__(self, lat, lon, year, path_resource="", filepath="", **kwargs):
 
         logger.info("SolarResource: {}".format(self.filename))
 
+
     def download_resource(self):
-        url = 'https://developer.nrel.gov/api/nsrdb/v2/solar/psm3-download.csv?wkt=POINT({lon}+{lat})&names={year}&leap_day={leap}&interval={interval}&utc={utc}&full_name={name}&email={email}&affiliation={affiliation}&mailing_list={mailing_list}&reason={reason}&api_key={api}&attributes={attr}'.format(
+        if self.api.lower() == 'nrel':
+            url = 'https://developer.nrel.gov/api/nsrdb/v2/solar/psm3-download.csv?wkt=POINT({lon}+{lat})&names={year}&leap_day={leap}&interval={interval}&utc={utc}&full_name={name}&email={email}&affiliation={affiliation}&mailing_list={mailing_list}&reason={reason}&api_key={api}&attributes={attr}'.format(
             year=self.year, lat=self.latitude, lon=self.longitude, leap=self.leap_year, interval=self.interval,
             utc=self.utc, name=self.name, email=self.email,
             mailing_list=self.mailing_list, affiliation=self.affiliation, reason=self.reason, api=get_developer_nrel_gov_key(),
             attr=self.solar_attributes)
 
+        elif self.api.lower() == 'nasa':
+            url = 'https://power.larc.nasa.gov/api/temporal/hourly/point?start={start}&end={end}&latitude={lat}&longitude={lon}&community=re&parameters=T2M&format=sam&user=TEST'.format(
+            start=self.start_date, end=self.end_date, lat=self.latitude, lon=self.longitude)
+        else:
+            raise NameError(self.api + " does not exist. Try 'nrel' for the NREL developer network NSRDB API or 'nasa' for NASA POWER API")
+
         success = self.call_api(url, filename=self.filename)
 
         return success
@@ -90,6 +104,7 @@ def data(self, data_dict):
         :key wspd: array, wind speed [m/s]
         :key tdry: array, dry bulb temp [C]
         """
+
         self._data = SAM_CSV_to_solar_data(data_dict)
 
     def roll_timezone(self, roll_hours, timezone):

hybrid/resource/wind_resource.py

@@ -20,18 +20,20 @@ class WindResource(Resource):
 
     allowed_hub_height_meters = [10, 40, 60, 80, 100, 120, 140, 160, 200]
 
-    def __init__(self, lat, lon, year, wind_turbine_hub_ht, path_resource="", filepath="", **kwargs):
+    def __init__(self, lat, lon, year, wind_turbine_hub_ht, api='nrel', nasa_vegtype='vegtype_8', path_resource="", filepath="", **kwargs):
         """
 
         :param lat: float
         :param lon: float
         :param year: int
+        :param api: string ('nrel' or 'nasa')
+        :param nasa_vegtype: string (see wind-surface options at https://power.larc.nasa.gov/docs/methodology/meteorology/wind/#corrected-wind-speed)
         :param wind_turbine_hub_ht: int
         :param path_resource: directory where to save downloaded files
         :param filepath: file path of resource file to load
         :param kwargs:
         """
-        super().__init__(lat, lon, year)
+        super().__init__(lat, lon, year, api)
 
         if os.path.isdir(path_resource):
             self.path_resource = path_resource
@@ -44,6 +46,8 @@ def __init__(self, lat, lon, year, wind_turbine_hub_ht, path_resource="", filepa
 
         self.file_resource_heights = None
 
+        self.vegtype = nasa_vegtype
+
         if filepath == "":
             self.filename = ""
             self.calculate_heights_to_download()
@@ -78,8 +82,14 @@ def calculate_heights_to_download(self):
             heights[0] = height_low
             heights.append(height_high)
 
-        file_resource_base = os.path.join(self.path_resource, str(self.latitude) + "_" + str(self.longitude) + "_windtoolkit_" + str(
-            self.year) + "_" + str(self.interval) + "min")
+        if self.api == 'nrel':
+            file_resource_base = os.path.join(self.path_resource, str(self.latitude) + "_" + str(self.longitude) + "_windtoolkit_" + str(
+                self.year) + "_" + str(self.interval) + "min")
+        elif self.api == 'nasa':
+            file_resource_base = os.path.join(self.path_resource, str(self.latitude) + "_" + str(self.longitude) + "_nasa_" + str(
+                self.year) + "_" + str(self.interval) + "min")
+        else:
+            raise NameError(self.api + " does not exist. Try 'nrel' for the NREL developer network WindToolkit API or 'nasa' for NASA POWER API")
         file_resource_full = file_resource_base
         file_resource_heights = dict()
 
@@ -98,12 +108,21 @@ def update_height(self, hub_height_meters):
     def download_resource(self):
         success = os.path.isfile(self.filename)
         if not success:
+            if self.api.lower() == 'nrel':
+                for height, f in self.file_resource_heights.items():
+                    url = 'https://developer.nrel.gov/api/wind-toolkit/v2/wind/wtk-srw-download?year={year}&lat={lat}&lon={lon}&hubheight={hubheight}&api_key={api_key}&email={email}'.format(
+                        year=self.year, lat=self.latitude, lon=self.longitude, hubheight=height, api_key=get_developer_nrel_gov_key(), email=self.email)
 
-            for height, f in self.file_resource_heights.items():
-                url = 'https://developer.nrel.gov/api/wind-toolkit/v2/wind/wtk-srw-download?year={year}&lat={lat}&lon={lon}&hubheight={hubheight}&api_key={api_key}&email={email}'.format(
-                    year=self.year, lat=self.latitude, lon=self.longitude, hubheight=height, api_key=get_developer_nrel_gov_key(), email=self.email)
+                    success = self.call_api(url, filename=f)
 
-                success = self.call_api(url, filename=f)
+            elif self.api.lower() == 'nasa':
+                for height, f in self.file_resource_heights.items():
+                    url = 'https://power.larc.nasa.gov/api/temporal/hourly/point?start={start}&end={end}&latitude={lat}&longitude={lon}&community=RE&parameters=T2M&format=srw&wind-surface={surface}&wind-elevation={hubheight}&site-elevation={hubheight}'.format(
+                        start=self.start_date, end=self.end_date, lat=self.latitude, lon=self.longitude, surface=self.vegtype, hubheight=height)
+
+                    success = self.call_api(url, filename=f)
+            else:
+                raise NameError(self.api + " does not exist. Try 'nrel' for the NREL developer network WindToolkit API or 'nasa' for NASA POWER API")
 
             if not success:
                 raise ValueError('Unable to download wind data')
@@ -163,5 +182,5 @@ def data(self, data_file):
         """
         Sets the wind resource data to a dictionary in SAM Wind format (see Pysam.ResourceTools.SRW_to_wind_data)
         """
-
-        self._data = SRW_to_wind_data(data_file)
+        
+        self._data = SRW_to_wind_data(data_file)

hybrid/sites/flatirons_site.py

@@ -1,7 +1,7 @@
 flatirons_site = {
-    "lat": 35.2018863,
-    "lon": -101.945027,
-    "elev": 1099,
+    "lat": 39.91,
+    "lon": -105.22,
+    "elev": 1800,
     "year": 2012,
     "tz": -6,
     'site_boundaries': {

hybrid/sites/site_info.py

@@ -25,9 +25,11 @@ def plot_site(verts, plt_style, labels):
 
 class SiteInfo:
 
-    def __init__(self, data, solar_resource_file="", wind_resource_file="", grid_resource_file=""):
+    def __init__(self, data, solar_resource_file="", wind_resource_file="", grid_resource_file="", api='nrel', nasa_vegtype='vegtype_8', hub_height=80):
         set_nrel_key_dot_env()
         self.data = data
+        self.api = api
+        self.vegtype = nasa_vegtype
         self.vertices = np.array([np.array(v) for v in data['site_boundaries']['verts']])
         self.polygon: Polygon = Polygon(self.vertices)
         self.valid_region = self.polygon.buffer(1e-8)
@@ -37,10 +39,10 @@ def __init__(self, data, solar_resource_file="", wind_resource_file="", grid_res
         self.lon = data['lon']
         if 'year' not in data:
             data['year'] = 2012
-        self.solar_resource = SolarResource(data['lat'], data['lon'], data['year'], filepath=solar_resource_file)
+        self.solar_resource = SolarResource(data['lat'], data['lon'], data['year'], filepath=solar_resource_file, api=self.api)
         # TODO: allow hub height to be used as an optimization variable
-        self.wind_resource = WindResource(data['lat'], data['lon'], data['year'], wind_turbine_hub_ht=80,
-                                          filepath=wind_resource_file)
+        self.wind_resource = WindResource(data['lat'], data['lon'], data['year'], wind_turbine_hub_ht=hub_height,
+                                          filepath=wind_resource_file, api=self.api, nasa_vegtype=self.vegtype)
         self.elec_prices = ElectricityPrices(data['lat'], data['lon'], data['year'], filepath=grid_resource_file)
         self.n_timesteps = len(self.solar_resource.data['gh']) // 8760 * 8760
         self.n_periods_per_day = self.n_timesteps // 365  # TODO: Does not handle leap years well

hybrid/wind_source.py

@@ -22,7 +22,7 @@ def __init__(self,
         """
         Set up a WindPlant
 
-        :param farm_config: dict, with keys ('num_turbines', 'turbine_rating_kw', 'layout_mode', 'layout_params')
+        :param farm_config: dict, with keys ('num_turbines', 'turbine_rating_kw', 'rotor_diameter', 'hub_height', 'layout_mode', 'layout_params')
             where layout_mode can be selected from the following:
             - 'boundarygrid': regular grid with boundary turbines, requires WindBoundaryGridParameters as 'params'
             - 'grid': regular grid with dx, dy distance, 0 angle; does not require 'params'
@@ -70,7 +70,10 @@ def __init__(self,
 
         self.turb_rating = farm_config['turbine_rating_kw']
         self.num_turbines = farm_config['num_turbines']
-
+        if 'hub_height' in farm_config.keys():
+            self._system_model.Turbine.wind_turbine_hub_ht = farm_config['hub_height']
+        if 'rotor_diameter' in farm_config.keys():
+            self.rotor_diameter = farm_config['rotor_diameter']
     @property
     def wake_model(self) -> str:
         try:

requirements-dev.txt

@@ -1,12 +1,12 @@
-NREL-PySAM==3.0.0
+NREL-PySAM>=3.0.0
 Pillow
 Pyomo>=6.1.2
 floris
 future
 global_land_mask
 Cython
 matplotlib
-numpy
+numpy>=1.21.0
 pandas
 pint
 pvmismatch

requirements.txt

@@ -1,12 +1,12 @@
-NREL-PySAM==3.0.0
+NREL-PySAM>=3.0.0
 Pillow
 Pyomo>=6.1.2
 floris
 future
 global_land_mask
 Cython
 matplotlib
-numpy
+numpy>=1.21.0
 pandas
 multiprocessing-on-dill
 pint