From dd03526d355a2615469fb9d0f5fb2b0eace7044e Mon Sep 17 00:00:00 2001
From: FUEL4EP <epre@unitybox.de>
Date: Thu, 15 Dec 2022 16:13:46 +0100
Subject: [PATCH] update of README.md; added option to analyze firewood mass
 consumption of a stove

---
 README.md                            |  69 +++++++++++---
 __pycache__/graphics.cpython-38.pyc  | Bin 3872 -> 0 bytes
 __pycache__/io_module.cpython-38.pyc | Bin 2671 -> 0 bytes
 __pycache__/messaging.cpython-38.pyc | Bin 4483 -> 0 bytes
 consal.py                            | 130 ++++++++++++++++++++-------
 electrical_power_consumption.caf     |   4 +
 firewood_mass_consumption.caf        |   2 +
 pellets_energy_consumption.caf       |   5 ++
 water_consumption.caf                |   3 +
 9 files changed, 167 insertions(+), 46 deletions(-)
 delete mode 100644 __pycache__/graphics.cpython-38.pyc
 delete mode 100644 __pycache__/io_module.cpython-38.pyc
 delete mode 100644 __pycache__/messaging.cpython-38.pyc
 mode change 100755 => 100644 consal.py
 create mode 100644 firewood_mass_consumption.caf

diff --git a/README.md b/README.md
index 1d68d28..0bbac76 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # consumption_analysis [![License: CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/) [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2FFUEL4EP%2Fconsumption_analysis&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com) <a href='https://ko-fi.com/FUEL4EP' target='_blank'><img height='20' style='border:0px;height:20px;' src='https://cdn.ko-fi.com/cdn/kofi1.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
 
-Python statistic software for consumption analysis of electrical power, fresh water, oil, gas, pellets, and heat pump energy
+Python statistic software for consumption analysis of electrical power, fresh water, oil, gas, pellets, heat pump energy, and firewood
 
 # Installation for [(K)ubuntu] LINUX / Raspian OS:
 
@@ -26,9 +26,11 @@ Optional: Put example data bases into the working directory
 *   gas_energy_consumption.caf
 *   pellets_energy_consumption.caf
 *   heat_pump_energy_consumption.caf
+*   firewood_mass_consumption.caf
 
 **Required python version**
 - 3.x
+- python2 is **NOT** supported anymore
              
 **Required python modules:**
 
@@ -63,6 +65,14 @@ Optional: Put example data bases into the working directory
 * moving averages over one year will be calculated after at least one year of data collection
 * therefore **for the first year** of data entries, no moving averages will be calculated nor displayed
 
+# Hints for consumption inputs
+
+- The readings of a consumption meter should be inputted into the 'consal' software immediately after reading. The concerning time stamp of the data base is taken based on the system time of your computer at the time of the input.
+- The readings can be done at any time. They can be non-equidistant in time.
+- The time span between two readings can vary arbitrarily, e.g. after 1 hour, then after 3.2 days, then after 1.34 weeks, then after 5.6 hours, ..
+- For creating the graphical views, the data base vectors <time of reading, readout value> are resampled equidistantly in time, in the current software version  every 3 hours.
+- In case of a newly created data base, the next data base input should be done after the resampling time at the earliest, i.e. after 3 hours.
+
 
 # Usage:
 
@@ -115,7 +125,22 @@ Options:
      --hp              analyze heat pump consumption
      
      --whp=FILE        file storing data base for heat pump consumption analysis
-
+     -f                analyze firewood mass consumption of a stove (note: mass
+                       of each oven charge needs to be inputted)
+                       
+    --ff=FILE          file storing data base for firewood mass consumption
+                       analysis                     
+                       
+
+# Input modes
+
+1. Input of meter readings
+    - For water, electricity, gas, oil, heat pump energy, pellets energy
+    - The inputted consumption values are already summed-up by the meter 
+2. Input of non-meter readings, e.g. firewood charge of a stove
+    - For firewood charge of a stove
+    - The inputted consumption values are not summed-up by a meter, but **each** furnance charge is weigthed by a scale. The summing-up is done by the 'consal' software instead.
+    - **IMPORTANT**: For summing-up the firewood mass consumption correctly, **each furnance charge needs to be weigthed and the firewood weight needs to be inputted with 'consal -f -i', see also below.**
 
 # Examples on usage:
 
@@ -153,60 +178,74 @@ Options:
 
 
 	consal --hp
+	
+7. Run analysis on provided data base for firewood mass consumption:
+
+
+	consal -f
 
-7. Add a new consumption value to an existing data base and then run an analysis of electrical power consumption:
+8. Add a new consumption value to an existing data base and then run an analysis of electrical power consumption:
 
 	consal -i -e
 
-8. Add a new consumption value to an existing data base and then run an analysis of water consumption:
+9. Add a new consumption value to an existing data base and then run an analysis of water consumption:
 
 	consal -i -w
 
 
-9. Add a new consumption value to an existing data base and then run an analysis of heating oil consumption:
+10. Add a new consumption value to an existing data base and then run an analysis of heating oil consumption:
 
 
 	consal -i -o
 	
-10. Add a new consumption value to an existing data base and then run an analysis of gas consumption:
+11. Add a new consumption value to an existing data base and then run an analysis of gas consumption:
 
 
 	consal -i -g
 
-11. Add a new consumption value to an existing data base and then run an analysis of pellets consumption:
+12. Add a new consumption value to an existing data base and then run an analysis of pellets consumption:
 
 
 	consal -i -p
 	
-12. Add a new consumption value to an existing data base and then run an analysis of heat pump energy consumption:
+13. Add a new consumption value to an existing data base and then run an analysis of heat pump energy consumption:
 
 
 	consal -i \--hp
+	
+14. Add the weight of a new furnance charge to an existing data base and then run an analysis of firewood mass consumption:
+
+
+	consal -i -f
 
-13. Create a new data base for electrical power consumption:
+15. Create a new data base for electrical power consumption:
 
 	consal -i -n -e
 
 
-14. Create a new data base for water consumption:
+16. Create a new data base for water consumption:
 
 	consal -i -n -w
 
-15. Create a new data base for heating oil consumption:
+17. Create a new data base for heating oil consumption:
 
 	consal -i -n -o
 	
-16. Create a new data base for gas consumption:
+18. Create a new data base for gas consumption:
 
 	consal -i -n -g
 	
-17. Create a new data base for pellets consumption:
+19. Create a new data base for pellets consumption:
 
 	consal -i -n -p
 	
-18. Create a new data base for heat pump energy consumption:
+20. Create a new data base for heat pump energy consumption:
 
 	consal -i -n \--hp
+	
+21. Create a new data base for firewood mass consumption:
+
+	consal -i -n -f
 
 
 
@@ -218,6 +257,8 @@ Options:
 -   13th June 2021: Migration to python3  
 -   28th October 2022: Fixes due to library updates, update of images
 -   21st November 2022: Added analysis options for gas, pellets, and heat pump energy
+-   15th December 2022: Added analysis option for firewood mass consumption  
+                        Decreased resampling time to 3 hours
 
 
 
diff --git a/__pycache__/graphics.cpython-38.pyc b/__pycache__/graphics.cpython-38.pyc
deleted file mode 100644
index 5ea9381980eb0d2dcd22ff256d11eab112fdfd2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3872
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
B)5rh-

diff --git a/__pycache__/io_module.cpython-38.pyc b/__pycache__/io_module.cpython-38.pyc
deleted file mode 100644
index 8f6e0b2ea7295ac913d87099cdedf947dc230048..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2671
zcmbtW&2QX96rb_edYw%u6p~Vk<e-$qL`|xqa;Olcq|F5pN)u?iO)<{SY~o~XZ)YY=
zv-KjRaEBu&wBg2`e}Ov(4rs2Ndgj&>?~ON2+Mu=)wmcu6Hy`i4-}}A!a&$Bx@ci-5
z@87TyLjK0i(Z_<$$MDHjC>UuHMw!*2O$xQ$u`;`9XHL_}+@?#bF|X+vnOd{P9Oiyc
znm+Sb4eC1cSsm(t1#ATB5!PU%P&b&hOro*gD^oZ4{Zyt!ekuIm{c!3LY)O_PTYGG6
z{WH0)JuU>+wVg!d&}dPV7(O1<sLKL;@@FV|jL|-vwr?r2Ne5O*O1f|LZPT+$d!LG{
z%pN#LM@tJON{cxYq;K6jrQFhH?w-|mN@w8h6G{{r)Nn2(Hwp8Wi9?jX6^NfG>4OD&
z<EqYTB^f7sM&dU4#bN$3Sg!AW>)s-_Np9VO9_U+NYMxeEH*TjL9=8h-?}$|KSaGS+
zd|jYwJ@;XM?qUBCwl&>Z>0OXr-b&jkXW>pEwm>dqso*VDh~04dteg&08Rmrwajj&n
z!zY8qD9~0RwbM=1hITfKGzU9ANTrh6gKe`!X{YG&T)VAKA-VPh&x-q8*RMTj@vZ`I
z2n0do>H3qsngO1?D|kD70P~9NTxlN_$&-w0+SZi+O2iv5?eWF=jUwaod?)F!`GqT2
z=hss;-zsvsoteesBu_fKGL`db5oZP4?(n(pt`1UpbEv}!SVo?Kf>4V(@Q%?29j5`j
zK71ZM0evw6<4@rMjb_7V@X&>Z0(>5LM$t`cV3%Z{$~omQz((aU<qkY%ylW)DlOS;&
zB%J?{@JsNr?7*mdbQDp7$cSo7y|-H%yk-1!++Sy9ue<yrf3kvC9yKnT41((&o=6_H
z1WyzX)dmk)qLOe8f9|Ae!~AL$S(fB1?4&sl3uEVS`dmI82p0^|yZFLwhcHSG;WZib
zF1+ltL-eggb%P#JgMEdM1;(gA$7oyb0xm%@rQK8lxQr7cD$wHwJykJ|!V|`l@z9L%
z6DUr?phO7*D8M%umOj)z6>q^v3%5IX&;oV%3@-kHMhUo>0B(SYhsYN>;KVBJAs#B6
z03zg9$^kC0_pBdI7&dU3Q?bBB@&&m;ZXv#aEvk9<epDXw4tlCK@L3I|^LK{G!xd4+
zKQ5!_pkCS_7wlW|H;{qe@H9`>DJ}UY$c-QqZ8li2Wr;u4D1&|_$r^ya(WS?9zBd!B
zh+Sj~RUDuu33I-4h?`4>Is$<Vs!8u`5G)vUvG5te5JP+@-TUqk4TlIsfr^L>aFY%!
z#CF32@Gc}dveOW}fUe`vmB1h&(ny%dFv+W_c>E#<HVdw-6$1GYniZC_mpBIQd2odP
z7eBr8&);qsH>h<*zd=RhbI+f)0lLbx2eH}?&x2|!(U^9-BF)ud;Ak(EXkO7kH@PNT
zm^c!r;D>k<|9VNQ#U%vQjrj9VwIdafdrhhs*A@;)M6L-gUB{JT!`3cf;p!*aYUko4
zE`+RoB<@aDafhBljxp(K4n*X;P+-hC7;jdCzD~!W#1_UNa&!P=hMQ+V@+oe{c*NtF
z7@UFzW@^Z+v;>BR3~WILCR=rJ25$z;#{3C*c9we4*LP;m-Mu`s%4TO)=T_N!(d82B
z*=XhtzjoIQV(;?Q%3@?`OK|N%hHGu$EkY`==z6o!?i7iFbf~z<HO-#Yc%;(UNG-zI
zq`4s(J$>p};vD>YN*mM!Q>4)b&4SvLRGwDAEqfI1AGEZfruQ5Lnn4S0AE1x5v<Sy?
z)4aQ_%&OWon?{b9g;lh}0Q1dS2GI)=;GyoZqneS}%vype60t$xsE$dEKz|pYAC2mf
zIKIyXUajKTKuXs$07|kB2B`=dU1A_o!70Kn=2SzV0zGJsXcjzj41*R!(Ef*2_WlUT
XRlWv=WBGszpZb>nsz2(V^8J4SqGG1O

diff --git a/__pycache__/messaging.cpython-38.pyc b/__pycache__/messaging.cpython-38.pyc
deleted file mode 100644
index 62c628034d4b5a0ab48fa3ce46f22ea695525d9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4483
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
IFWW!=YnNW;@c;k-

diff --git a/consal.py b/consal.py
old mode 100755
new mode 100644
index 6db88db..c6d6791
--- a/consal.py
+++ b/consal.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-desc="""consal.py is doing a statistical analysis of electrical power,  water,  oil, gas, pellets, and heat pump consumptions"""
+desc="""consal.py is doing a statistical analysis of electrical power,  water,  oil, gas, pellets, heat pump, and firewood consumptions"""
 
-# $Rev: 79 $:
+# $Rev: 81 $:
 # $Author: ewald $:
-# $Date: 2022-12-03 09:45:53 +0100 (Sa, 03. Dez 2022) $:
-# $Id: consal.py 79 2022-12-03 08:45:53Z ewald $
+# $Date: 2022-12-15 13:06:52 +0100 (Do, 15. Dez 2022) $:
+# $Id: consal.py 81 2022-12-15 12:06:52Z ewald $
 
-__my_version__ = "$Revision: 79 $"
+__my_version__ = "$Revision: 81 $"
 
 ELECTRICAL_POWER_CONSUMPTION_FILE="electrical_power_consumption.caf"
 WATER_CONSUMPTION_FILE="water_consumption.caf"
@@ -16,15 +16,17 @@
 GAS_CONSUMPTION_FILE ="gas_energy_consumption.caf"
 PELLETS_CONSUMPTION_FILE ="pellets_energy_consumption.caf"
 HEAT_PUMP_CONSUMPTION_FILE ="heat_pump_energy_consumption.caf"
+FIREWOOD_CONSUMPTION_FILE ="firewood_mass_consumption.caf"
 TIME_COL=0
 VALUE_COL= 1
 STRICTLY_INCREASING=1
 NOT_STRICTLY_INCREASING=0
 MOVING_AVERAGE_DAYS=365
-RESAMPLE_TIME_STEP=0.25
+RESAMPLE_TIME_STEP=0.125    # resample every 3 hours
 EPSILON=1e-6
 ALPHA=1e-2
 MAX_MEASUREMENT_VARIATION=4
+MAX_FIREWOOD_CHARGE=15.0                                 # adapt this parameter to the maximum allowed charge of your stove
 
 import sys
 import optparse
@@ -62,6 +64,7 @@ def __init__(self):
         self.write_table_name=''
         self.table=[]
         self.np=0
+        self.increment_flag=False
         #list
         self.tl=[]
         self.cl=[]
@@ -86,6 +89,14 @@ def __init__(self):
         #status flag
         self.status=True
 
+    def set_increment_flag(self, name):
+        # set the increment_flag for firewood mass consumption, i.e. each charge of an oven shall be weighted
+        if ( name == "firewood mass consumption" ):
+          self.increment_flag = True
+          #print ("firewood increment_flag is set")
+        else:
+          self.increment_flag = False
+
     def set_name(self, name):
         self.name = name
     
@@ -165,29 +176,59 @@ def check_strictly_increasing_new_row(self, vec):
 
     def check_measurement_input(self, vec):
         if self.status  != False:
-            last_row=self.table.last_row()
-            first_row=self.table.first_row()
-            #bisheriger Durchschnittsverbrauch pro Tag
-            slope=(last_row[1]-first_row[1])/(last_row[0]-first_row[0])
-            for j, el in enumerate(vec):
-                #print j, el
-                if isinstance(el, float) and isinstance(last_row[j], float)  and self.table.strictly_increasing_check_mask[j]:
-                    if last_row[j] >= el:
-                        if j == 0:
-                            print ("\nWrong input: Actual timestamp \'%.3f\' is smaller than latest table entry \'%.3f\'\n" % (el,  last_row[j]))
-                        if j == 1:
-                            print ("\nWrong input: Actual measurement \'%.3f\' is smaller than latest table entry \'%.3f\'\n" % (el,  last_row[j]))
-                        return False
-                    else:
-                        if j==1:
-                            actual_slope=(el-last_row[j])/(vec[0]-last_row[0])
-                            print ("\nActual \'%s\' per day: \'%.3f\'\n" % (self.name, actual_slope))
-                            if actual_slope > MAX_MEASUREMENT_VARIATION*slope:
-                                print ("\nWrong input: Actual measurement slope \'%.3f\' is more than \'x%s\' bigger than average slope \'%.3f\'\n" % (actual_slope,  MAX_MEASUREMENT_VARIATION,  slope))
+            if self.increment_flag == False:
+                # check input from a meter
+                last_row=self.table.last_row()
+                first_row=self.table.first_row()
+                #bisheriger Durchschnittsverbrauch pro Tag
+                slope=(last_row[1]-first_row[1])/(last_row[0]-first_row[0])
+                for j, el in enumerate(vec):
+                    #print ( j, el )
+                    if isinstance(el, float) and isinstance(last_row[j], float)  and self.table.strictly_increasing_check_mask[j]:
+                        if last_row[j] >= el:
+                            if j == 0:
+                                print ("\nWrong input: Actual timestamp \'%.3f\' is smaller than latest table entry \'%.3f\'\n" % (el,  last_row[j]))
+                            if j == 1:
+                                print ("\nWrong input: Actual measurement \'%.3f\' is smaller than latest table entry \'%.3f\'\n" % (el,  last_row[j]))
+                            return False
+                        else:
+                            if j==1:
+                                actual_slope=(el-last_row[j])/(vec[0]-last_row[0])
+                                print ("\nActual \'%s\' per day: \'%.3f\'\n" % (self.name, actual_slope))
+                                if actual_slope > MAX_MEASUREMENT_VARIATION*slope:
+                                    print ("\nWrong input: Actual measurement slope \'%.3f\' is more than \'x%s\' bigger than average slope \'%.3f\'\n" % (actual_slope,  MAX_MEASUREMENT_VARIATION,  slope))
+                                    return False
+            else:
+                # check firewood charge input
+                last_row=self.table.last_row()
+                for j, el in enumerate(vec):
+                    #print ( j, el )
+                    if isinstance(el, float) and isinstance(last_row[j], float):
+                        if last_row[j] >= el:
+                            if j == 0:
+                                print ("\nWrong input: Actual timestamp \'%.3f\' is smaller than latest table entry \'%.3f\'\n" % (el,  last_row[j]))
+                                return False
+                        if el <= 0:
+                            if j == 1:
+                                print ("\nWrong input: Actual charge \'%.3f\' must be positive" % el)
                                 return False
+                        else:
+                            if j==1:
+                                if (el > MAX_FIREWOOD_CHARGE ):
+                                    print ("\nWrong input: Actual charge \'%.3f\' is exceeding the maximum charge of \'%.1f\' of the stove (see define MAX_FIREWOOD_CHARGE)" % (el, MAX_FIREWOOD_CHARGE) )
+                                    return False
             return True
         else:
             return False
+        
+    def accumulate_charge_in_increment_mode(self, input_value):
+        if self.status  != False:
+            if self.increment_flag == True:
+                if not self.newDB_flag:
+                    last_row=self.table.last_row() 
+                    #print ( last_row )
+                    input_value = input_value + last_row[1]
+        return input_value
 
     def add_row(self, row):
         if self.status != False:
@@ -311,20 +352,24 @@ def input_measurement(self, consistency_check_on):
                     self.status=False
         if self.status != False:
             # determine local time for the local timezone
-            t1     = datetime.datetime(1970, 1, 1, 0, 0, 0)   # 1970-01-01 00:0:0
+            t1      = datetime.datetime(1970, 1, 1, 0, 0, 0)   # 1970-01-01 00:0:0
             tl      = datetime.datetime.now()
             tnow=(time.mktime(tl.timetuple())-time.mktime(t1.timetuple()))/24/3600
             done = False
             while not done:
                 fp=input_float('Please input actual measurement of \'%s\'\n\n' % self.name)
                 if self.newDB_flag:
-                    done  = True
+                    done = True
                 else:
                     done = self.check_measurement_input([tnow, fp])
+            # accumulate firewood charge of stove to last firewood consumption value, i.e. increment_flag == True
+            #print ( fp )
+            fp = self.accumulate_charge_in_increment_mode(fp)
+            #print (fp )
             if self.newDB_flag:
-                tlminus1 = tl - datetime.timedelta(seconds=1)
-                tnowminus1=(time.mktime(tlminus1.timetuple())-time.mktime(t1.timetuple()))/24/3600
-                self.add_row( [tnowminus1, fp-ALPHA])
+                tlminus60 = tl - datetime.timedelta(seconds=60) #add an artificial table entry for the first entry, timesamp is 60 seconds earlier
+                tnowminus60=(time.mktime(tlminus60.timetuple())-time.mktime(t1.timetuple()))/24/3600
+                self.add_row( [tnowminus60, fp-ALPHA])
                 self.add_row( [tnow, fp])
             else:
                 self.add_row( [tnow, fp])
@@ -334,6 +379,7 @@ def input_measurement(self, consistency_check_on):
     def consumption_analysis(self,  name,  working_dir,  input_file,  ylabel,
             consistency_check_on, input_flag, newDB_flag):
         self.set_name(name)
+        self.set_increment_flag(name)
         self.set_working_dir(working_dir)
         self.set_table_name(input_file)
         self.set_newDB_flag(newDB_flag)
@@ -597,6 +643,13 @@ def main():
     parser.add_option("--whp", type="string",
         help="file storing data base for heat pump energy consumption analysis",
         metavar="FILE",dest="file_heat_pump")
+    
+    parser.add_option("-f", help="analyze firewood mass consumption of a stove (note: mass of each oven charge needs to be inputted)", dest="firewood",
+        action='store_true')
+
+    parser.add_option("--ff", type="string",
+        help="file storing data base for firewood mass consumption analysis",
+        metavar="FILE",dest="file_firewood")
 
     parser.set_defaults(verbose=0,  no_consistency_check=False, no_greater_than_check=False, newDB=False, 
         wdir=WORKING_DIR, epower=False,
@@ -605,7 +658,8 @@ def main():
         file_water=WATER_CONSUMPTION_FILE,  gas=False, 
         file_gas=GAS_CONSUMPTION_FILE,  pellets=False, 
         file_pellets=PELLETS_CONSUMPTION_FILE,  heat_pump=False, 
-        file_heat_pump=HEAT_PUMP_CONSUMPTION_FILE,  version=False, input_flag=False)
+        file_heat_pump=HEAT_PUMP_CONSUMPTION_FILE,  firewood=False,
+        file_firewood=FIREWOOD_CONSUMPTION_FILE,  version=False, input_flag=False)
 
     (options, args) = parser.parse_args()
 
@@ -679,7 +733,7 @@ def main():
             options.wdir, options.file_pellets,  'pellets energy [kWh]',
             not(options.no_consistency_check), options.input_flag, options.newDB)
             
-  #analyze heat pump energy consumption
+    #analyze heat pump energy consumption
     if options.heat_pump:
         stdMsg("\n\nStarting analysis of heat pump energy consumption ..\n")
         #check if data base file is existing and readable
@@ -690,6 +744,18 @@ def main():
         heat_pump.consumption_analysis('heat pump energy consumption',
             options.wdir, options.file_heat_pump,  'heat pump energy [kWh]',
             not(options.no_consistency_check), options.input_flag, options.newDB)
+        
+    #analyze firewood mass consumption
+    if options.firewood:
+        stdMsg("\n\nStarting analysis of firewood mass consumption of a stove (note: mass of each oven charge needs to be inputted) ..\n")
+        #check if data base file is existing and readable
+        check_database_file(options.wdir,  options.file_firewood, options.newDB)
+        #initialize data analysis
+        firewood=consumption()
+        #run analysis
+        firewood.consumption_analysis('firewood mass consumption',
+            options.wdir, options.file_firewood,  'firewood mass [kg]',
+            not(options.no_consistency_check), options.input_flag, options.newDB)
 
 
     if not options.epower and not options.oil and not options.water and not options.gas and not options.pellets and not options.heat_pump:
diff --git a/electrical_power_consumption.caf b/electrical_power_consumption.caf
index c01a353..2f20874 100644
--- a/electrical_power_consumption.caf
+++ b/electrical_power_consumption.caf
@@ -600,3 +600,7 @@
 19264.809525462966 109450.3
 19282.4340625 109679.2
 19291.40403935185 109790.4
+19310.339016203703 110026.3
+19323.384386574075 110198.0
+19326.363078703704 110230.7
+19340.520914351855 110397.0
diff --git a/firewood_mass_consumption.caf b/firewood_mass_consumption.caf
new file mode 100644
index 0000000..99d413b
--- /dev/null
+++ b/firewood_mass_consumption.caf
@@ -0,0 +1,2 @@
+19341.415324074074 13.59
+19341.41601851852 13.6
diff --git a/pellets_energy_consumption.caf b/pellets_energy_consumption.caf
index 1b805de..ec77d3a 100644
--- a/pellets_energy_consumption.caf
+++ b/pellets_energy_consumption.caf
@@ -5,3 +5,8 @@
 19326.364085648147 318.9
 19330.390555555554 649.2
 19331.350011574075 726.5
+19332.388796296298 827.4
+19333.363240740742 905.5
+19334.39611111111 993.0
+19340.603946759256 1656.5
+19341.356666666667 1748.5
diff --git a/water_consumption.caf b/water_consumption.caf
index 2697d92..7cdf90b 100644
--- a/water_consumption.caf
+++ b/water_consumption.caf
@@ -587,3 +587,6 @@
 19264.810567129633 59.7
 19282.434710648147 66.653
 19291.404537037037 70.091
+19310.339513888888 77.835
+19323.38491898148 83.99
+19326.363645833335 84.95