Code

MCT diffusive wave routing#179

Code

Open

ecCinziaMazzetti wants to merge 141 commits intodevelopmentec-jrc/lisflood-code:developmentfrom feature/mct_optimec-jrc/lisflood-code:feature/mct_optimCopy head branch name to clipboard

+221,299-995

Commits

Commits on Jan 25, 2023

• Initial commit for mct routing

  

  Cinzia Mazzetti

  committed
  b7039ee

  Copy full SHA for b7039ee

Commits on Mar 23, 2023

• Refactored kinematic routing only

  

  Cinzia Mazzetti

  committed
  0707df2

  Copy full SHA for 0707df2

• Refactored split routing

  

  Cinzia Mazzetti

  committed
  beab041

  Copy full SHA for beab041

• Refactored InitLisflood

  

  Cinzia Mazzetti

  committed
  b8d98e3

  Copy full SHA for b8d98e3

Commits on Mar 24, 2023

• Init Kin and Split routing refactored and giving same results

  

  Cinzia Mazzetti

  committed
  800b706

  Copy full SHA for 800b706

• initialisation for MCT

  

  Cinzia Mazzetti

  committed
  55543a4

  Copy full SHA for 55543a4

Commits on Mar 29, 2023

• Wiring of MCT function

  

  Cinzia Mazzetti

  committed
  7350d44

  Copy full SHA for 7350d44

Commits on Mar 30, 2023

• Added utility functions qdy, hdv and scalax (Newton-Raphson)

  

  Cinzia Mazzetti

  committed
  660e373

  Copy full SHA for 660e373

Commits on Mar 31, 2023

• Added core of the function for Muskingum-Cunge-Todini routing

  

  Cinzia Mazzetti

  committed
  a27c8fc

  Copy full SHA for a27c8fc

• Bugfix FORTRAN->Python3

  

  Cinzia Mazzetti

  committed
  d67b56e

  Copy full SHA for d67b56e

Commits on Apr 5, 2023

• MCT inputs/outputs and bugfixes

  

  Cinzia Mazzetti

  committed
  1060c65

  Copy full SHA for 1060c65

• Added documentation for Kinematic routing

  

  Cinzia Mazzetti

  committed
  0282a55

  Copy full SHA for 0282a55

Commits on Apr 14, 2023

• Calc average outflow for kinematic routing

  

  Cinzia Mazzetti

  committed
  a779a7b

  Copy full SHA for a779a7b

Commits on Apr 19, 2023

• Renaming functions

  

  Cinzia Mazzetti

  committed
  375f647

  Copy full SHA for 375f647

• Fixed cold start initialization for MCT

  

  Cinzia Mazzetti

  committed
  f9902c8

  Copy full SHA for f9902c8

Commits on Apr 26, 2023

• Renamed scalax to hoq

  

  Cinzia Mazzetti

  committed
  2c1e9fb

  Copy full SHA for 2c1e9fb

• first outputs

  

  Cinzia Mazzetti

  committed
  9b7c49e

  Copy full SHA for 9b7c49e

Commits on Apr 27, 2023

• Introducing mctWave and mct_river_routing

  

  Cinzia Mazzetti

  committed
  6da7853

  Copy full SHA for 6da7853

Commits on Apr 28, 2023

• found a way to loop over channel pixels

  

  Cinzia Mazzetti

  committed
  290c0a0

  Copy full SHA for 290c0a0

Commits on May 10, 2023

• Adding comments to kinematic wave parallel

  

  Cinzia Mazzetti

  committed
  2f7c137

  Copy full SHA for 2f7c137

Commits on May 11, 2023

• Refactored MCT to work on a single pixel. Introduced looping on MCT pixels

  

  Cinzia Mazzetti

  committed
  52553f3

  Copy full SHA for 52553f3

Commits on May 15, 2023

• Added lateral flow to MCT

  

  Cinzia Mazzetti

  committed
  731de2b

  Copy full SHA for 731de2b

Commits on May 16, 2023

• First working version of MCT with lateral flow

  

  Cinzia Mazzetti

  committed
  2356810

  Copy full SHA for 2356810

Commits on May 18, 2023

• Code clean up

  

  Cinzia Mazzetti

  committed
  b21a175

  Copy full SHA for b21a175

Commits on May 19, 2023

• trying to calculate average discharge

  

  Cinzia Mazzetti

  committed
  9942231

  Copy full SHA for 9942231

• Using ChanQ and not the averege

  

  Cinzia Mazzetti

  committed
  8ab14cd

  Copy full SHA for 8ab14cd

Commits on May 31, 2023

• Code clean up

  

  Cinzia Mazzetti

  committed
  90df095

  Copy full SHA for 90df095

Commits on Feb 2, 2024

• Comments and Kinematic mass balance

  

  Cinzia Mazzetti

  committed
  de44f9e

  Copy full SHA for de44f9e

Commits on Feb 13, 2024

• Uncommented mass balance error calculation

  

  Cinzia Mazzetti

  committed
  95ad2ff

  Copy full SHA for 95ad2ff

• ChanQ and ChanM3 moved from dynamic to routing

  

  Cinzia Mazzetti

  committed
  a84fa49

  Copy full SHA for a84fa49

Commits on Feb 16, 2024

• checking riverbed slope for MCT cells

  

  Cinzia Mazzetti

  committed
  93245bc

  Copy full SHA for 93245bc

• cleaning up LddChan

  

  Cinzia Mazzetti

  committed
  9b2ed0e

  Copy full SHA for 9b2ed0e

• added reservoirs and lakes to MCT routing

  

  Cinzia Mazzetti

  committed
  820d254

  Copy full SHA for 820d254

Commits on Feb 19, 2024

• Cleaned up routing code (initial)

  

  Cinzia Mazzetti

  committed
  fd3c746

  Copy full SHA for fd3c746

Commits on Feb 20, 2024

• Cleaned up routing code (dynamic)

  

  Cinzia Mazzetti

  committed
  9255b4f

  Copy full SHA for 9255b4f

• Restored check for riverbed slope in MCT grid cells

  

  Cinzia Mazzetti

  committed
  6389294

  Copy full SHA for 6389294

Commits on Feb 29, 2024

• added inflows to mct routing

  

  Cinzia Mazzetti

  committed
  61db039

  Copy full SHA for 61db039

Commits on Mar 20, 2024

• Porting mct_routing from Lisflood version 4.1 to 4.3.1

  

  Cinzia Mazzetti

  committed
  ef55bb8

  Copy full SHA for ef55bb8

Commits on Mar 22, 2024

• water evaporating from total water volume in channel

  

  Cinzia Mazzetti

  committed
  3dfd192

  Copy full SHA for 3dfd192

• water abstraction from total water volume in river channel

  

  Cinzia Mazzetti

  committed
  5eb4d3a

  Copy full SHA for 5eb4d3a

Commits on Mar 25, 2024

• added variable to set maximum riverbed slope for mct routing grid cells

  

  Cinzia Mazzetti

  committed
  8432a7f

  Copy full SHA for 8432a7f

Commits on Mar 26, 2024

• using generic LddStructureChan and IsUpOfStructureChan

  

  Cinzia Mazzetti

  committed
  51f9f3c

  Copy full SHA for 51f9f3c

Commits on Mar 27, 2024

• added dynamic test for inflow

  

  Cinzia Mazzetti

  committed
  04914a4

  Copy full SHA for 04914a4

Commits on Apr 3, 2024

• Added dynamic test for inflow

  

  Cinzia Mazzetti

  committed
  44660a1

  Copy full SHA for 44660a1

Commits on Apr 4, 2024

• added comments

  

  Cinzia Mazzetti

  committed
  08c4ae4

  Copy full SHA for 08c4ae4

• Adding split routing and mct option

  

  Cinzia Mazzetti

  committed
  e94f979

  Copy full SHA for e94f979

Commits on Apr 8, 2024

• fixed bug in PrevDm0

  

  Cinzia Mazzetti

  committed
  a64d1f1

  Copy full SHA for a64d1f1

Commits on Apr 10, 2024

• running on catchment with single gridcell

  

  Cinzia Mazzetti

  committed
  35108a6

  Copy full SHA for 35108a6

Commits on Apr 12, 2024

• modified init values for mct channels

  

  Cinzia Mazzetti

  committed
  624803b

  Copy full SHA for 624803b

Commits on Apr 17, 2024

• mct using average discharge and closing water balance on single grid cell

  

  Cinzia Mazzetti

  committed
  36aecd5

  Copy full SHA for 36aecd5

Commits on Apr 18, 2024

• mct using average discharge and closing water balance on catchment

  

  Cinzia Mazzetti

  committed
  313d00c

  Copy full SHA for 313d00c

Commits on Apr 26, 2024

• trying to calculate the average discharge for kinematic routing

  

  Cinzia Mazzetti

  committed
  b252216

  Copy full SHA for b252216

Commits on May 1, 2024

• using Qavg for channel mass balance

  

  Cinzia Mazzetti

  committed
  53446b7

  Copy full SHA for 53446b7

Commits on May 22, 2024

• Testing amss balance MB on single kinematic cell

  

  Cinzia Mazzetti

  committed
  d68f42c

  Copy full SHA for d68f42c

• Moved integration on control volume to inner loop in mct.

  

  Cinzia Mazzetti

  committed
  d88f6cd

  Copy full SHA for d88f6cd

Commits on May 23, 2024

• Commenting ChanQAvgInDt

  

  Cinzia Mazzetti

  committed
  edb1788

  Copy full SHA for edb1788

• Cleaning mct code

  

  Cinzia Mazzetti

  committed
  0f3d73c

  Copy full SHA for 0f3d73c

Commits on May 24, 2024

• Solving issue with numbe in discharge_avg in solve1pixel

  

  Cinzia Mazzetti

  committed
  baf178d

  Copy full SHA for baf178d

• Comments

  

  Cinzia Mazzetti

  committed
  58688fe

  Copy full SHA for 58688fe

• Merge branch 'kinematic_parallel' into merging_kinematic_parallel_to_mct

  Show description for 26037b3
  

  Cinzia Mazzetti

  committed
  26037b3

  Copy full SHA for 26037b3

• Kinematic and mct routing both using Q from integration on control volume. Tested on single pixel only.

  

  Cinzia Mazzetti

  committed
  228d1fd

  Copy full SHA for 228d1fd

Commits on May 31, 2024

• commenting mass balance prints

  

  Cinzia Mazzetti

  committed
  9fd40a4

  Copy full SHA for 9fd40a4

• avoid negative discharge

  

  Cinzia Mazzetti

  committed
  0d932f0

  Copy full SHA for 0d932f0

• q1mm>eps to avoid instability and mass balance errors

  

  Cinzia Mazzetti

  committed
  ef1dfc3

  Copy full SHA for ef1dfc3

• adjusting checks for small q values

  

  Cinzia Mazzetti

  committed
  a58d403

  Copy full SHA for a58d403

Commits on Jun 4, 2024

• using Q average for surface routing

  

  Cinzia Mazzetti

  committed
  928e5cf

  Copy full SHA for 928e5cf

Commits on Jun 25, 2024

• added dummy variables to split routing

  

  Cinzia Mazzetti

  committed
  a09bf96

  Copy full SHA for a09bf96

• going back to using self.var variables for kinematic routing

  

  Cinzia Mazzetti

  committed
  c613d31

  Copy full SHA for c613d31

• commenting code in kinematic routing

  

  Cinzia Mazzetti

  committed
  f9a33d5

  Copy full SHA for f9a33d5

• using self.var variables for kinematic routing in MCT

  

  Cinzia Mazzetti

  committed
  26be348

  Copy full SHA for 26be348

Commits on Jun 26, 2024

• cleaned up code for kinematic routing

  

  Cinzia Mazzetti

  committed
  cf8af65

  Copy full SHA for cf8af65

• cleaned up code for split routing

  

  Cinzia Mazzetti

  committed
  d8fba60

  Copy full SHA for d8fba60

• cleaned up code for mct

  

  Cinzia Mazzetti

  committed
  dea8b0d

  Copy full SHA for dea8b0d

• fixed output for split routing + mct

  

  Cinzia Mazzetti

  committed
  3c4c517

  Copy full SHA for 3c4c517

Commits on Jun 27, 2024

• comments and clean up for routing

  

  Cinzia Mazzetti

  committed
  fb3f4c6

  Copy full SHA for fb3f4c6

• Calculating average outflow discharge in split routing

  

  Cinzia Mazzetti

  committed
  c5e61bc

  Copy full SHA for c5e61bc

Commits on Jun 28, 2024

• removed workaround on ChanQAvgDt for split routing

  

  Cinzia Mazzetti

  committed
  350b01f

  Copy full SHA for 350b01f

Commits on Jul 1, 2024

• Using chanman2 for MCT routing (same as split routing)

  

  Cinzia Mazzetti

  committed
  47c31a3

  Copy full SHA for 47c31a3

• Fixed eror in split routing+MCT, now using ChanQKinOutAvgDtEnd as input to MCT

  

  Cinzia Mazzetti

  committed
  d9ffade

  Copy full SHA for d9ffade

Commits on Jul 2, 2024

• Added dynamic inflow test for MCT routing

  

  Cinzia Mazzetti

  committed
  ee694fc

  Copy full SHA for ee694fc

Commits on Jul 3, 2024

• Added test for MCT results

  

  Cinzia Mazzetti

  committed
  92c07ea

  Copy full SHA for 92c07ea

• refactored the test for MCT results

  

  Cinzia Mazzetti

  committed
  49e4ee2

  Copy full SHA for 49e4ee2

Commits on Jul 9, 2024

• fixed cleaning method and MCT tests can run

  

  Cinzia Mazzetti

  committed
  707fb51

  Copy full SHA for 707fb51

• preparing to add more tests

  

  Cinzia Mazzetti

  committed
  8869b44

  Copy full SHA for 8869b44

• added reference data for mct+split kinematic split routing

  

  Cinzia Mazzetti

  committed
  9ed1e2c

  Copy full SHA for 9ed1e2c

• added more tests for mct routing results

  

  Cinzia Mazzetti

  committed
  ba7818b

  Copy full SHA for ba7818b

• trying to make the on-line tests work

  

  Cinzia Mazzetti

  committed
  c1f758b

  Copy full SHA for c1f758b

Commits on Jul 10, 2024

• optimising mct (NOT TESTED)

  corentincarton

  committed
  eeda068

  Copy full SHA for eeda068

• bugfix (not tested)

  

  Cinzia Mazzetti

  committed
  c4cf459

  Copy full SHA for c4cf459

Commits on Jul 11, 2024

• bugfix swapped variables in return

  

  Cinzia Mazzetti

  committed
  43cdb90

  Copy full SHA for 43cdb90

• bug fixing

  

  Cinzia Mazzetti

  committed
  85653e9

  Copy full SHA for 85653e9

Commits on Jul 12, 2024

• Bugfix (passed MCT tests)

  

  Cinzia Mazzetti

  committed
  90272b5

  Copy full SHA for 90272b5

• Not checking mberror in mct tests

  

  Cinzia Mazzetti

  committed
  a2a4df4

  Copy full SHA for a2a4df4

Commits on Jul 15, 2024

• simplify mct loop

  corentincarton

  committed
  b0147ee

  Copy full SHA for b0147ee

• removing unsed loop

  

  Cinzia Mazzetti

  committed
  830d38b

  Copy full SHA for 830d38b

• ready to parallelise

  

  Cinzia Mazzetti

  committed
  8ccecdd

  Copy full SHA for 8ccecdd

• refactor mct routing to allow parallelisation

  corentincarton

  committed
  521288b

  Copy full SHA for 521288b

• bugfix

  

  Cinzia Mazzetti

  committed
  25269d8

  Copy full SHA for 25269d8

• refactor mct routing to allow parallelisation

  corentincarton

  committed
  850d651

  Copy full SHA for 850d651

• refactor mct routing to allow parallelisation

  corentincarton

  committed
  202828b

  Copy full SHA for 202828b

• debug parallel mct routing

  corentincarton

  committed
  b1d180a

  Copy full SHA for b1d180a

• debug parallel mct routing

  corentincarton

  committed
  cb50db5

  Copy full SHA for cb50db5

• debug parallel mct routing

  corentincarton

  committed
  789bd2b

  Copy full SHA for 789bd2b

• debug parallel mct routing

  corentincarton

  committed
  a6533ea

  Copy full SHA for a6533ea

• debug parallel mct routing

  corentincarton

  committed
  278938b

  Copy full SHA for 278938b

• adding some comments

  corentincarton

  committed
  122a5b6

  Copy full SHA for 122a5b6

Commits on Jul 16, 2024

• minor interface change for mct

  corentincarton

  committed
  26b8385

  Copy full SHA for 26b8385

• bugfix

  

  Cinzia Mazzetti

  committed
  1ed3adc

  Copy full SHA for 1ed3adc

• merge conflicts

  

  Cinzia Mazzetti

  committed
  b38a6a3

  Copy full SHA for b38a6a3

• optimised mct code

  

  Cinzia Mazzetti

  committed
  1713fea

  Copy full SHA for 1713fea

• updating mct tests after changing mct initialisation

  

  Cinzia Mazzetti

  committed
  a8bdbc7

  Copy full SHA for a8bdbc7

Commits on Jul 19, 2024

• added MCT keys to template settings file

  

  Cinzia Mazzetti

  committed
  6f12cfc

  Copy full SHA for 6f12cfc

• added comments

  

  Cinzia Mazzetti

  committed
  15b7531

  Copy full SHA for 15b7531

Commits on Jul 24, 2024

• deleting files at the end of mct tests

  

  Cinzia Mazzetti

  committed
  77f0ff9

  Copy full SHA for 77f0ff9

• cleaning files at the and of the dynamic inflow test

  

  Cinzia Mazzetti

  committed
  d2556e7

  Copy full SHA for d2556e7

Commits on Jul 29, 2024

• debug cases with no mct pixels

  corentincarton

  committed
  1a46d6c

  Copy full SHA for 1a46d6c

Commits on Sep 13, 2024

• Added riverbed roughness parameter for MCT

  

  Cinzia Mazzetti

  committed
  c2e8e15

  Copy full SHA for c2e8e15

Commits on Oct 17, 2024

• split and optimization of the new solve1pixel function for the mct branch

  doc78

  committed
  b00b771

  Copy full SHA for b00b771

• minor optimisation

  corentincarton

  committed
  73da888

  Copy full SHA for 73da888

Commits on Nov 11, 2024

• Feature/channel param (#177)

  Show description for ca77e35
  

  ecCinziaMazzetti

  and

  Cinzia Mazzetti

  authored
  ca77e35

  Copy full SHA for ca77e35

• Setting parameters of channels geometry to 1

  

  Cinzia Mazzetti

  committed
  9b78aaa

  Copy full SHA for 9b78aaa

Commits on Nov 15, 2024

• updated mct tests

  

  Cinzia Mazzetti

  committed
  db4ca30

  Copy full SHA for db4ca30

• Merge pull request #173 from ec-jrc/feature/mct_optim_fix

  Show description for 96e0d96
  ecCinziaMazzetti

  authored
  96e0d96

  Copy full SHA for 96e0d96

Commits on Nov 20, 2024

• Added warm start for MCT routing

  

  Cinzia Mazzetti

  committed
  516f7df

  Copy full SHA for 516f7df

• Added test for MCT warm start

  

  Cinzia Mazzetti

  committed
  c1b48b9

  Copy full SHA for c1b48b9

• restoring GDAL version in requirements

  

  Cinzia Mazzetti

  committed
  7996e9e

  Copy full SHA for 7996e9e

Commits on Nov 21, 2024

• bugfix

  

  Cinzia Mazzetti

  committed
  98c9b00

  Copy full SHA for 98c9b00

Commits on Nov 22, 2024

• Updating settings files in tests

  

  Cinzia Mazzetti

  committed
  55b6248

  Copy full SHA for 55b6248

Commits on Nov 26, 2024

• Slow MCT warm start test for LF_ETRS89_UseCase

  

  Cinzia Mazzetti

  committed
  0bf3d02

  Copy full SHA for 0bf3d02

• Slow MCT results test for LF_ETRS89_UseCase

  

  Cinzia Mazzetti

  committed
  ee7373f

  Copy full SHA for ee7373f

Commits on Nov 28, 2024

• Slow MCT inflow test for LF_ETRS89_UseCase

  

  Cinzia Mazzetti

  committed
  c7ee44d

  Copy full SHA for c7ee44d

Commits on Nov 29, 2024

• organising fast anf slow tests

  

  Cinzia Mazzetti

  committed
  e094ccd

  Copy full SHA for e094ccd

• bugfix for slow tests

  

  Cinzia Mazzetti

  committed
  732b31b

  Copy full SHA for 732b31b

Commits on Dec 2, 2024

• updating model documentation

  ecCinziaMazzetti

  committed
  3ebc502

  Copy full SHA for 3ebc502

Commits on Dec 4, 2024

• Merge branch 'development' into feature/mct_optim

  doc78

  committed
  d5f9e25

  Copy full SHA for d5f9e25

• Small fix in prerun xml file

  doc78

  committed
  0b7e1a5

  Copy full SHA for 0b7e1a5

Commits on Dec 6, 2024

• Updated mct tests reference results for LF_ETRS89

  

  Cinzia Mazzetti

  committed
  65c113b

  Copy full SHA for 65c113b

• Updated mct tests reference results for LF_ETRS89

  

  Cinzia Mazzetti

  committed
  1cdb571

  Copy full SHA for 1cdb571

Commits on Dec 10, 2024

• Changed tolerance in MCT and MCTS unit tests results slow

  doc78

  committed
  94d88ab

  Copy full SHA for 94d88ab

• Merge pull request #180 from ec-jrc/feature/mct_optim_results_update

  Show description for 1834d9c
  doc78

  authored
  1834d9c

  Copy full SHA for 1834d9c

• Small fixes for output folder creation

  doc78

  committed
  20aedc3

  Copy full SHA for 20aedc3