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...

---
 Sun.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Sun.h')

diff --git a/Sun.h b/Sun.h
index e2191c9..9e6f144 100644
--- a/Sun.h
+++ b/Sun.h
@@ -7,10 +7,13 @@ class Sun
 {
   public:
     Sun(float latitude0): latitude(latitude0){};
+    Sun(){};
+    
+    void setlatitude(float latitude0){latitude=latitude0;};
     
     float declination(int day) {return 23.4*sin(2*M_PI*(284+day)/365);}
-    float hourangle(float time) {return 15*(time-12);}
-    float evelationangle(int day, float time) {
+    float hourangle(int time) {return 15*(time-12);}
+    float elevationangle(int day, int time) {
       return asin(sin(declination(day)*M_PI/180)*
              sin(latitude*M_PI/180)*
              cos(hourangle(time)*M_PI/180)*
@@ -18,15 +21,15 @@ class Sun
              cos(latitude*M_PI/180))
              *180/M_PI;
     }
-    float azimutangle(int day, float time){
+    float azimutangle(int day, int time){
       float tau, sin_tau, cos_tau, sin_phi, cos_phi, tan_dec;
 
+      tan_dec = tan(declination(day)*M_PI/180);
       tau = hourangle(time)*M_PI/180;
       sin_tau = sin(tau);
       cos_tau = cos(tau);
       sin_phi = sin(latitude*M_PI/180);
       cos_phi = cos(latitude*M_PI/180);
-      tan_dec = tan(declination(day)*M_PI/180);
       
       return atan2(sin_tau, cos_tau*sin_phi-tan_dec*cos_phi)/180*M_PI;      
     }
-- 
cgit v1.2.3