b612/astro
1
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

bug fix

Browse Source
This commit is contained in:
兔子 2019-10-29 09:06:54 +08:00
parent 9d047c848a
commit 11702093ed
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basic/moon.go
View File

@ -1136,7 +1136,7 @@ func CalcMoonSH(Year float64, C int) float64 {
JD0 := JD1 JD0 := JD1
stDegree := SunMoonSeek(JD0) - float64(C) stDegree := SunMoonSeek(JD0) - float64(C)
stDegreep := (SunMoonSeek(JD0+0.000005) - SunMoonSeek(JD0-0.000005)) / 0.00001 stDegreep := (SunMoonSeek(JD0+0.000005) - SunMoonSeek(JD0-0.000005)) / 0.00001
JD1 := JD0 - stDegree/stDegreep JD1 = JD0 - stDegree/stDegreep
if math.Floor(JD1-JD0) <= 0.000001 { if math.Floor(JD1-JD0) <= 0.000001 {
break break
} }
@ -1219,7 +1219,7 @@ func CalcMoonXH(Year float64, C int) float64 {
JD0 := JD1 JD0 := JD1
stDegree := SunMoonSeek(JD0) - float64(C) stDegree := SunMoonSeek(JD0) - float64(C)
stDegreep := (SunMoonSeek(JD0+0.000005) - SunMoonSeek(JD0-0.000005)) / 0.00001 stDegreep := (SunMoonSeek(JD0+0.000005) - SunMoonSeek(JD0-0.000005)) / 0.00001
JD1 := JD0 - stDegree/stDegreep JD1 = JD0 - stDegree/stDegreep
if math.Floor(JD1-JD0) <= 0.000001 { if math.Floor(JD1-JD0) <= 0.000001 {
break break
} }
@ -1381,7 +1381,7 @@ func GetMoonTZTime(JD, Lon, Lat, TZ float64) float64 { //实际中天时间{
JD0 := JD1 JD0 := JD1
stDegree := MoonTimeAngle(JD0, Lon, Lat, TZ) - 359.599 stDegree := MoonTimeAngle(JD0, Lon, Lat, TZ) - 359.599
stDegreep := (MoonTimeAngle(JD0+0.000005, Lon, Lat, TZ) - MoonTimeAngle(JD0-0.000005, Lon, Lat, TZ)) / 0.00001 stDegreep := (MoonTimeAngle(JD0+0.000005, Lon, Lat, TZ) - MoonTimeAngle(JD0-0.000005, Lon, Lat, TZ)) / 0.00001
JD1 := JD0 - stDegree/stDegreep JD1 = JD0 - stDegree/stDegreep
if math.Floor(JD1-JD0) <= 0.000001 { if math.Floor(JD1-JD0) <= 0.000001 {
break break
} }

2
basic/sun.go
View File

@ -1371,7 +1371,7 @@ func SunAngle(JD, Lon, Lat, TZ float64) float64 {
func GetGZ(year int) string { func GetGZ(year int) string {
tiangan := []string{"庚", "辛", "壬", "癸", "甲", "乙", "丙", "丁", "戊", "已"} tiangan := []string{"庚", "辛", "壬", "癸", "甲", "乙", "丙", "丁", "戊", "已"}
dizhi := []string{"申", "酉", "戌", "亥", "子", "丑", "寅", "卯", "辰", "巳", "午", "未"} dizhi := []string{"申", "酉", "戌", "亥", "子", "丑", "寅", "卯", "辰", "巳", "午", "未"}
t := year - (year / 100 * 10) t := year - (year / 10 * 10)
d := year % 12 d := year % 12
return tiangan[t] + dizhi[d] + "年" return tiangan[t] + dizhi[d] + "年"
} }