snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmsun: Fix implicit definition warnings.

Browse source 
Add declaration for SunRise() in wmSun.c and move Interp() earlier in
SunRise.c.
This commit is contained in:
Doug Torrance 2015-06-14 17:04:38 -05:00 committed by Carlos R. Mafra
parent b5f8a9a4d5
commit 608ca0f523
2 changed files with 27 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
wmsun/SunRise.c
View file

@ -10,6 +10,31 @@ double cosEPS = 0.91748;
double sinEPS = 0.39778; double sinEPS = 0.39778;
double P2 = 6.283185307; double P2 = 6.283185307;
Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
double a, b, c, d, dx;
*nz = 0;
a = 0.5*(ym+yp)-y0;
b = 0.5*(yp-ym);
c = y0;
*xe = -b/(2.0*a);
*ye = (a*(*xe) + b) * (*xe) + c;
d = b*b - 4.0*a*c;
if (d >= 0){
dx = 0.5*sqrt(d)/fabs(a);
*z1 = *xe - dx;
*z2 = *xe+dx;
if (fabs(*z1) <= 1.0) *nz += 1;
if (fabs(*z2) <= 1.0) *nz += 1;
if (*z1 < -1.0) *z1 = *z2;
}
return(0);
}
SunRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){ SunRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){
@ -93,40 +118,6 @@ UTTohhmm(double UT, int *h, int *m){
} }
Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
double a, b, c, d, dx;
*nz = 0;
a = 0.5*(ym+yp)-y0;
b = 0.5*(yp-ym);
c = y0;
*xe = -b/(2.0*a);
*ye = (a*(*xe) + b) * (*xe) + c;
d = b*b - 4.0*a*c;
if (d >= 0){
dx = 0.5*sqrt(d)/fabs(a);
*z1 = *xe - dx;
*z2 = *xe+dx;
if (fabs(*z1) <= 1.0) *nz += 1;
if (fabs(*z2) <= 1.0) *nz += 1;
if (*z1 < -1.0) *z1 = *z2;
}
return(0);
}
double SinH(int year, int month, int day, double UT){ double SinH(int year, int month, int day, double UT){
double TU0, TU, TU2, TU3, LambdaMoon, BetaMoon, R, AGE, frac(), jd(); double TU0, TU, TU2, TU3, LambdaMoon, BetaMoon, R, AGE, frac(), jd();

3
wmsun/wmSun.c
View file

@ -98,7 +98,8 @@
void ParseCMDLine(int argc, char *argv[]); void ParseCMDLine(int argc, char *argv[]);
void pressEvent(XButtonEvent *xev); void pressEvent(XButtonEvent *xev);
SunRise(int year, int month, int day, double LocalHour, double *UTRise,
double *UTSet);
int ToggleWindow = 0; int ToggleWindow = 0;
int nMAX = 1; int nMAX = 1;