diff options
author | Constantin Riß <constantin.riss@dre.de> | 2010-02-01 20:36:16 +0100 |
---|---|---|
committer | Constantin Riß <constantin.riss@dre.de> | 2010-02-01 20:36:16 +0100 |
commit | ce4aa5800b7a8efa3608f6fa9fa547d724ddf686 (patch) | |
tree | 5771e6dfeaf2c56ea8b63dc112000e413e0dfbfb /House.h | |
parent | 932a190de286e50797f474aacd0f207e87d29da1 (diff) | |
download | c3d-ce4aa5800b7a8efa3608f6fa9fa547d724ddf686.tar c3d-ce4aa5800b7a8efa3608f6fa9fa547d724ddf686.zip |
...
Diffstat (limited to 'House.h')
-rw-r--r-- | House.h | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -19,7 +19,8 @@ class House float roofangle0, float watthoursperhuman, int humans, int heaterenergy0); std::list<Triangle> getTriangles(){ - std::list<Triangle> triangles = temp.getTriangles(); + std::list<Triangle> triangles; + triangles = temp.getTriangles(); return triangles; } @@ -28,12 +29,14 @@ class House void calcdiff(); void calcneededenergy(); void calccollectoroutput(int day, int time, int month); + void calcprobeinput(int day, int time, int months); + void controller(); private: Temparray temp; Sun sun; float collectortemp, latitude, radiation, eta0, k1, k2, watthoursperhuman, collectorarea, - heaterenergy, roofangle, collectoroutput; + heaterenergy, roofangle, collectoroutput, probeinput; float tempinside[24], tempoutside[12][24], efficiencyflat[100], efficiencyvacuum[100], anglecorrectionflat[91], anglecorrectiontransversal[91], anglecorrectionlongitudinal[91], tempdifference[12][24], neededenergy[12][24]; |