random tech-debt and harmonization changes

Changes

4 changed files (+8/-16)

• makefile
  • @@ -6,23 +6,16 @@ # 10/03/2020 TLJ 0.9 Move headers to fix build on osx
    # - C=gcc - CFLAGS=-c -Wall - LDFLAGS= -lm -lstdc++ + CXXFLAGS=-c -Wall + LDFLAGS= -lm SOURCES=sunwait.cpp sunriset.cpp print.cpp HEADERS=sunwait.h sunriset.h print.h OBJECTS=$(SOURCES:.cpp=.o) EXECUTABLE=sunwait - all: $(SOURCES) $(EXECUTABLE) - + $(EXECUTABLE): $(OBJECTS) - $(C) $(OBJECTS) -o $@ $(LDFLAGS) - - .cpp.o: - $(C) $(CFLAGS) $< -o $@ + $(CXX) $(OBJECTS) -o $@ $(LDFLAGS) clean: rm -f *.o sunwait - -
• sunriset.cpp
  • @@ -148,7 +148,7 @@
    void sun_RA_dec (const double d, double *RA, double *dec, double *r) { double lon, obl_ecl; - double xs, ys, zs; + double xs, ys; double xe, ye, ze; /* Compute Sun's ecliptical coordinates */
  • @@ -157,7 +157,6 @@
    /* Compute ecliptic rectangular coordinates */ xs = *r * cosd(lon); ys = *r * sind(lon); - zs = 0; /* because the Sun is always in the ecliptic plane! */ /* Compute obliquity of ecliptic (inclination of Earth's axis) */ obl_ecl = 23.4393 - 3.563E-7 * d;
• sunwait.cpp
  • @@ -894,12 +894,12 @@ */
    if (pRun->latitude == NOT_SET) { if (pRun->debug == ONOFF_ON) printf ("Debug: latitude not set. Default applied.\n"); - pRun->latitude = DEFAULT_LATITUDE; /* The Buttercross, Bingham, England */ + pRun->latitude = DEFAULT_LATITUDE; } if (pRun->longitude == NOT_SET) { if (pRun->debug == ONOFF_ON) printf ("Debug: longitude not set. Default applied.\n"); - pRun->longitude = DEFAULT_LONGITUDE; /* The Buttercross, Bingham, England */ + pRun->longitude = DEFAULT_LONGITUDE; } // /* Co-ordinates must be in 0 to 360 range */ // IFC 2014-12-02: Removed as done in isBearing()
• sunwait.h
  • @@ -14,7 +14,7 @@
    #define DEFAULT_LIST 1 /* in 'List' mode, report these number days */ #define DEFAULT_ANGLE 0.83 /* Default twighlight angle. */ #define DEFAULT_LATITUDE 40.108306 - #define DEFAULT_LONGITUDE 271.7427 /* South Side School, Champaign, IL, USA */ + #define DEFAULT_LONGITUDE -89.7427 /* South Side School, Champaign, IL, USA */ #define boolean bool #define NOT_SET 9999999