Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/water use #22

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open

Feature/water use #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ac39ecd
start developing water use module with water quality
Nov 25, 2022
0215914
first development
Nov 25, 2022
8494906
note for water allocation
edwinkost Nov 30, 2022
bc0bf6f
Create notes_with_gabriel_2
gcardenas1891 Dec 1, 2022
f60cf3f
Update notes_with_gabriel_2
gcardenas1891 Dec 2, 2022
c2455d8
Update notes_with_gabriel_2
gcardenas1891 Dec 2, 2022
30877f1
continue developing water quality
Dec 2, 2022
074b642
continue water quality
Dec 7, 2022
04520d5
continue water quality
Dec 7, 2022
0a9c720
Update surfaceWaterQuality.py
gcardenas1891 Dec 12, 2022
beef114
addition of water_demand_satisfied and water_demand_remaining variabl…
Dec 13, 2022
d6c8874
continue surface water quality development
Dec 13, 2022
b298a46
continue surface water quality development
Dec 13, 2022
c833789
continue surface water quality development
Dec 13, 2022
a8a430c
continue surface water quality development
Dec 13, 2022
ba3ba07
continue surface water quality development
Dec 13, 2022
7f95fb5
continue surface water quality development
Dec 13, 2022
068b98f
continue surface water quality development
Dec 13, 2022
61f8c4c
continue surface water quality development
Dec 13, 2022
9b44fad
continue surface water quality development
Dec 13, 2022
10ef3ff
continue surface water quality development
Dec 13, 2022
40077df
continue surface water quality development
Dec 13, 2022
dad87cc
updating ini file
Jan 26, 2023
f8a7080
fixing None values in threshold
Mar 15, 2023
3b1ee0b
seting up all water quality constituents
Mar 20, 2023
bb05de9
run consider_water_quality False
Mar 21, 2023
70e8f4d
update
Mar 23, 2023
ba214bb
update
Mar 29, 2023
1d6c527
Starting new branch
May 22, 2023
c0e6c1d
this commit is only for backup that we may not need it
Sep 28, 2023
dc4ed58
this commit is only for backup that we may not need it
Sep 28, 2023
5910b67
Merge pull request #1 from UU-Hydro/master
gcardenas1891 Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
460 changes: 460 additions & 0 deletions config/setup_05min_rhine-meuse_water_quality_development.ini
View file
Open in desktop

Large diffs are not rendered by default.

485 changes: 485 additions & 0 deletions config/setup_05min_water_quality.ini
View file
Open in desktop

Large diffs are not rendered by default.

444 changes: 444 additions & 0 deletions config/setup_05min_wateruse_test.ini
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/setup_30min.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ timestepsToAvgDischargeIni = global_30min/initialConditions/non-natural/cons
# - daily resolution
outDailyTotNC = discharge,totalRunoff,gwRecharge,totalGroundwaterAbstraction,surfaceWaterStorage
# - monthly resolution
outMonthTotNC = actualET,irrPaddyWaterWithdrawal,irrNonPaddyWaterWithdrawal,domesticWaterWithdrawal,industryWaterWithdrawal,livestockWaterWithdrawal,runoff,totalRunoff,baseflow,directRunoff,interflowTotal,totalGroundwaterAbstraction,desalinationAbstraction,surfaceWaterAbstraction,nonFossilGroundwaterAbstraction,fossilGroundwaterAbstraction,irrGrossDemand,nonIrrGrossDemand,totalGrossDemand,nonIrrWaterConsumption,nonIrrReturnFlow,precipitation,gwRecharge,surfaceWaterInf,referencePotET,totalEvaporation,totalPotentialEvaporation,totLandSurfaceActuaET,totalLandSurfacePotET,waterBodyActEvaporation,waterBodyPotEvaporation
outMonthTotNC = actualET,irrPaddyWaterWithdrawal,irrNonPaddyWaterWithdrawal,domesticWaterWithdrawal,industryWaterWithdrawal,livestockWaterWithdrawal,runoff,totalRunoff,baseflow,directRunoff,interflowTotal,totalGroundwaterAbstraction,desalinationAbstraction,surfaceWaterAbstraction,nonFossilGroundwaterAbstraction,fossilGroundwaterAbstraction,irrGrossDemand,nonIrrGrossDemand,totalGrossDemand,nonIrrWaterConsumption,irrWaterConsumption,nonIrrReturnFlow,precipitation,gwRecharge,surfaceWaterInf,referencePotET,totalEvaporation,totalPotentialEvaporation,totLandSurfaceActuaET,totalLandSurfacePotET,waterBodyActEvaporation,waterBodyPotEvaporation
outMonthAvgNC = discharge,temperature,dynamicFracWat,surfaceWaterStorage,interceptStor,snowFreeWater,snowCoverSWE,topWaterLayer,storUppTotal,storLowTotal,storGroundwater,storGroundwaterFossil,totalActiveStorageThickness,totalWaterStorageThickness,satDegUpp,satDegLow,channelStorage,waterBodyStorage
outMonthEndNC = storGroundwater,storGroundwaterFossil,waterBodyStorage,channelStorage,totalWaterStorageThickness,totalActiveStorageThickness
# - annual resolution
Expand Down
Loading