Changes in / [1:3]

Files:

• test.lua (added)
• sunpos.lua (modified) (5 diffs)
• timeutils.lua (modified) (3 diffs)

/sunpos.lua

@@ -1 @@
-
+local math, os = math, os
+-- local timeutils = require "timeutils"
+module (...)
 
 --
@@ -21 +23 @@
 local function fractyear (date)
     return (2*math.pi/365.25) * (date.yday + fractday (date))
+end
+
+local function solartime(date)
+    return
 end
 
@@ -48 +54 @@
 
 -- sun zenith angle
-local function sunzenithangle (date, place)
+function sunzenithangle (date, place)
     local d = sundeclin (date)
     local sha = solarhourangle (date, place)
@@ -57 +63 @@
 
 -- solar elevation (degrees)
-local function sunelevation (date, place)
+function sunelevation (date, place)
     return 90 - math.deg(sunzenithangle (date, place))
 end
 
-local function sunazimuthangle (date, place)
+function sunazimuthangle (date, place)
     local d = sundeclin (date)
     local sza = sunzenithangle (date, place)
@@ -68 +74 @@
 end
 
-
-
---
-testdate = {yday=319,hour=10,min=35,sec=0}
-testplace= {latitude = 48+49/60, longitude=2+17/60+23/3600}
-print ('g =',fractyear (testdate))
-print ('D =',sundeclin (testdate))
-print ('TC =',timecorrection (testdate))
-print ('SHA =',math.deg(solarhourangle (testdate, testplace)))
-print ('SZA =',math.deg(sunzenithangle (testdate, testplace)))
-print ('elev =',sunelevation (testdate, testplace))
-print ('AZ =',math.deg(sunazimuthangle(testdate, testplace)))
-
-print ('elev local = ',sunelevation (os.date('*t'), {longitude=77.05, latitude=-12.05}))

/timeutils.lua

@@ -1 @@
-
+local type = type
 local os = os
 
@@ -7 +7 @@
 function lastmidnight (time)
     local d = os.date('*t', time)
-    return os.time ({year=d.year, month=d.month, day=d.day})
+    return os.time ({year=d.year, month=d.month, day=d.day, hour=0})
 end
 
@@ -16 +16 @@
 end
 
+function localtoUTC(time, timezone)
+    time = time or os.time()
+    if type(time) == "table" then
+        time = os.time(time)
+    end
+
+    local d = os.date('*t', time)
+    if d.isdst then timezone = timezone+1 end
+    d = os.date('*t', time - timezone*3600)
+    return d
+end