corrected broken imports in radiation.py for solar.GetDayOfYear() by relocating it to julian.py. Corrected all imports in the modules that use this function

Author: davidvhill

Pysolar/elevation.py

@@ -20,7 +20,6 @@
 """Various elevation-related calculations
 
 """
-import math
 
 def GetPressureWithElevation(h, Ps=101325.00, Ts=288.15, Tl=-0.0065, Hb=0.0, R=8.31432, g=9.80665, M=0.0289644):
 	#This function returns an estimate of the pressure in pascals as a function of elevation above sea level

Pysolar/julian.py

@@ -22,6 +22,12 @@
 
 """
 import math
+import datetime
+
+def GetDayOfYear(utc_datetime):
+	year_start = datetime.datetime(utc_datetime.year, 1, 1, tzinfo=utc_datetime.tzinfo)
+	delta = (utc_datetime - year_start)
+	return delta.days
 
 def GetJulianCentury(julian_day):
     return (julian_day - 2451545.0) / 36525.0

Pysolar/radiation.py

@@ -20,8 +20,8 @@
 """Calculate different kinds of radiation components via default values
 
 """
-#from . import solar
 import math
+import julian
 
 def GetAirMassRatio(altitude_deg):
 	# from Masters, p. 412
@@ -40,7 +40,7 @@ def GetRadiationDirect(utc_datetime, altitude_deg):
 	# from Masters, p. 412
 
 	if(altitude_deg > 0):
-		day = solar.GetDayOfYear(utc_datetime)
+		day = julian.GetDayOfYear(utc_datetime)
 		flux = GetApparentExtraterrestrialFlux(day)
 		optical_depth = GetOpticalDepth(day)
 		air_mass_ratio = GetAirMassRatio(altitude_deg)

Pysolar/solar.py

@@ -86,7 +86,7 @@ def GetAltitudeFast(latitude_deg, longitude_deg, utc_datetime):
 
 # expect 19 degrees for solar.GetAltitude(42.364908,-71.112828,datetime.datetime(2007, 2, 18, 20, 13, 1, 130320))
 
-	day = GetDayOfYear(utc_datetime)
+	day = julian.GetDayOfYear(utc_datetime)
 	declination_rad = math.radians(GetDeclination(day))
 	latitude_rad = math.radians(latitude_deg)
 	hour_angle = GetHourAngle(utc_datetime, longitude_deg)
@@ -133,7 +133,7 @@ def GetAzimuth(latitude_deg, longitude_deg, utc_datetime, elevation = 0):
 
 def GetAzimuthFast(latitude_deg, longitude_deg, utc_datetime):
 # expect -50 degrees for solar.GetAzimuth(42.364908,-71.112828,datetime.datetime(2007, 2, 18, 20, 18, 0, 0))
-	day = GetDayOfYear(utc_datetime)
+	day = julian.GetDayOfYear(utc_datetime)
 	declination_rad = math.radians(GetDeclination(day))
 	latitude_rad = math.radians(latitude_deg)
 	hour_angle_rad = math.radians(GetHourAngle(utc_datetime, longitude_deg))
@@ -149,11 +149,6 @@ def GetAzimuthFast(latitude_deg, longitude_deg, utc_datetime):
 def GetCoefficient(jme, constant_array):
 	return sum([constant_array[i-1][0] * math.cos(constant_array[i-1][1] + (constant_array[i-1][2] * jme)) for i in range(len(constant_array))])
 
-def GetDayOfYear(utc_datetime):
-	year_start = datetime.datetime(utc_datetime.year, 1, 1, tzinfo=utc_datetime.tzinfo)
-	delta = (utc_datetime - year_start)
-	return delta.days
-
 def GetDeclination(day):
 	'''The declination of the sun is the angle between
 	Earth's equatorial plane and a line between the Earth and the sun.
@@ -297,7 +292,7 @@ def GetRefractionCorrection(pressure_millibars, temperature_celsius, topocentric
     return a / b
 
 def GetSolarTime(longitude_deg, utc_datetime):
-    day = GetDayOfYear(utc_datetime)
+    day = julian.GetDayOfYear(utc_datetime)
     return (((utc_datetime.hour * 60) + utc_datetime.minute + (4 * longitude_deg) + EquationOfTime(day))/60)
 
 # Topocentric functions calculate angles relative to a location on the surface of the earth.

Pysolar/util.py

@@ -33,6 +33,7 @@
 from datetime import datetime as dt
 from datetime import timedelta
 import math
+import julian
 import pytz
 from pytz import all_timezones
 from . import solar
@@ -90,7 +91,7 @@ def GetSunriseSunset(latitude_deg, longitude_deg, utc_datetime, timezone):
     """
 
     # Day of the year
-    day = solar.GetDayOfYear(utc_datetime)
+    day = julian.GetDayOfYear(utc_datetime)
 
     # Solar hour angle
     SHA = ((timezone)* 15.0 - longitude_deg)
@@ -153,7 +154,7 @@ def mean_earth_sun_distance(utc_datetime):
             radiation models, p.113
     """   
 
-    return (1 - (0.0335 * math.sin(360 * ((solar.GetDayOfYear(utc_datetime)) - 94)) / (365)))
+    return (1 - (0.0335 * math.sin(360 * ((julian.GetDayOfYear(utc_datetime)) - 94)) / (365)))
 
 def extraterrestrial_irrad(utc_datetime, latitude_deg, longitude_deg,SC=SC_default):
     """Equation calculates Extratrestrial radiation. Solar radiation incident outside the earth's
@@ -188,11 +189,12 @@ def extraterrestrial_irrad(utc_datetime, latitude_deg, longitude_deg,SC=SC_defau
     .. [2] Dr. J. Schumacher and et al,"INSEL LE(Integrated Simulation Environment Language)Block reference",p.68
         
     """
-    day = solar.GetDayOfYear(utc_datetime)
-    ab = math.cos(2 * math.pi * (solar.GetDayOfYear(utc_datetime) - 1.0)/(365.0))
-    bc = math.sin(2 * math.pi * (solar.GetDayOfYear(utc_datetime) - 1.0)/(365.0))
-    cd = math.cos(2 * (2 * math.pi * (solar.GetDayOfYear(utc_datetime) - 1.0)/(365.0)))
-    df = math.sin(2 * (2 * math.pi * (solar.GetDayOfYear(utc_datetime) - 1.0)/(365.0)))
+    day = julian.GetDayOfYear(utc_datetime)
+    day_ratio = (julian.GetDayOfYear(utc_datetime) - 1.0)/(365.0)
+    ab = math.cos(2 * math.pi * day_ratio)
+    bc = math.sin(2 * math.pi * day_ratio)
+    cd = math.cos(2 * (2 * math.pi * day_ratio))
+    df = math.sin(2 * (2 * math.pi * day_ratio))
     decl = solar.GetDeclination(day)
     ha = solar.GetHourAngle(utc_datetime, longitude_deg)
     ZA = math.sin(latitude_deg) * math.sin(decl) + math.cos(latitude_deg) * math.cos(decl) * math.cos(ha)
@@ -222,7 +224,7 @@ def declination_degree(utc_datetime, TY = TY_default ):
     .. [1] http://pysolar.org/
              
     """    
-    return 23.45 * math.sin((2 * math.pi / (TY)) * ((solar.GetDayOfYear(utc_datetime)) - 81))
+    return 23.45 * math.sin((2 * math.pi / (TY)) * ((julian.GetDayOfYear(utc_datetime)) - 81))
 
 
 def solarelevation_function_clear(latitude_deg, longitude_deg, utc_datetime,temperature_celsius = 25,