From 932a190de286e50797f474aacd0f207e87d29da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Ri=DF?= <constantin.riss@dre.de>
Date: Sun, 31 Jan 2010 20:21:17 +0100
Subject: Kollektor bearbeitet...

---
 House.h | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'House.h')

diff --git a/House.h b/House.h
index 0278726..68eb237 100644
--- a/House.h
+++ b/House.h
@@ -7,12 +7,17 @@
 #include <list>
 #include <math.h>
 
+#define TRANSVERSAL 0
+#define LONGITUDINAL 1
+#define FLAT 2
+
 class House
 {
   public:
     House(float inittemp0, int earthx0, int earthy0, int earthz0, float collectortemp0,
           float radiation0, float latitude0, float eta00, float k10, float k20, float collectorarea0,
-          float watthoursperhuman, int humans);
+          float roofangle0, float watthoursperhuman, int humans, int heaterenergy0);
+          
     std::list<Triangle> getTriangles(){
       std::list<Triangle> triangles = temp.getTriangles();
       return triangles;
@@ -20,14 +25,19 @@ class House
 
     void calcefficiency();
     void calctemp();
+    void calcdiff();
+    void calcneededenergy();
+    void calccollectoroutput(int day, int time, int month);
     
   private:
     Temparray temp;
-    float collectortemp, latitude, radiation, eta0, k1, k2, watthoursperhuman, collectorarea;
+    Sun sun;
+    float collectortemp, latitude, radiation, eta0, k1, k2, watthoursperhuman, collectorarea,
+          heaterenergy, roofangle, collectoroutput;
     float tempinside[24], tempoutside[12][24], efficiencyflat[100], efficiencyvacuum[100],
-          anglecorrectionfactorflat[91], anglecorrectionfactortransversal[91],
-          anglecorrectionfactorlongitudinal[91];
-    int humans;
+          anglecorrectionflat[91], anglecorrectiontransversal[91],
+          anglecorrectionlongitudinal[91], tempdifference[12][24], neededenergy[12][24];
+    int humans, collectorstatus;
 };
 
 #endif /* _HOUSE_H_ */
-- 
cgit v1.2.3