Skip to content
This repository was archived by the owner on Apr 6, 2023. It is now read-only.

Commit 0a28cdb

Browse files
bpaul4lbianchi-lbl
authored andcommitted
Reorganize unit model notebooks, minor CSTR updates (#80)
* Reorganize unit model notebooks, minor CSTR updates * Added scaling to fix HC Processing timeout error * New initialization file * Minor fixes to index files
1 parent 219988e commit 0a28cdb

27 files changed

+367
-271
lines changed

README-developer.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ in the appropriate folder under `src/` with that name. For example, if you are a
4141
that are being added under that subfolder. For each notebook, add an entry with the name of the notebook,
4242
exactly matching the filename, a colon, and the description. Use existing entries as a template.
4343

44-
6. If you added a subfolder, add this to the `build.yml` file, so the build process will see it. Otherwise,
45-
you should not need to do anything with this file.
44+
6. If you added a subfolder, add this to the `build.yml` file, so the build process will see it. To update the CI
45+
jobs, add this to the `build-ci.yml` file as well so the build process will see it during integration testing.
46+
Otherwise, you should not need to do anything with this file.
4647

4748
7. Add the notebook to the documentation section. This means that you need to add a line in a file called `index.rst`
4849
in a directory under `docs/` matching the directory for the notebook under `src`. So, for the

build-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ notebook:
3131
- source: Examples/SurrMod/Helmet
3232
- source: Examples/SurrMod/PySMO
3333
- source: Examples/Tools
34-
- source: Examples/UnitModels
34+
- source: Examples/UnitModels/Operations
35+
- source: Examples/UnitModels/Reactors
3536
- source: Examples/Pecos
3637
- source: Tutorials/Advanced/ParamEst
3738
- source: Tutorials/Basics

build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ notebook:
4242
# - source: Examples/SurrMod/RIPE
4343
# match: "RIPE_.*"
4444
- source: Examples/Tools
45-
- source: Examples/UnitModels
45+
- source: Examples/UnitModels/Operations
4646
- source: Examples/UnitModels/Reactors
4747
- source: Examples/Pecos
4848
- source: Tutorials/Advanced/ParamEst
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Operations
2+
===========
3+
Descriptive examples showing how to use some common IDAES unit models.
4+
5+
.. toctree::
6+
Compressor <compressor_doc>
7+
Heater <heater_doc>
8+
Mixer <mixer_doc>
9+
Pump <pump_doc>

docs/Examples/UnitModels/index.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ Unit models
33
Descriptive examples showing how to use some common IDAES unit models.
44

55
.. toctree::
6-
Compressor <compressor_doc>
7-
Heater <heater_doc>
8-
Mixer <mixer_doc>
9-
Pump <pump_doc>
6+
Operations/index
7+
Reactors/index

notebook_index.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,24 @@ contents:
101101
title: "Unit Models"
102102
description: Unit model examples
103103
subfolders:
104+
-
105+
name: Operations
106+
title: "Operations"
107+
description: Detailed examples on importing and implementing IDAES unit models in flowsheets
108+
notebooks:
109+
- compressor: "Compressor Unit Model with Span-Wagner Property Package for supercritical CO2"
110+
- heater: >
111+
Heat a liquid mixture of benzene-toluene using a simple heater unit model and
112+
an ideal property package
113+
- mixer: Mixer unit model with ideal property package
114+
- pump: Pump unit model with iapws property package
115+
- heat exchanger 0D: Heat Exchanger 0D unit model heating a benzene-toluene mixture using steam
104116
-
105117
name: Reactors
106118
title: "Reactors"
107119
description: Detailed examples on importing and implementing IDAES reactor models in flowsheets
108120
notebooks:
109121
- cstr: CSTR unit model with ideal property package, pure liquid phase and rate-kinetics reaction
110-
notebooks:
111-
- compressor: "Compressor Unit Model with Span-Wagner Property Package for supercritical CO2"
112-
- heater: >
113-
Heat a liquid mixture of benzene-toluene using a simple heater unit model and
114-
an ideal property package
115-
- mixer: Mixer unit model with ideal property package
116-
- pump: Pump unit model with iapws property package
117-
- heat exchanger 0D: Heat Exchanger 0D unit model heating a benzene-toluene mixture using steam
118122
-
119123
name: Tools
120124
title: Tools for working with IDAES
Binary file not shown.

src/Examples/Advanced/CustomProperties/Hydrocarbon_Processing_example.ipynb

Lines changed: 243 additions & 158 deletions
Large diffs are not rendered by default.

src/Examples/UnitModels/Reactors/cstr_testing.ipynb

Lines changed: 84 additions & 91 deletions
Large diffs are not rendered by default.

src/notebook_index.ipynb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,22 @@
102102
"### Unit Models\n",
103103
"Unit model examples\n",
104104
"\n",
105+
"<a id='examples.unitmodels.operations'></a>\n",
106+
"\n",
107+
"#### Operations\n",
108+
"Detailed examples on importing and implementing IDAES unit models in flowsheets\n",
109+
" * [compressor](Examples/UnitModels/Operations/compressor.ipynb) - Compressor Unit Model with Span-Wagner Property Package for supercritical CO2\n",
110+
" * [heater](Examples/UnitModels/Operations/heater.ipynb) - Heat a liquid mixture of benzene-toluene using a simple heater unit model and an ideal property package\n",
111+
"\n",
112+
" * [mixer](Examples/UnitModels/Operations/mixer.ipynb) - Mixer unit model with ideal property package\n",
113+
" * [pump](Examples/UnitModels/Operations/pump.ipynb) - Pump unit model with iapws property package\n",
114+
" * [heat exchanger 0D](Examples/UnitModels/Operations/heat%20exchanger%200D.ipynb) - Heat Exchanger 0D unit model heating a benzene-toluene mixture using steam\n",
115+
"\n",
105116
"<a id='examples.unitmodels.reactors'></a>\n",
106117
"\n",
107118
"#### Reactors\n",
108119
"Detailed examples on importing and implementing IDAES reactor models in flowsheets\n",
109120
" * [cstr](Examples/UnitModels/Reactors/cstr.ipynb) - CSTR unit model with ideal property package, pure liquid phase and rate-kinetics reaction\n",
110-
" * [compressor](Examples/UnitModels/compressor.ipynb) - Compressor Unit Model with Span-Wagner Property Package for supercritical CO2\n",
111-
" * [heater](Examples/UnitModels/heater.ipynb) - Heat a liquid mixture of benzene-toluene using a simple heater unit model and an ideal property package\n",
112-
"\n",
113-
" * [mixer](Examples/UnitModels/mixer.ipynb) - Mixer unit model with ideal property package\n",
114-
" * [pump](Examples/UnitModels/pump.ipynb) - Pump unit model with iapws property package\n",
115-
" * [heat exchanger 0D](Examples/UnitModels/heat%20exchanger%200D.ipynb) - Heat Exchanger 0D unit model heating a benzene-toluene mixture using steam\n",
116121
"\n",
117122
"<a id='examples.tools'></a>\n",
118123
"\n",

0 commit comments

Comments
 (0)