Commit e24d032
Add Nudging decay (including reading LastObs files) (#310)
* added last obs df including discharge and ids
* lastobs nc file folder
* formatting and cleanup
* added both discharge and model discharge
* added prediction delta timesteps
* da decay with exp decay incorporated, unblackened for readability
* added check between obs file results and our fvd output
* removed pdbs and set to run on lastobs
* added verbose statements
* restructuring of lastobs df to simplify process
* generalized last timestep index call to automatically determine from various input sizes
* github requested fixes to if statements and cleanup
* updated variable
* working ncar da decay prototype need to bring in real lastobs data inside equation
* getting da values in order through classic da assim technique
* pushing ids and values to mc reach
* fixed gage id matching, cython is broken cant compile correctly, need to print values to identify if da is properly working
* saving changes, trying to fix old DA function
* restructing da timeslice file read to use datetime, not generalized before
* added last obs df including discharge and ids
* lastobs nc file folder
* formatting and cleanup
* added both discharge and model discharge
* added prediction delta timesteps
* da decay with exp decay incorporated, unblackened for readability
* added check between obs file results and our fvd output
* removed pdbs and set to run on lastobs
* added verbose statements
* restructuring of lastobs df to simplify process
* generalized last timestep index call to automatically determine from various input sizes
* github requested fixes to if statements and cleanup
* updated variable
* generalized da naming conventional and date timeframe with improved interpolation
* removed extra comments
* remove dependence on not-yet-created flowveldepth
* name "last_obs_file"
* include data_assimilation_parameters to yaml
* include empty dict for data_assimilation_parameters in yaml
* black
* added paths to shared drive locations and blackened files
* quick merge changes
* files working
* sync for merge
* sync for merge
* sync merge to upstream
* move last obs function next to usgs_da function
* add TODOs
* add lastobs to other parallel modes
* move last_obs above usgs_df
* cimports and cdefs for last_obs
* fixed broken usgs_df names were changed to folder in some areas and filter in others
* moved da functions into single wrapper in nhd_network_utilities
also harmonized inputs a bit.
* add da yaml file (DATA NOT YET ADDED)
* drop non-5-minute entries from time_slices
Also harmonizing inputs for merge.
* add function for finding the tailwater for a given segment
* add masks
* use pandas date_range
* cleanup
* add comment showing possible handling of extended DA
* Revert "add comment showing possible handling of extended DA"
This reverts commit 0455466.
* temporarily disable last_obs
* Update example yaml with inputs that work
* temporarily disable last_obs
* update comment
* adjust DA for perfect match
* removed filter list
* use efficient shape call for usgs_positions_list length
* add gage_maxtime and pseudocode for lastobs
* Identified major hard-code issue in structured- and structured-obj
* update lastobs comments and pseudocode
* update da test yaml file with additional gage options
* use "reindex" to fill/eliminate columns for usgs_df
* functions in place for decay but last obs file is behaving incorrectly and changing parity check even when all uses are turned off
* added decay timestep count
* Use new fields in flowveldepth to simplify initial condition handling
To facilitate this, added a constant qvd_ts_w (flowveldepth timestep width)
to define the standard column width.
* add two additional segments for parity checking
* reconfigure reach splitting to consider gages
* update diffusive call signature
* yaml updates for test
* black
Co-authored-by: James Halgren <james.halgren@noaa.gov>1 parent fa93df6 commit e24d032
File tree
8 files changed
+430
-73
lines changed- src
- python_framework_v02/troute
- python_routing_v02
- fast_reach
- test/input
- geo/last_obs
- yaml
8 files changed
+430
-73
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
11 | 14 | | |
12 | 15 | | |
13 | 16 | | |
| |||
186 | 189 | | |
187 | 190 | | |
188 | 191 | | |
189 | | - | |
190 | 192 | | |
191 | 193 | | |
192 | 194 | | |
| |||
339 | 341 | | |
340 | 342 | | |
341 | 343 | | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
342 | 430 | | |
343 | 431 | | |
344 | 432 | | |
| |||
421 | 509 | | |
422 | 510 | | |
423 | 511 | | |
424 | | - | |
425 | | - | |
426 | | - | |
427 | | - | |
428 | | - | |
429 | | - | |
430 | | - | |
431 | | - | |
432 | | - | |
433 | | - | |
434 | | - | |
435 | | - | |
436 | | - | |
437 | | - | |
438 | | - | |
439 | | - | |
440 | | - | |
441 | | - | |
442 | | - | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
443 | 533 | | |
444 | 534 | | |
| 535 | + | |
445 | 536 | | |
446 | 537 | | |
447 | 538 | | |
448 | 539 | | |
449 | 540 | | |
| 541 | + | |
450 | 542 | | |
451 | 543 | | |
452 | 544 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
91 | 116 | | |
92 | 117 | | |
93 | 118 | | |
| |||
Lines changed: 50 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
419 | 419 | | |
420 | 420 | | |
421 | 421 | | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
422 | 435 | | |
423 | 436 | | |
424 | 437 | | |
425 | | - | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
426 | 447 | | |
427 | 448 | | |
428 | 449 | | |
| |||
569 | 590 | | |
570 | 591 | | |
571 | 592 | | |
572 | | - | |
573 | | - | |
| 593 | + | |
| 594 | + | |
574 | 595 | | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
575 | 618 | | |
576 | 619 | | |
577 | | - | |
| 620 | + | |
578 | 621 | | |
579 | | - | |
| 622 | + | |
580 | 623 | | |
581 | 624 | | |
582 | 625 | | |
583 | 626 | | |
584 | 627 | | |
585 | | - | |
| 628 | + | |
586 | 629 | | |
587 | 630 | | |
588 | 631 | | |
| |||
597 | 640 | | |
598 | 641 | | |
599 | 642 | | |
600 | | - | |
| 643 | + | |
601 | 644 | | |
602 | 645 | | |
603 | 646 | | |
| |||
0 commit comments