Skip to content

Commit

Permalink
Merge pull request #13 from MITSustainableDesignLab/master
Browse files Browse the repository at this point in the history
Forward develop to master
  • Loading branch information
samuelduchesne committed Oct 4, 2017
2 parents f9dccc9 + 931f0fe commit 150072e
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 34 deletions.
75 changes: 41 additions & 34 deletions docs/template-detail.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,45 @@ This section will provide details on the template files

## Materials
### Opaque
Setting | Units
------- | -----
[[Conductivity]] | W/m-K
[[Cost]] |
[[Density]] | kg/m3
[[Embodied Carbon]] | kgCO2/kg
[[Embodied Energy]] | MJ/kg
[[Substitution Rate Pattern]] |
[[Substitution Timestep]] |
[[Transportation Carbon]] | kgCO2/kg/km
[[Transportation Distance]] | km
[[Transportation Energy]] | MJ/kg/km
[[Moisture Diffusion Resistance]] |
[[Roughness]] |
[[Solar Absorptance]] |
[[Specific Heat]] | J/kg-K
[[Thermal Emittance]] |
[[Visible Absorptance]] |

#### Conductivity | W/m-K
#### Cost |
#### Density | kg/m3
#### Embodied Carbon | kgCO2/kg
#### Embodied Energy | MJ/kg
#### Substitution Rate Pattern |
#### Substitution Timestep |
#### Transportation Carbon | kgCO2/kg/km
#### Transportation Distance | km
#### Transportation Energy | MJ/kg/km
#### Moisture Diffusion Resistance |
#### Roughness |
#### Solar Absoptance |
#### Specific Heat | J/kg-K
#### Thermal Emittance |
#### Visible Absoptance |
| Setting | Units |
| ------- | ----- |
| Conductivity | W/m-K |
| Cost | |
| Density | kg/m3 |
| Embodied Carbon | kgCO2/kg |
| Embodied Energy | MJ/kg |
| Substitution Rate Pattern | |
| Substitution Timestep | |
| Transportation Carbon | kgCO2/kg/km |
| Transportation Distance | km |
| Transportation Energy | MJ/kg/km |
| Moisture Diffusion Resistance | |
| Roughness | |
| Solar Absorptance | |
| Specific Heat | J/kg-K |
| Thermal Emittance | |
| Visible Absorptance | |

#### Conductivity

First Header | Second Header | Third Header
------------ | ------------- | ------------
Content Cell | Content Cell | Content Cell
Content Cell | Content Cell | Content Cell

#### Cost
#### Density
#### Embodied Carbon
#### Embodied Energy
#### Substitution
#### Substitution
#### Transportation Carbon
#### Transportation Distance
#### Transportation Energy
#### Moisture Diffusion Resistance
#### Roughness
#### Solar Absoptance
#### Specific Heat
#### Thermal Emittance
#### Visible Absoptance
97 changes: 97 additions & 0 deletions docs/template-detail.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
======================
Template documentation
======================
This section will provide details on the template files

---------
Materials
---------

^^^^^^
Opaque
^^^^^^

+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| Setting | Short Description |
+===============================================================+============================================================================================+
| `Conductivity`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Cost`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Density`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Embodied Carbon`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Embodied Energy`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Substitution Rate Pattern`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Substitution Timestep`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Transportation Carbon`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Transportation Distance`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Transportation Energy`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Moisture Diffusion Resistance`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Roughness`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Solar Absorptance`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Specific Heat`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Thermal Emittance`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+
| `Visible Absorptance`_ | |
+---------------------------------------------------------------+--------------------------------------------------------------------------------------------+

------------
Conductivity
------------
----
Cost
----
-------
Density
-------
---------------
Embodied Carbon
---------------
---------------
Embodied Energy
---------------
-------------------------
Substitution Rate Pattern
-------------------------
---------------------
Substitution Timestep
---------------------
---------------------
Transportation Carbon
---------------------
-----------------------
Transportation Distance
-----------------------
---------------------
Transportation Energy
---------------------
-----------------------------
Moisture Diffusion Resistance
-----------------------------
---------
Roughness
---------
-----------------
Solar Absorptance
-----------------
-------------
Specific Heat
-------------
-----------------
Thermal Emittance
-----------------
-------------------
Visible Absorptance
-------------------

0 comments on commit 150072e

Please sign in to comment.