Skip to content

Commit 98c276e

Browse files
authored
Merge pull request #171 from abce-dev/remove_ALEAF
Remove ALEAF
2 parents 7fc5896 + 7fa8819 commit 98c276e

11 files changed

Lines changed: 31 additions & 1437 deletions

README.md

Lines changed: 15 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ ABCE is a module to perform agent-based capacity expansion (CE) modeling for ele
1010
* [Installation](#installation)
1111
- [Linux / MacOS / Windows Subsystem for Linux](#linux--macos--windows-subsystem-for-linux)
1212
- [Windows 10](#windows-10)
13-
- [Optional, Argonne only: installing with A-LEAF](#optional--argonne-only-installing-with-a-leaf)
1413
- [Optional: installing with CPLEX](#optional-installing-with-cplex)
1514
* [Usage](#usage)
1615
- [Running ABCE](#running-abce)
1716
- [Input files](#input-files)
1817
- [Outputs](#outputs)
19-
* [Contributing](#contributing)
20-
* [Testing](#testing)
2118
* [License](#license)
2219

2320
## Installation
@@ -28,33 +25,25 @@ ABCE is a module to perform agent-based capacity expansion (CE) modeling for ele
2825

2926
`git clone https://github.com/abce-dev/abce`
3027

31-
2. If using A-LEAF, see the optional [Installing with A-LEAF](#optional--argonne-only-installing-with-a-leaf) section below. Currently, only users with Argonne gitlab credentials can use A-LEAF, but a public release is coming soon!
28+
2. If using CPLEX, see the optional [Installing with CPLEX](#optional-installing-with-cplex) section below
3229

33-
3. If using CPLEX, see the optional [Installing with CPLEX](#optional-installing-with-cplex) section below
34-
35-
4. Inside your local `abce` directory, run the installation script with:
30+
3. Inside your local `abce` directory, run the installation script with:
3631

3732
`bash ./install.sh`
3833

39-
5. When prompted for the A-LEAF repository, do one of the following:
40-
41-
* Enter the absolute path to the directory where you cloned A-LEAF, or
34+
4. Wait for the installation script to run to completion. Review any errors/issues printed for your reference at the end of execution.
4235

43-
* Press Enter without entering any text, if not using A-LEAF
36+
5. Restart your terminal session, or re-source your `.bashrc` file.
4437

45-
6. Wait for the installation script to run to completion. Review any errors/issues printed for your reference at the end of execution.
46-
47-
7. Restart your terminal session, or re-source your `.bashrc` file.
48-
49-
8. If using Conda to manage environments, activate the ABCE conda environment with:
38+
6. If using Conda to manage environments, activate the ABCE conda environment with:
5039

5140
`conda activate abce_env`
5241

53-
9. Rerun the installation script to complete the environment setup:
42+
7. Rerun the installation script to complete the environment setup:
5443

5544
`bash ./install.sh`
5645

57-
10. Test the installation using one of the examples:
46+
8. Test the installation using one of the examples:
5847

5948
`cd examples/single_agent_example`
6049

@@ -64,7 +53,7 @@ ABCE is a module to perform agent-based capacity expansion (CE) modeling for ele
6453

6554
`python ../../run.py --settings_file=./settings.yml --inputs_path=.`
6655

67-
11. Once the previous command runs to completion without failing, generate a precompiled Julia sysimage file from within the `abce/env` directory.
56+
9. Once the previous command runs to completion without failing, generate a precompiled Julia sysimage file from within the `abce/env` directory.
6857

6958
`julia make_sysimage.jl`
7059

@@ -75,25 +64,23 @@ ABCE is a module to perform agent-based capacity expansion (CE) modeling for ele
7564

7665
2. Download and install [Julia 1.8](https://julialang.org/downloads/). Check the box in the installer to add Julia to the PATH.
7766

78-
3. If using A-LEAF, see the optional [Installing with A-LEAF](#optional--argonne-only-installing-with-a-leaf) section below. Currently, only users with Argonne gitlab credentials can use A-LEAF, but a public release is coming soon!
79-
80-
4. If using CPLEX, see the optional [Installing with CPLEX](#optional-installing-with-cplex) section below
67+
3. If using CPLEX, see the optional [Installing with CPLEX](#optional-installing-with-cplex) section below
8168

82-
5. Using the Anaconda Powershell, clone this repo to your local machine:
69+
4. Using the Anaconda Powershell, clone this repo to your local machine:
8370

8471
`git clone https://github.com/abce-dev/abce`
8572

86-
6. Create the local conda environment:
73+
5. Create the local conda environment:
8774

8875
`conda env create -f .\environment_win.yml`
8976

90-
7. Activate the `abce_anv` conda environment:
77+
6. Activate the `abce_anv` conda environment:
9178

9279
`conda activate abce_env`
9380

94-
8. Set the `ABCE_DIR` environment variable to the absolute path to your `abce` repo (e.g. `C:\Users\myname\abce`)
81+
7. Set the `ABCE_DIR` environment variable to the absolute path to your `abce` repo (e.g. `C:\Users\myname\abce`)
9582

96-
9. Test the installation using one of the examples:
83+
8. Test the installation using one of the examples:
9784

9885
`cd examples\single_agent_example`
9986

@@ -103,30 +90,10 @@ ABCE is a module to perform agent-based capacity expansion (CE) modeling for ele
10390

10491
`python ..\..\run.py --settings_file=.\settings.yml --inputs_path=.`
10592

106-
10. Once the previous command runs to completion without failing, generate a precompiled Julia sysimage file from within the `abce\env` directory.
107-
108-
`julia make_sysimage.jl`
109-
110-
### Optional / Argonne only: installing with A-LEAF
111-
112-
1. Clone the ABCE A-LEAF repo:
113-
114-
`git clone git-out.gss.anl.gov/kbiegel/kb_aleaf`
115-
116-
2. Inside the A-LEAF directory, run the A-LEAF environment setup script:
117-
118-
`julia make_julia_environment.jl`
119-
120-
3. Test the A-LEAF install by running the following within your A-LEAF directory:
121-
122-
`julia execute_ALEAF.jl`
123-
124-
4. Once the previous command runs to completion without failing, generate a precompiled Julia sysimage file with:
93+
9. Once the previous command runs to completion without failing, generate a precompiled Julia sysimage file from within the `abce\env` directory.
12594

12695
`julia make_sysimage.jl`
12796

128-
5. Set the `ALEAF_DIR` environment variable to the absolute path to your A-LEAF repo
129-
13097
### Optional: installing with CPLEX
13198

13299
1. Download the [CPLEX (IBM ILOG STUDIO 20.10) binaries](https://www.ibm.com/docs/en/icos/20.1.0?topic=cplex-installing)
@@ -226,14 +193,6 @@ ABCE also outputs plots of the evolution of the overall system portfolio and the
226193
### Use ABCE with `watts`
227194
The[ Workflow and Template Toolkit for Simulations (`watts`)](https://github.com/watts-dev/watts) has a plugin for ABCE. Please see the `watts` documentation for usage. This workflow tool is useful for conducting sensitivity analyses and other experiments with ABCE.
228195

229-
## Testing
230-
231-
### Julia Unit Tests
232-
233-
Julia tests may be run with the following command from within the `test/` directory:
234-
235-
`bash run_julia_tests.sh`
236-
237196

238197
## License
239198
Copyright 2023 Argonne National Laboratory

0 commit comments

Comments
 (0)