Skip to content

Commit f844965

Browse files
authored
Merge pull request #4 from pzarabadip/dev
Dev
2 parents 3192784 + 2c372bb commit f844965

33 files changed

+2604
-2647
lines changed

.gitignore0

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

README.md

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,41 @@ repository.
66
* WorkChains which are developed by myself.
77
* WorkChains which have been developed on top of [AiiDA LSMO WorkChains](https://github.com/danieleongari/aiida-lsmo) for the purpose of my research but are provided here for now due to considerable deviation from
88
original design.
9-
* Information about other WorkChains from other groups which we are using for out research .
9+
* Information about other WorkChains from other groups which we are using for our research .
10+
11+
# Prerequisites
12+
To use `AiiDA-MatDis` workchains use the following packages:
13+
* [`aiida-lsmo`](https://github.com/lsmo-epfl/aiida-lsmo)
14+
* [`aiida-porousmaterials`](https://github.com/pzarabadip/aiida-porousmaterials)
15+
* [`aiida-raspa`](https://github.com/yakutovicha/aiida-raspa)
16+
* [`aiida-zeopp`](https://github.com/ltalirz/aiida-zeopp)
17+
18+
**NOTE** Workchains currently are tested with [`AiiDA Core v1.0.1`](https://github.com/aiidateam/aiida-core/tree/v1.0.1)
19+
# Installation
20+
`git clone https://github.com/pzarabadip/aiida-MatDis`
21+
22+
`pip install -e .`
23+
# Brief Description of WorkChains
24+
* `VoronoiEnergyWorkChain`: Calculation of Voronoi energies using `aiida-zeopp` and `aiida-porousmaterials`
25+
* `VLCCWorkChain`: Construction of vapor-liquid coexistence curves using `aiida-raspa`
26+
27+
**NOTE** Following workchains are developed on top of [`LSMO IsothermWC`](https://github.com/lsmo-epfl/aiida-lsmo) to add multi-component feature with some changes. If you are interested in calculating single-component adsorption isotherms please visit [`aiida-lsmo` repository](https://github.com/lsmo-epfl/aiida-lsmo). You also can find other interesting and very well developed workchains there.
28+
29+
* `HTSWorkChain`: Calculation of multi component adsorption for a few pressure points using `aiida-zeopp` and `aiida-raspa` plugins. It submits all `RASPA` calculations in parallel.
30+
* `HTSMultiTWorkChain`: Similar to `HTSWorkChain` for obtatining the multi-component adsorption values at different temperatures.
31+
* `HTSEvWorkChain`: It is a modified version of `HTSWorkChain` which takes the output dictionary of `VoronoiEnergyWorkChain` and performs the consequent calculations.
32+
* `MultiCompIsothermWorkChain`: It can be used to construct a full range multi-component adsorption isotherm. Here the difference with `HTSWorkChain` is that similar to `IsothermWC` from `aiida-lsmo`, calculations at higher pressure points are using the final configuration from the previous point.
33+
34+
**NOTE** Isotherm wokchains all benefit from `FFBuilder` of `aiida-lsmo` to construct force field definition files.
35+
36+
# Citation
37+
If you benefit from `AiiDA` in your research, please cite [this paper](https://www.sciencedirect.com/science/article/pii/S0927025615005820?via%3Dihub) by *G. Pizzi et. al.*
38+
If you use above-mentioned workchains for gas adsorption, please cite [this paper](https://pubs.acs.org/doi/10.1021/acscentsci.9b00619) by *D. Ongari et. al.*
39+
40+
# Documentation
41+
Documentation for each WorkChain including the references, sources, know-hows, etc are provided in
42+
the [Wiki](https://github.com/pzarabadip/aiida-MatDis/wiki) (In Progress).
43+
44+
# Acknowledgment
45+
I would like to thank the funding received from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie Actions and cofinancing by the South Moravian Region under agreement 665860. This software reflects only the authors’ view and the EU is not responsible for any use that may be made of the information it contains.
1046

11-
**NOTE**: Documentation for each WorkChain including the references, sources, know-hows, etc are provided in
12-
the [Wiki](https://github.com/pzarabadip/aiida-MatDis/wiki).
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# -*- coding: utf-8 -*-
2+
"""Copied from aiida-lsmo utils"""
3+
from __future__ import absolute_import
4+
from .multiply_unitcell import get_replciation_factors
5+
from .general import (get_molecules_input_dict,
6+
get_molecule_dict,
7+
get_ff_parameters,
8+
get_atomic_radii,
9+
get_geometric_output,
10+
get_pressure_list,
11+
choose_pressure_points,
12+
get_output_parameters,
13+
get_vlcc_output,
14+
get_temperature_points,
15+
extract_merge_outputs,
16+
update_components,
17+
modify_zeopp_parameters,
18+
modify_pm_parameters,
19+
extract_wrap_results)
20+
from .other import update_workchain_params, dict_merge

0 commit comments

Comments
 (0)