HOPP v2.1.0 -> develop (#256)

* Bump version to 2.1.0 * Update README The conda build is not currently working, so I've removed it from the install instructions for now. Also, as per [ref #193] I've updated the install instructions to use a pinned version of `coin-or-cbc`. * Re-run example notebooks
NREL · Nov 27, 2023 · b8dd4a8 · b8dd4a8
1 parent e8d8b86
commit b8dd4a8
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -17,18 +17,6 @@ solar and storage.
     pip install HOPP
     ```
 
-    or as a conda package:
-
-    ```
-    conda install hopp -c nrel -c conda-forge -c sunpower
-    ```
-
-    NOTE: If you install from conda you will need to install `global-land-mask` from PyPi:
-
-    ```
-    pip install global-land-mask
-    ```
-
 ## Installing from Source
 1. Using Git, navigate to a local target directory and clone repository:
     ```
@@ -48,14 +36,19 @@ solar and storage.
 
 4. Install dependencies:
     ```
-    conda install -c conda-forge coin-or-cbc -y
+    conda install -c conda-forge coin-or-cbc=2.10.8 -y
     conda install -c conda-forge glpk -y
     pip install -r requirements.txt
-    pip install -r requirements-dev.txt
     ```
 
     Note if you are on Windows, you will have to manually install Cbc: https://github.com/coin-or/Cbc
 
+    If you also want development dependencies for running tests and building docs:
+
+    ```
+    pip install -r requirements-dev.txt
+    ```
+
 5. Install HOPP:
     ```
     pip install -e .

diff --git a/examples/01-wind-solar.ipynb b/examples/01-wind-solar.ipynb
@@ -26,7 +26,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "/Users/cirmas/workspace/HOPP/examples/workshop/log/hybrid_systems_2023-10-23T12.26.42.533329.log\n"
+      "/Users/cirmas/workspace/HOPP/examples/log/hybrid_systems_2023-11-22T11.22.32.144293.log\n"
      ]
     }
    ],
@@ -92,12 +92,12 @@
       "Wind Installed Cost: 72700000.0\n",
       "Solar Installed Cost: 48000000.0\n",
       "Hybrid Installed Cost: 120700000.0\n",
-      "Wind NPV: -58492882.36461778\n",
-      "Solar NPV: -35042037.04939877\n",
-      "Hybrid NPV: -95120916.57322481\n",
-      "{\"pv\": 104053614.17593749, \"wind\": 162478037.0463255, \"hybrid\": 254922552.1307209}\n",
-      "{\"pv\": 23.75653291688071, \"wind\": 37.09544224801952, \"hybrid\": 30.425987582450112}\n",
-      "{\"pv\": -35042037.04939877, \"wind\": -58492882.36461778, \"hybrid\": -95120916.57322481}\n"
+      "Wind NPV: -47401363.61809909\n",
+      "Solar NPV: -33636480.232181095\n",
+      "Hybrid NPV: -83204102.48278144\n",
+      "{\"pv\": 104289820.46059448, \"wind\": 156936144.3525474, \"hybrid\": 250449987.43150324}\n",
+      "{\"pv\": 30.95359968008512, \"wind\": 35.830169943503975, \"hybrid\": 33.70992200288708}\n",
+      "{\"pv\": -33636480.232181095, \"wind\": -47401363.61809909, \"hybrid\": -83204102.48278144}\n"
      ]
     }
    ],
@@ -131,9 +131,9 @@
    "hash": "c4181dcdfcea4d6481020f2ce48a9cbe5cdfeb7af5e211e5dfd3ac596bfed8bd"
   },
   "kernelspec": {
-   "display_name": "hopp-dev-refactor",
+   "display_name": "hopp",
    "language": "python",
-   "name": "python3"
+   "name": "hopp"
   },
   "language_info": {
    "codemirror_mode": {
@@ -145,7 +145,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.17"
+   "version": "3.8.18"
   }
  },
  "nbformat": 4,

diff --git a/examples/02-wind-solar-api.ipynb b/examples/02-wind-solar-api.ipynb
@@ -26,7 +26,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "/Users/cirmas/workspace/HOPP/examples/workshop/log/hybrid_systems_2023-10-23T13.52.48.948995.log\n"
+      "/Users/cirmas/workspace/HOPP/examples/log/hybrid_systems_2023-11-22T11.23.26.584785.log\n"
      ]
     }
    ],
@@ -138,12 +138,12 @@
       "Wind Installed Cost: 72700000.0\n",
       "Solar Installed Cost: 48000000.0\n",
       "Hybrid Installed Cost: 120700000.0\n",
-      "Wind NPV: -47742400.774270594\n",
-      "Solar NPV: -26412928.585828584\n",
-      "Hybrid NPV: -76621678.51184756\n",
-      "{\"pv\": 104053614.17593749, \"wind\": 162478037.0463255, \"hybrid\": 254922552.1307209}\n",
-      "{\"pv\": 23.75653291688071, \"wind\": 37.09544224801952, \"hybrid\": 30.425987582450112}\n",
-      "{\"pv\": -26412928.585828584, \"wind\": -47742400.774270594, \"hybrid\": -76621678.51184756}\n"
+      "Wind NPV: -37054112.94902411\n",
+      "Solar NPV: -24986062.58280176\n",
+      "Hybrid NPV: -65015880.48273513\n",
+      "{\"pv\": 104289820.46059448, \"wind\": 156936144.3525474, \"hybrid\": 250449987.43150324}\n",
+      "{\"pv\": 30.95359968008512, \"wind\": 35.830169943503975, \"hybrid\": 33.70992200288708}\n",
+      "{\"pv\": -24986062.58280176, \"wind\": -37054112.94902411, \"hybrid\": -65015880.48273513}\n"
      ]
     }
    ],
@@ -176,9 +176,9 @@
    "hash": "c4181dcdfcea4d6481020f2ce48a9cbe5cdfeb7af5e211e5dfd3ac596bfed8bd"
   },
   "kernelspec": {
-   "display_name": "hopp-dev-refactor",
+   "display_name": "hopp",
    "language": "python",
-   "name": "python3"
+   "name": "hopp"
   },
   "language_info": {
    "codemirror_mode": {
@@ -190,9 +190,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.17"
+   "version": "3.8.18"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/examples/03-wind-solar-battery.ipynb b/examples/03-wind-solar-battery.ipynb
diff --git a/examples/04-load-following-battery.ipynb b/examples/04-load-following-battery.ipynb
diff --git a/examples/05-floris-wake-model.ipynb b/examples/05-floris-wake-model.ipynb
diff --git a/examples/06-wave-wind.ipynb b/examples/06-wave-wind.ipynb
@@ -26,7 +26,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "/Users/kbrunik/github/forked/HOPP/examples/workshop/log/hybrid_systems_2023-10-25T08.20.44.417405.log\n"
+      "/Users/cirmas/workspace/HOPP/examples/log/hybrid_systems_2023-11-22T11.38.15.891658.log\n"
      ]
     }
    ],
@@ -69,7 +69,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -102,7 +102,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -119,7 +119,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -131,7 +131,7 @@
     "\t'device_spacing':600,\n",
     "\t'row_spacing': 600,\n",
     "\t'cable_system_overbuild': 20\n",
-    "\t}\n",
+    "}\n",
     "hi.system.wave.create_mhk_cost_calculator(cost_model_inputs)"
    ]
   },
@@ -145,7 +145,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -162,7 +162,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -199,9 +199,9 @@
    "hash": "c4181dcdfcea4d6481020f2ce48a9cbe5cdfeb7af5e211e5dfd3ac596bfed8bd"
   },
   "kernelspec": {
-   "display_name": "Python 3.8.17 ('storage')",
+   "display_name": "hopp",
    "language": "python",
-   "name": "python3"
+   "name": "hopp"
   },
   "language_info": {
    "codemirror_mode": {
@@ -213,10 +213,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.17"
-  },
-  "orig_nbformat": 4
+   "version": "3.8.18"
+  }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/examples/07-wind-solar-electrolyzer.ipynb b/examples/07-wind-solar-electrolyzer.ipynb
diff --git a/hopp/version.py b/hopp/version.py
@@ -1 +1 @@
-2.0.0
+2.1.0