Skip to content

Commit

Permalink
update dev docs
Browse files Browse the repository at this point in the history
  • Loading branch information
pjamesjoyce committed Nov 24, 2017
1 parent 5444fed commit 9141aab
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
5 changes: 5 additions & 0 deletions README.md
Expand Up @@ -8,8 +8,11 @@ An interactive tool for creating fully parameterised Life Cycle Assessment (LCA)
[![Publication](http://joss.theoj.org/papers/c0b544bee185c9ac75e96d24b8573547/status.svg)](http://joss.theoj.org/papers/c0b544bee185c9ac75e96d24b8573547)

Lcopt is a python module for creating fully parameterised LCA foreground models using a Flask based interactive GUI developed by [James Joyce](https://pjamesjoyce.github.io/)

It integrates with SimaPro and BrightWay2

You can export and share your model and results as an .lcoptview file, and share them with a wider audience using [lcoptview](http://lcoptview.rtfd.io)

Online documentation, including full installation instructions, is available [here](http://lcopt.readthedocs.io)

## Installation
Expand All @@ -19,6 +22,8 @@ Online documentation, including full installation instructions, is available [he
The easiest way to install lcopt is via conda. This ensures the version of Python (3.6) is correct, all of the dependencies are correct and there are no conflicts.
You can also do it in only 3 commands.

If you don't have conda installed yet, first install Miniconda (available [here](https://conda.io/miniconda.html))

1) On the command line/console, create a new environment called lcopt:
```
conda create -n lcopt python=3.6
Expand Down
2 changes: 2 additions & 0 deletions docs/1_installation.rst
Expand Up @@ -14,6 +14,8 @@ Recommended Installation
The easiest way to install lcopt is via conda. This ensures the version of Python (3.6) is correct, all of the dependencies are correct and there are no conflicts.
You can also do it in only 3 commands.

If you don't have conda installed yet, first install Miniconda (available `here <https://conda.io/miniconda.html>`_)

1) On the command line/console, create a new environment called lcopt::

conda create -n lcopt python=3.6
Expand Down
1 change: 1 addition & 0 deletions docs/index.rst
Expand Up @@ -28,6 +28,7 @@ Features
- Flexible model setup
- Integration with SimaPro and Brightway2
- Run LCA analyses and explore the results from inside the GUI
- Export and share your results using `lcoptview <http://lcoptview.rtfd.io>`_

.. toctree::
:maxdepth: 1
Expand Down
20 changes: 11 additions & 9 deletions lcopt/mass_balance.py
Expand Up @@ -10,16 +10,18 @@ def recurse_mass(d):

elif k == 'technosphere':
#print('technosphere')
for e in v:
#print (e['activity'])
#cum_impact += e['impact']
#if 'cum_impact' in e.keys():
# cum_impact += e['cum_impact']
#print(len(to_return), d['activity'], d['activity']['unit'])
if d['activity']['unit'] in ['kg', 'g']:
for e in v:
#print (e['activity'])
#cum_impact += e['impact']
#if 'cum_impact' in e.keys():
# cum_impact += e['cum_impact']

if k in to_return.keys():
to_return[k].append(recurse_mass(e))
else:
to_return[k] = [recurse_mass(e)]
if k in to_return.keys():
to_return[k].append(recurse_mass(e))
else:
to_return[k] = [recurse_mass(e)]

elif k in['biosphere', 'impact']:
pass
Expand Down

0 comments on commit 9141aab

Please sign in to comment.