Merge pull request #275 from singularity-energy/development

OGE v0.2.1

data/manual/default_gross_to_net_ratios.csv

@@ -0,0 +1,24 @@
+prime_mover_code,default_gtn_ratio,data_source
+CA,0.97,EIA Electric Power Monthly Technical Notes (Appendix C)
+CS,0.97,EIA Electric Power Monthly Technical Notes (Appendix C)
+CT,0.97,EIA Electric Power Monthly Technical Notes (Appendix C)
+CE,0.97,EIA Electric Power Monthly Technical Notes (Appendix C)
+FC,0.99,EIA Electric Power Monthly Technical Notes (Appendix C)
+GT,0.98,EIA Electric Power Monthly Technical Notes (Appendix C)
+HY,0.99,EIA Electric Power Monthly Technical Notes (Appendix C)
+PS,0.99,EIA Electric Power Monthly Technical Notes (Appendix C)
+IC,0.98,EIA Electric Power Monthly Technical Notes (Appendix C)
+OT,0.97,EIA Electric Power Monthly Technical Notes (Appendix C)
+PV,0.99,EIA Electric Power Monthly Technical Notes (Appendix C)
+ST,0.97,EIA Electric Power Monthly Technical Notes (Appendix C)
+WT,0.99,EIA Electric Power Monthly Technical Notes (Appendix C)
+BA,0.97,"None, using assumed value. This assumption needs to be updated."
+CP,0.97,"None, using assumed value. This assumption needs to be updated."
+FW,0.97,"None, using assumed value. This assumption needs to be updated."
+ES,0.97,"None, using assumed value. This assumption needs to be updated."
+CC,0.97,"None, using assumed value. This assumption needs to be updated."
+HA,0.97,"None, using assumed value. This assumption needs to be updated."
+HB,0.97,"None, using assumed value. This assumption needs to be updated."
+HK,0.97,"None, using assumed value. This assumption needs to be updated."
+BT,0.97,"None, using assumed value. This assumption needs to be updated."
+WS,0.97,"None, using assumed value. This assumption needs to be updated."

data/manual/emission_factors_for_nox.csv

@@ -8,6 +8,9 @@ ST,BFG,N/A,N/A,0.0154,lb,mcf
 ST,BFG,N/A,TANGENTIAL,0.0154,lb,mcf
 ST,BFG,DRY,WALL,0.0154,lb,mcf
 ST,BFG,N/A,WALL,0.0154,lb,mcf
+CA,BIT,DRY,DUCTBURNER,12,lb,ton
+CA,BIT,N/A,DUCTBURNER,12,lb,ton
+CA,BIT,WET,DUCTBURNER,31,lb,ton
 ST,BIT,DRY,CELLBURNER,12,lb,ton
 ST,BIT,DRY,CYCLONE,33,lb,ton
 ST,BIT,N/A,CYCLONE,33,lb,ton
@@ -16,6 +19,8 @@ ST,BIT,DRY,FLUIDIZED,5,lb,ton
 ST,BIT,N/A,FLUIDIZED,5,lb,ton
 ST,BIT,WET,FLUIDIZED,5,lb,ton
 ST,BIT,N/A,N/A,31,lb,ton
+ST,BIT,DRY,N/A,12,lb,ton
+ST,BIT,WET,N/A,31,lb,ton
 ST,BIT,DRY,OTHER,12,lb,ton
 ST,BIT,N/A,OTHER,12,lb,ton
 ST,BIT,WET,OTHER,31,lb,ton
@@ -37,6 +42,8 @@ ST,BLQ,DRY,FLUIDIZED,1.5,lb,ton
 ST,BLQ,N/A,FLUIDIZED,1.5,lb,ton
 ST,BLQ,WET,FLUIDIZED,1.5,lb,ton
 ST,BLQ,N/A,N/A,1.5,lb,ton
+ST,BLQ,DRY,N/A,1.5,lb,ton
+ST,BLQ,WET,N/A,1.5,lb,ton
 ST,BLQ,DRY,OTHER,1.5,lb,ton
 ST,BLQ,N/A,OTHER,1.5,lb,ton
 ST,BLQ,DRY,STOKER,1.5,lb,ton
@@ -100,6 +107,7 @@ GT,JF,N/A,CT,4.9896,lb,barrels
 GT,JF,N/A,N/A,4.9896,lb,barrels
 IC,JF,N/A,N/A,18.144,lb,barrels
 ST,JF,N/A,N/A,1.008,lb,barrels
+CA,KER,N/A,N/A,4.9896,lb,barrels
 CA,KER,N/A,DUCTBURNER,4.9896,lb,barrels
 CA,KER,N/A,OTHER,4.9896,lb,barrels
 CT,KER,N/A,DUCTBURNER,4.9896,lb,barrels
@@ -208,6 +216,8 @@ CA,OBL,N/A,N/A,4.7166,lb,barrels
 CT,OBL,N/A,N/A,4.7166,lb,barrels
 GT,OBL,N/A,N/A,4.7166,lb,barrels
 IC,OBL,N/A,N/A,17.1486,lb,barrels
+ST,OBL,N/A,OTHER,0.798,lb,barrels
+ST,OBL,DRY,TANGENTIAL,0.798,lb,barrels
 ST,OBL,N/A,DUCTBURNER,0.798,lb,barrels
 ST,OBL,N/A,N/A,0.798,lb,barrels
 ST,OBL,DRY,WALL,0.798,lb,barrels
@@ -349,6 +359,7 @@ ST,SLW,WET,FLUIDIZED,5,lb,ton
 ST,SLW,N/A,N/A,5,lb,ton
 ST,SLW,N/A,OTHER,5,lb,ton
 ST,SLW,DRY,STOKER,5,lb,ton
+ST,SLW,WET,STOKER,5,lb,ton
 ST,SLW,DRY,TANGENTIAL,5,lb,ton
 ST,SLW,DRY,WALL,5,lb,ton
 ST,SLW,N/A,WALL,5,lb,ton

data/manual/emission_factors_for_so2.csv

@@ -89,6 +89,7 @@ ST,BFG,STOKER,0.0006,lb,Mcf,0
 ST,BFG,TANGENTIAL,0.0006,lb,Mcf,0
 ST,BFG,VERTICAL,0.0006,lb,Mcf,0
 ST,BFG,WALL,0.0006,lb,Mcf,0
+CA,BIT,DUCTBURNER,38*S,lb,short ton,1
 OT,BIT,CELLBURNER,38*S,lb,short ton,1
 OT,BIT,CYCLONE,38*S,lb,short ton,1
 OT,BIT,DUCTBURNER,38*S,lb,short ton,1

data/manual/plants_not_connected_to_grid.csv

@@ -3,6 +3,7 @@ Plant ID,State,Plant Name
 1594,MA,Blackstone
 2440,SC,AbiBow US Inc. - Catawba Operations
 2549,NY,Huntley Power
+2837,OH,Eastlake
 10071,VA,Virginia Renewable Power-Portsmouth LLC
 10111,MI,DTE Pontiac North LLC
 10381,NC,Coastal Carolina Clean Power LLC

environment.yml

@@ -8,7 +8,6 @@ dependencies:
   - cvxopt
   - cvxpy=1.2.1 # used by gridemissions, newer version not working as of 12/12/2022
   - flake8 # development: linter
-  - geopandas>=0.9,<0.13 # used for pudl
   - ipykernel
   - nomkl # prevent mkl implementation of blas
   - notebook
@@ -18,21 +17,19 @@ dependencies:
   - pip
   - plotly
   - pyarrow
-  - pygeos>=0.10,<0.14 # used for pudl
   - pytest
   - python>=3.10,<3.11 # require 3.10.x for compatibility with pudl
   - python-snappy # used for pudl
   - qdldl-python==0.1.5,!=0.1.5.post2 # used for gridemissions, newer version not working as of 12/12/2022
   - requests>=2.28.1
   - seaborn # used by gridemissions
   - setuptools # used for pudl
-  - shapely>1.8.0,!=1.8.3,<2.1 # used for pudl
   - sqlalchemy
   - sqlite # used for pudl
   - statsmodels
 
   - pip:
-      #- --editable ../pudl #NOTE: this is for development use
-      - git+https://github.com/catalyst-cooperative/pudl.git#egg=catalystcoop.pudl
+      # --editable ../pudl #NOTE: this is for development use
+      - git+https://github.com/grgmiller/pudl.git@oge_release#egg=catalystcoop.pudl
       #- --editable ../gridemissions # NOTE: this is for development use
       - git+https://github.com/gailin-p/gridemissions#egg=gridemissions

notebooks/work_in_progress/manually_import_uncontrolled_emission_factors.ipynb → notebooks/explore_data/manually_import_uncontrolled_emission_factors.ipynb

@@ -280,7 +280,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.4"
+   "version": "3.10.9 | packaged by conda-forge | (main, Jan 11 2023, 15:15:40) [MSC v.1916 64 bit (AMD64)]"
   },
   "vscode": {
    "interpreter": {

notebooks/manual_data/zip_data.ipynb

@@ -29,10 +29,30 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "years = [2019,2020]\n",
+    "years = [2019,2020,2021]\n",
     "\n",
     "output_data.prepare_files_for_upload(years)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "for year in [2019,2020,2021]:\n",
+    "    output_data.zip_results_for_s3(year)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "for year in [2019,2020,2021]:\n",
+    "    output_data.zip_data_for_zenodo(year)"
+   ]
   }
  ],
  "metadata": {
@@ -51,7 +71,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.4"
+   "version": "3.10.8"
   },
   "orig_nbformat": 4,
   "vscode": {

notebooks/validation/validate_vs_egrid.ipynb

@@ -41,7 +41,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "year = 2020"
+    "year = 2021"
    ]
   },
   {
@@ -587,7 +587,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.10.5 ('hourly_egrid')",
+   "display_name": "open_grid_emissions",
    "language": "python",
    "name": "python3"
   },
@@ -601,11 +601,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.5"
+   "version": "3.10.9"
   },
   "vscode": {
    "interpreter": {
-    "hash": "65c02dfd2dc2ef471c0b5088763a28c1faaa7cad28937ca42fadf51e669fd8e8"
+    "hash": "25e36f192ecdbe5da57d9bea009812e7b11ef0e0053366a845a2802aae1b29d2"
    }
   }
  },