diff --git a/basic/moon.go b/basic/moon.go index c218495..e739f75 100644 --- a/basic/moon.go +++ b/basic/moon.go @@ -1136,7 +1136,7 @@ func CalcMoonSH(Year float64, C int) float64 { JD0 := JD1 stDegree := SunMoonSeek(JD0) - float64(C) 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 { break } @@ -1219,7 +1219,7 @@ func CalcMoonXH(Year float64, C int) float64 { JD0 := JD1 stDegree := SunMoonSeek(JD0) - float64(C) 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 { break } @@ -1381,7 +1381,7 @@ func GetMoonTZTime(JD, Lon, Lat, TZ float64) float64 { //实际中天时间{ JD0 := JD1 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 - JD1 := JD0 - stDegree/stDegreep + JD1 = JD0 - stDegree/stDegreep if math.Floor(JD1-JD0) <= 0.000001 { break } diff --git a/basic/sun.go b/basic/sun.go index 9d48e78..d4a696d 100644 --- a/basic/sun.go +++ b/basic/sun.go @@ -1371,7 +1371,7 @@ func SunAngle(JD, Lon, Lat, TZ float64) float64 { func GetGZ(year int) string { tiangan := []string{"庚", "辛", "壬", "癸", "甲", "乙", "丙", "丁", "戊", "已"} dizhi := []string{"申", "酉", "戌", "亥", "子", "丑", "寅", "卯", "辰", "巳", "午", "未"} - t := year - (year / 100 * 10) + t := year - (year / 10 * 10) d := year % 12 return tiangan[t] + dizhi[d] + "年" }