Skip to content

Commit

Permalink
Merge pull request #4 from pzarabadip/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
ezpzbz authored Feb 10, 2020
2 parents 3192784 + 2c372bb commit f844965
Show file tree
Hide file tree
Showing 33 changed files with 2,604 additions and 2,647 deletions.
104 changes: 0 additions & 104 deletions .gitignore0

This file was deleted.

40 changes: 37 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,41 @@ repository.
* WorkChains which are developed by myself.
* 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
original design.
* Information about other WorkChains from other groups which we are using for out research .
* Information about other WorkChains from other groups which we are using for our research .

# Prerequisites
To use `AiiDA-MatDis` workchains use the following packages:
* [`aiida-lsmo`](https://github.com/lsmo-epfl/aiida-lsmo)
* [`aiida-porousmaterials`](https://github.com/pzarabadip/aiida-porousmaterials)
* [`aiida-raspa`](https://github.com/yakutovicha/aiida-raspa)
* [`aiida-zeopp`](https://github.com/ltalirz/aiida-zeopp)

**NOTE** Workchains currently are tested with [`AiiDA Core v1.0.1`](https://github.com/aiidateam/aiida-core/tree/v1.0.1)
# Installation
`git clone https://github.com/pzarabadip/aiida-MatDis`

`pip install -e .`
# Brief Description of WorkChains
* `VoronoiEnergyWorkChain`: Calculation of Voronoi energies using `aiida-zeopp` and `aiida-porousmaterials`
* `VLCCWorkChain`: Construction of vapor-liquid coexistence curves using `aiida-raspa`

**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.

* `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.
* `HTSMultiTWorkChain`: Similar to `HTSWorkChain` for obtatining the multi-component adsorption values at different temperatures.
* `HTSEvWorkChain`: It is a modified version of `HTSWorkChain` which takes the output dictionary of `VoronoiEnergyWorkChain` and performs the consequent calculations.
* `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.

**NOTE** Isotherm wokchains all benefit from `FFBuilder` of `aiida-lsmo` to construct force field definition files.

# Citation
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.*
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.*

# Documentation
Documentation for each WorkChain including the references, sources, know-hows, etc are provided in
the [Wiki](https://github.com/pzarabadip/aiida-MatDis/wiki) (In Progress).

# Acknowledgment
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.

**NOTE**: Documentation for each WorkChain including the references, sources, know-hows, etc are provided in
the [Wiki](https://github.com/pzarabadip/aiida-MatDis/wiki).
20 changes: 20 additions & 0 deletions aiida_matdis/aide_de_camp/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
"""Copied from aiida-lsmo utils"""
from __future__ import absolute_import
from .multiply_unitcell import get_replciation_factors
from .general import (get_molecules_input_dict,
get_molecule_dict,
get_ff_parameters,
get_atomic_radii,
get_geometric_output,
get_pressure_list,
choose_pressure_points,
get_output_parameters,
get_vlcc_output,
get_temperature_points,
extract_merge_outputs,
update_components,
modify_zeopp_parameters,
modify_pm_parameters,
extract_wrap_results)
from .other import update_workchain_params, dict_merge
Loading

0 comments on commit f844965

Please # to comment.