@@ -2260,11 +2260,13 @@ def from_netcdf_cube(cls, filename, x_name, y_name, t_name, heigth=None):
2260
2260
@classmethod
2261
2261
def from_netcdf_list (cls , filenames , t , x_name , y_name , indexs = None , heigth = None ):
2262
2262
new = cls ()
2263
- for i , t in enumerate (t ):
2264
- d = RegularGridDataset (filenames [i ], x_name , y_name , indexs = indexs )
2263
+ for i , _t in enumerate (t ):
2264
+ filename = filenames [i ]
2265
+ logger .debug (f"load file { i :02d} /{ len (t )} t={ _t } : { filename } " )
2266
+ d = RegularGridDataset (filename , x_name , y_name , indexs = indexs )
2265
2267
if heigth is not None :
2266
2268
d .add_uv (heigth )
2267
- new .datasets .append ((t , d ))
2269
+ new .datasets .append ((_t , d ))
2268
2270
return new
2269
2271
2270
2272
def shift_files (self , t , filename , heigth = None , ** rgd_kwargs ):
@@ -2276,6 +2278,7 @@ def shift_files(self, t, filename, heigth=None, **rgd_kwargs):
2276
2278
if heigth is not None :
2277
2279
d .add_uv (heigth )
2278
2280
self .datasets .append ((t , d ))
2281
+ logger .debug (f"shift and adding i={ len (self .datasets )} t={ t } : { filename } " )
2279
2282
2280
2283
def interp (self , grid_name , t , lons , lats , method = "bilinear" ):
2281
2284
"""
@@ -2436,6 +2439,7 @@ def advect(
2436
2439
else :
2437
2440
mask_particule += isnan (x ) + isnan (y )
2438
2441
while True :
2442
+ logger .debug (f"advect : t={ t } " )
2439
2443
if (backward and t <= t1 ) or (not backward and t >= t1 ):
2440
2444
t0 , u0 , v0 , m0 = t1 , u1 , v1 , m1
2441
2445
t1 , d1 = generator .__next__ ()
@@ -2462,25 +2466,21 @@ def advect(
2462
2466
yield t , x , y
2463
2467
2464
2468
def get_next_time_step (self , t_init ):
2465
- first = True
2466
2469
for i , (t , dataset ) in enumerate (self .datasets ):
2467
2470
if t < t_init :
2468
2471
continue
2469
- if first :
2470
- first = False
2471
- yield self .datasets [i - 1 ]
2472
+
2473
+ logger .debug (f"i={ i } , t={ t } , dataset={ dataset } " )
2472
2474
yield t , dataset
2473
2475
2474
2476
def get_previous_time_step (self , t_init ):
2475
- first = True
2476
2477
i = len (self .datasets )
2477
2478
for t , dataset in reversed (self .datasets ):
2478
2479
i -= 1
2479
2480
if t > t_init :
2480
2481
continue
2481
- if first :
2482
- first = False
2483
- yield self .datasets [i + 1 ]
2482
+
2483
+ logger .debug (f"i={ i } , t={ t } , dataset={ dataset } " )
2484
2484
yield t , dataset
2485
2485
2486
2486
0 commit comments