felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 23:08:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use proper formula for dusk/dawn.

Browse Source
This commit is contained in:
David F. Skoll
2011-12-26 14:41:21 -05:00
parent 61bcce3104
commit 77ed694111
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/funcs.c
View File

@@ -1894,11 +1894,6 @@ static int SunStuff(int rise, double cosz, int jul)
/* Sun's true longitude */ /* Sun's true longitude */
L = M + 1.916*sin(DEGRAD*M) + 0.02*sin(2*DEGRAD*M) + 282.565; L = M + 1.916*sin(DEGRAD*M) + 0.02*sin(2*DEGRAD*M) + 282.565;
if (dusk_or_dawn == 2) {/* dusk */
L += 6;
} else if (dusk_or_dawn == 3) {/* dawn */
L -= 6;
}
if (L > 360.0) L -= 360.0; if (L > 360.0) L -= 360.0;
/* Tan of sun's right ascension */ /* Tan of sun's right ascension */
@@ -1975,9 +1970,13 @@ static int SunStuff(int rise, double cosz, int jul)
static int FSun(int rise, func_info *info) static int FSun(int rise, func_info *info)
{ {
int jul = JulianToday; int jul = JulianToday;
static double cosz = -0.014543897; /* for sunrise and sunset */ double cosz = -0.014543897; /* for sunrise and sunset */
int r; int r;
/* Civil twilight: 6 degrees */
if (rise == 2 || rise == 3) {
cosz = -0.1047197551;
}
if (Nargs >= 1) { if (Nargs >= 1) {
if (!HASDATE(ARG(0))) return E_BAD_TYPE; if (!HASDATE(ARG(0))) return E_BAD_TYPE;
jul = DATEPART(ARG(0)); jul = DATEPART(ARG(0));