Skip to content

Commit 5302430

Browse files
authored
Update Python docs to new module structure (#302)
1 parent 43a2d3f commit 5302430

30 files changed

+229
-489
lines changed

docs/api/dft.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,11 @@ Implementations of Helmholtz energy functionals for DFT.
2727
.. autosummary::
2828
:toctree: generated/
2929
30-
State
31-
StateVec
32-
PhaseEquilibrium
33-
PhaseDiagram
34-
Contributions
35-
Verbosity
3630
FMTVersion
3731
DFTSolver
3832
```
3933

40-
## Interfaces
34+
## Vapor-liquid interfaces
4135

4236
```{eval-rst}
4337
.. autosummary::

docs/api/dippr.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

docs/api/eos.md

Lines changed: 0 additions & 75 deletions
This file was deleted.

docs/api/epcsaft.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

docs/api/gc_pcsaft.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

docs/api/index.md

Lines changed: 93 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,107 @@
11
# API
22

3-
## Modules
3+
The key data structure in FeOs is the `EquationOfState` class that contains all implemented equations of state.
4+
The `State` and `PhaseEquilibrium` objects are used to define thermodynamic conditions and -- once created -- can be used to compute properties.
5+
6+
If you want to adjust parameters of a model to experimental data you can use classes and utilities from the `estimator` module. (TODO)
7+
8+
## The `EquationOfState` class
9+
10+
### Residual Helmholtz energy models
411

512
```{eval-rst}
6-
.. toctree::
7-
:maxdepth: 1
13+
.. currentmodule:: feos
814
9-
eos
10-
dft
15+
.. autosummary::
16+
EquationOfState.pcsaft
17+
EquationOfState.epcsaft
18+
EquationOfState.gc_pcsaft
19+
EquationOfState.peng_robinson
20+
EquationOfState.pets
21+
EquationOfState.uvtheory
22+
EquationOfState.saftvrmie
23+
EquationOfState.saftvrqmie
24+
```
25+
26+
### Ideal gas models
27+
28+
```{eval-rst}
29+
.. currentmodule:: feos
30+
31+
.. autosummary::
32+
EquationOfState.dippr
33+
EquationOfState.joback
34+
```
35+
36+
37+
### Example: Combine a DIPPR ideal gas model with PC-SAFT
38+
39+
```python
40+
from feos import EquationOfState
41+
from feos.parameters import Parameters
42+
43+
pc_saft_parameters = Parameters.from_json(
44+
['methane', 'ethane'],
45+
'pc_saft_parameters.json'
46+
)
47+
dippr_parameters = Parameters.from_json(
48+
['methane', 'ethane'],
49+
'dippr_parameters.json'
50+
)
51+
eos = EquationOfState.pcsaft(pc_saft_parameters).dippr(dippr_parameters)
52+
```
53+
54+
### Example: Combine the ideal gas model of Joback & Reid with PC-SAFT
55+
56+
```python
57+
from feos import EquationOfState
58+
from feos.parameters import Parameters
59+
60+
pc_saft_parameters = Parameters.from_json_smiles(
61+
['CCC', 'CCCC'],
62+
'smarts.json',
63+
'pcsaft_group_parameters.json'
64+
)
65+
joback_parameters = Parameters.from_json_smiles(
66+
['CCC', 'CCCC'],
67+
'smarts.json',
68+
'joback_parameters.json'
69+
)
70+
eos = EquationOfState.pcsaft(pc_saft_parameters).joback(joback_parameters)
71+
```
72+
73+
### Models defined in Python
74+
75+
```{eval-rst}
76+
.. currentmodule:: feos
77+
78+
.. autosummary::
79+
EquationOfState.python_residual
80+
EquationOfState.python_ideal_gas
1181
```
1282

13-
## Model specific modules
83+
## Data types
84+
85+
```{eval-rst}
86+
.. currentmodule:: feos
87+
88+
.. autosummary::
89+
:toctree: generated/
90+
EquationOfState
91+
Contributions
92+
Verbosity
93+
State
94+
StateVec
95+
PhaseEquilibrium
96+
PhaseDiagram
97+
```
1498

15-
These modules contain the objects to e.g. read parameters from files or build parameters from records in Python.
99+
## Modules
16100

17101
```{eval-rst}
18102
.. toctree::
19103
:maxdepth: 1
20104
21-
pcsaft
22-
epcsaft
23-
gc_pcsaft
24-
peng_robinson
25-
pets
26-
uvtheory
27-
saftvrmie
28-
saftvrqmie
29-
joback
30-
dippr
105+
parameters
106+
dft
31107
```

docs/api/joback.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)