Merge remote-tracking branch 'origin/main'

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.4 (2024-03-12)
+
+### Fix
+
+- Remove whitespace from timestamp (due to CPLEX file path issue)
+
 ## 0.1.3 (2024-03-12)
 
 ### Fix

docs/source/getting_started.md

@@ -105,7 +105,7 @@ conda init zsh
 Earlier versions of macOS use `bash`, so replace `zsh` in the command above with `bash`.
 
 ````
-
+(conda_command)=
 ### Creating the Environment
 
 We will use the `conda` command to create an isolated environment for the Resolve to run within, without 
@@ -116,12 +116,12 @@ file at the top level of the repository. Open your shell of choice and navigate
 Then, run the following command:
 
 -  Create an environment called `resolve-env`:
-    ```
+    ```bash
     conda env create -f environment.yml
     ```
 
 - To activate the environment, set it as the project default in your IDE or use the following command:
-    ```
+    ```bash
     conda activate resolve-env 
     ```
 
@@ -183,4 +183,25 @@ follow the vendor installation & licensing instructions.
 See [](./running_resolve.md) for instructions on how to change which solver `Resolve` uses.
 
 
-That's it! 
+That's it! 
+
+## Frequently Asked Questions
+
+:::{dropdown} How do I fix a `No module named 'resolve'` error message?
+
+![](../../source/_images/no_module_named_resolve.png)
+
+1. On the `Cover & Configuration` tab, check that the `Python Path` input is filled in with a valid file path to a 
+python executable (as described in {ref}`conda_command`)
+2. If the `Cover & Configuration` tab looks correct, you may need to re-install your `conda` environment. The fastest 
+way to do so is as follows:
+   1. From a shell (e.g., Command Prompt or Anaconda Prompt), use the command: 
+   ```bash
+   conda env remove -n resolve-env --yes
+   ```
+   2. Reinstall the environment as described before, using the command from the top level of your `resolve` project folder:
+   ```bash
+   conda env create -f environment.yml
+   ```
+
+:::

docs/source/index.md

@@ -52,9 +52,24 @@ viewing_results
 ```
 
 :::{toctree}
-:caption: Related Links
+:caption: CPUC IRP Links
 :hidden:
 
-E3 Homepage <https://www.ethree.com/>
 2022-23 CPUC IRP PSP <https://www.cpuc.ca.gov/industries-and-topics/electrical-energy/electric-power-procurement/long-term-procurement-planning/2022-irp-cycle-events-and-materials>
+:::
+
+:::{toctree}
+:caption: CEC EPC-19-056 Links
+:hidden:
+
+CEC Project Page <https://www.energizeinnovation.fund/projects/assessing-long-duration-energy-storage-deployment-scenarios-meet-californias-energy-goals>
+E3 Modeling Dataset <https://zenodo.org/doi/10.5281/zenodo.10866454>
+Form Energy Dataset <https://zenodo.org/doi/10.5281/zenodo.8045595>
+:::
+
+:::{toctree}
+:caption: E3 Links
+:hidden:
+
+E3 Homepage <https://www.ethree.com/>
 :::

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name="resolve"
 description="Resolve capacity expansion model."
-version="0.1.3"
+version="0.1.4"
 authors=[
     { name = "Energy and Environmental Economics, Inc." }
 ]