@@ -108,10 +108,9 @@ protected enum SolarEvent {
108108 /**NOON A solar event related to noon*/ NOON , /**MIDNIGHT A solar event related to midnight*/ MIDNIGHT
109109 }
110110
111- /** Default constructor of the SPACalculator. */
112111 /**
113- * The part of a rise / set solution that does not depend on the zenith: the time of solar noon, and the declination and equation of
114- * time at noon. Every zman of a day needs the same values, so the last one calculated is kept in {@link #lastNoonSolution} and reused.
112+ * The part of a rise / set solution that does not depend on the zenith: the declination and the equation of time at solar
113+ * noon. Every zman of a day needs the same values, so the last one calculated is kept in {@link #lastNoonSolution} and reused.
115114 * The key is every input the values depend on (the Julian day, the longitude and the two ΔT settings), so a cached value is
116115 * only ever returned for identical inputs, and the results are bit-for-bit identical to calculating them each time. Immutable, so
117116 * it can be shared between threads and clones.
@@ -121,16 +120,14 @@ private static final class NoonSolution {
121120 final double lonWest ;
122121 final boolean applyDeltaT ;
123122 final Double deltaTOverride ;
124- final double noonMin ;
125123 final double declNoon ;
126124 final double eot ;
127125
128- NoonSolution (double jdDay , double lonWest , boolean applyDeltaT , Double deltaTOverride , double noonMin , double declNoon , double eot ) {
126+ NoonSolution (double jdDay , double lonWest , boolean applyDeltaT , Double deltaTOverride , double declNoon , double eot ) {
129127 this .jdDay = jdDay ;
130128 this .lonWest = lonWest ;
131129 this .applyDeltaT = applyDeltaT ;
132130 this .deltaTOverride = deltaTOverride ;
133- this .noonMin = noonMin ;
134131 this .declNoon = declNoon ;
135132 this .eot = eot ;
136133 }
@@ -164,13 +161,14 @@ private NoonSolution getNoonSolution(double jdDay, double lonWest) {
164161 double noonMin = solveNoonMidnight (jdDay , lonWest , SolarEvent .NOON );
165162 double declNoon = solarCoords (jdDay + noonMin / 1440.0 )[1 ];
166163 double eot = equationOfTime (jdDay + noonMin / 1440.0 );
167- NoonSolution solution = new NoonSolution (jdDay , lonWest , applyDeltaTNow , deltaTOverrideNow , noonMin , declNoon , eot );
164+ NoonSolution solution = new NoonSolution (jdDay , lonWest , applyDeltaTNow , deltaTOverrideNow , declNoon , eot );
168165 if (applyDeltaT == applyDeltaTNow && Objects .equals (deltaTOverride , deltaTOverrideNow )) { // only cache if the settings did not change mid calculation
169166 lastNoonSolution = solution ;
170167 }
171168 return solution ;
172169 }
173170
171+ /** Default constructor of the SPACalculator. */
174172 public SPACalculator () {
175173 super ();
176174 }
@@ -316,7 +314,6 @@ private double solveRiseSet(LocalDate localDate, GeoLocation geoLocation, double
316314
317315 // Closed-form first guess using the geocentric declination at local apparent noon.
318316 NoonSolution noon = getNoonSolution (jdDay , lonWest ); // independent of the zenith, so shared by every zman of the day
319- double noonMin = noon .noonMin ;
320317 double declNoon = noon .declNoon ;
321318 double eot = noon .eot ;
322319 double cosH0 = (cosDegrees (adjustedZenith ) - sinDegrees (lat ) * sinDegrees (declNoon ))
0 commit comments