gsn/predictor
1
Fork 1
Code Issues 5 Pull requests 1 Projects Releases Activity

Refactor #7

Open
a.antonov wants to merge 8 commits from afanasyev.aa/predictor:refactor into main
pull from: afanasyev.aa/predictor:refactor
merge into: gsn:main
Conversation 0 Commits 8 Files changed 72 +10 -9
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ca95e06ab7 - Show all commits

2
internal/pkg/grib/cube.go
View file

@ -28,7 +28,7 @@ func openCube(path string) (*cube, error) {
} }
const ( const (
nT = 97 // 0-96 hours with step 1 hour nT = 33 // 0-96 hours with step 3 hours (33 time steps)
nP = 47 // 47 pressure levels matching tawhiri nP = 47 // 47 pressure levels matching tawhiri
nLat = 361 nLat = 361
nLon = 720 nLon = 720

7
internal/pkg/grib/extractor.go
View file

@ -17,9 +17,10 @@ func (d *dataset) uv(lat, lon, alt float64, tHours float64) (float64, float64) {
x0 := int(math.Floor(ix)) % d.cube.lon x0 := int(math.Floor(ix)) % d.cube.lon
x1 := (x0 + 1) % d.cube.lon x1 := (x0 + 1) % d.cube.lon
wx := ix - float64(x0) wx := ix - float64(x0)
// For hourly data (step = 1 hour) // For 3-hourly data (step = 3 hours)
it0 := int(math.Floor(tHours)) // Convert tHours to 3-hour index (e.g., 1.5 hours -> index 0.5, interpolate between 0 and 1)
wt := tHours - float64(it0) it0 := int(math.Floor(tHours / 3.0))
wt := (tHours - float64(it0*3)) / 3.0 // Interpolation weight within 3-hour window
p := pressureFromAlt(alt) p := pressureFromAlt(alt)
ip0 := 0 ip0 := 0
for ip0+1 < len(pressureLevels) && pressureLevels[ip0+1] > p { for ip0+1 < len(pressureLevels) && pressureLevels[ip0+1] > p {

2
internal/pkg/grib/grib.go
View file

@ -186,7 +186,7 @@ func (s *service) Update(ctx context.Context) error {
} }
func assembleCube(dir string, run time.Time, cubePath string) error { func assembleCube(dir string, run time.Time, cubePath string) error {
const sizePerVar = 97 * 47 * 361 * 720 * 4 // 97 time steps (0-96 hours), 47 pressure levels const sizePerVar = 33 * 47 * 361 * 720 * 4 // 33 time steps (0-96 hours, 3-hour intervals), 47 pressure levels
total := int64(sizePerVar * 3) // 3 variables: gh, u, v total := int64(sizePerVar * 3) // 3 variables: gh, u, v
f, err := os.Create(cubePath) f, err := os.Create(cubePath)
if err != nil { if err != nil {

8
internal/pkg/grib/util.go
View file

@ -6,11 +6,11 @@ import (
"time" "time"
) )
// Generate steps from 0 to 96 with step 1 hour (97 steps total) // Generate steps from 0 to 96 with step 3 hours (33 steps total)
// GFS provides hourly data for 0-120 hours, we use first 96 hours // GFS provides 3-hourly data for 0-120 hours, we use first 96 hours (0, 3, 6, ..., 96)
var steps = func() []int { var steps = func() []int {
result := make([]int, 0, 97) result := make([]int, 0, 33)
for i := 0; i <= 96; i++ { for i := 0; i <= 96; i += 3 {
result = append(result, i) result = append(result, i)
} }
return result return result