Merge pull request #629 from EnergySystemsModellingLab/other-commodities

Tidy up process input code + make input/input commodities => "other" commodities

Author: alexdewar

examples/simple/commodities.csv

@@ -3,4 +3,4 @@ GASPRD,Gas produced,sed,season
 GASNAT,Natural gas,sed,season
 ELCTRI,Electricity,sed,daynight
 RSHEAT,Residential heating,svd,daynight
-CO2EMT,CO2 emitted,ouc,annual
+CO2EMT,CO2 emitted,oth,annual

src/commodity.rs

@@ -86,12 +86,11 @@ pub enum CommodityType {
     /// Specifies a demand (specified in input files) which must be met by the simulation
     #[string = "svd"]
     ServiceDemand,
-    /// Only an input to the simulation, cannot be produced by processes
-    #[string = "inc"]
-    InputCommodity,
-    /// Only an output for the simulation, cannot be consumed by processes
-    #[string = "ouc"]
-    OutputCommodity,
+    /// Either an input or an output to the simulation.
+    ///
+    /// This represents a commodity which can either be produced or consumed, but not both.
+    #[string = "oth"]
+    Other,
 }
 
 #[cfg(test)]