Re surrogate

.gitattributes

@@ -0,0 +1,6 @@
+Dispatch_shuffled_data_0.csv filter=lfs diff=lfs merge=lfs -text
+LMP_shuffled_data_0.csv filter=lfs diff=lfs merge=lfs -text
+
+*.csv filter=lfs diff=lfs merge=lfs -text
+
+Wind_Thermal_Dispatch.csv filter= diff= merge= text

.github/workflows/checks.yml

@@ -43,6 +43,10 @@ jobs:
             cov-report: true
     steps:
     - uses: actions/checkout@v2
+      with:
+        lfs: true
+    - name: Checkout LFS objects
+      run: git lfs checkout
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:

dispatches/case_studies/renewables_case/ConceptualDesignResults.csv

@@ -1,15 +1,3 @@
-wind_mw,batt_mw,pem_mw,tank_kgH2,turb_mw,annual_rev_h2,annual_rev_E,NPV,h2_price,ts,total_run_time,ipopt_its,ipopt_time
-200.0,418.55049856327975,2.453109617056948e-05,0.003228349658681,4.7671678628332326e-05,-56.93330430442413,54454708.39939764,337142802.80170757,2.0,168.0,170.26051440655,825.0,118.40299999999999
-200.0,361.19145492018225,13.48132343971299,0.0032289621704803336,4.724060081940249e-05,4631154.926623091,46886642.882782556,338728346.11500645,2.5,168.0,330.1094942523371,864.3333333333334,128.316
-200.0,164.90605583013854,82.44383439370556,0.0029288779900865005,4.710715122103761e-05,28341388.348529153,18143148.917589255,384275604.1199885,3.0,168.0,363.3768920520031,1154.0,172.748
-200.0,321.0346115356017,8.664398396682618e-05,0.006165807657409,5.055681203736526e-05,-39.916104648839585,44154327.31057402,295384477.9357557,2.0,365.0,439.01025544366667,981.0,334.545
-200.0,208.76219338530842,38.944274525803976,0.006169195325287,4.951394820507631e-05,12694084.46487706,27430110.149416827,304509581.50052625,2.5,365.0,899.8411130800378,916.0,321.452
-200.0,120.75795984442475,83.96875010676447,0.006166749900308001,4.915220413730238e-05,28645323.568246476,13148080.043751694,362455165.029901,3.0,365.0,1013.0490448530763,881.0,323.145
-200.0,143.1552877092944,0.0005955570896626668,0.012080883728672333,5.650571344174596e-05,99.39527189349951,22956743.947841525,182086048.88491046,2.0,730.0,613.7085285423333,675.3333333333334,423.30300000000005
-200.0,92.43463710876708,58.1648107605309,0.012073570605257001,5.4033102549598265e-05,17070196.952769265,9481560.991259497,203557782.23581663,2.5,730.0,1898.6466496909852,764.0,633.397
-200.0,22.20712419178993,110.90564724285841,0.012028300498436001,5.300936790950896e-05,33684777.750834756,-2737996.9920016364,269611304.5710242,3.0,730.0,2599.142369018984,1094.0,1021.364
-200.0,498.67121606483556,0.00019897521009900002,0.036630761472648335,0.00012922929647666667,-39.74454714509891,69031470.78202595,465694595.8213479,2.0,2190.0,3189.651579901667,1238.6666666666667,2594.2239999999997
-200.0,498.66930360772693,0.000603047786887,0.036650516099881,8.444518671390059e-05,89.60649147772652,69031222.66486628,465694446.14941394,2.5,2190.0,7486.272926742036,1404.0,4321.006
-200.0,463.9208907227657,13.48124041390044,0.036619672464520005,7.151373528647054e-05,4463194.782620118,63514022.613378815,469170532.7567904,3.0,2190.0,9802.36950073298,1783.0,5854.147
-200.0,330.58559725752554,0.0033960858283070003,0.073680027248996,0.000135800064769,985.208072409368,50942612.73691359,388573106.7358585,2.5,4380.0,14110.997642497008,1533.0,7494.941000000001
-200.0,118.4388,37.9098,0.1515,0.0001835,12095933.0,17860958.0,257857205.0,3.0,8736.0,78347.0,2607.0,68485.542
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc015753af478334b21145f8f8b029079d1c17384aaa39a788f3bd84128b69a6
+size 2712

dispatches/case_studies/renewables_case/load_parameters.py

@@ -77,17 +77,23 @@
 
 df = df[df.index.isin(ix)]
 
-bus = "309"
-market = "DA"
-prices = df[f"{bus}_{market}LMP"].values
+bus = "303"
+market = "Both"
+if market == "Both":
+    prices = np.max((df[f"{bus}_DALMP"].values, df[f"{bus}_RTLMP"].values), axis=0)
+else:
+    prices = df[f"{bus}_{market}LMP"].values
 prices_used = copy.copy(prices)
-prices_used[prices_used > 200] = 200
+# prices_used[prices_used > 200] = 200
 weekly_prices = prices_used.reshape(52, 168)
 # n_time_points = 7 * 24
 
 n_timesteps = len(prices)
 
-wind_cfs = df[f"{bus}_WIND_1-{market}CF"].values
+if market == "Both":
+    wind_cfs = df[f"{bus}_WIND_1-RTCF"].values
+else:
+    wind_cfs = df[f"{bus}_WIND_1-{market}CF"].values
 
 wind_capacity_factors = {t:
                             {'wind_resource_config': {
@@ -98,16 +104,6 @@
 N = 30                                      # years
 PA = ((1+i)**N - 1)/(i*(1+i)**N)            # present value / annuity = 1 / CRF
 
-# wind resource data from example Wind Toolkit file
-wind_data = SRW_to_wind_data(re_case_dir / 'data' / '44.21_-101.94_windtoolkit_2012_60min_80m.srw')
-wind_speeds = [wind_data['data'][i][2] for i in range(8760)]
-
-wind_resource = {t:
-                    {'wind_resource_config': {
-                         'resource_speed': [wind_speeds[t]]
-                    }
-                } for t in range(8760)}
-
 default_input_params = {
     "wind_mw": fixed_wind_mw,
     "wind_mw_ub": wind_mw_ub,
@@ -119,7 +115,7 @@
     "tank_type": "simple",
     "turb_mw": turb_p_mw,
 
-    "wind_resource": wind_resource,
+    "wind_resource": wind_capacity_factors,
     "h2_price_per_kg": h2_price_per_kg,
     "DA_LMPs": prices_used,
 

dispatches/case_studies/renewables_case/wind_battery_PEM_LMP.py

@@ -220,6 +220,8 @@ def wind_battery_pem_optimize(time_points, input_params=default_input_params, ve
         for blk in blks:
             if not input_params['extant_wind']:
                 blk.fs.windpower.system_capacity.unfix()
+            else:
+                m.wind_system_capacity.fix(input_params['wind_mw'] * 1e3)
             blk.fs.battery.nameplate_power.unfix()
     else:
         m.pem_system_capacity.fix(input_params['pem_mw'] * 1e3)

dispatches/case_studies/renewables_case/wind_battery_double_loop.py

@@ -21,7 +21,6 @@
 import pandas as pd
 from collections import deque
 from functools import partial
-from dispatches.case_studies.renewables_case.load_parameters import wind_speeds
 
 
 def create_multiperiod_wind_battery_model(n_time_points, wind_cfs, input_params):