Supply source disaggregation, irrigation conveyance, and feature enhancements - #77

Merged

hassaniazi merged 30 commits into

devfrom

Jun 4, 2026

Commits on Aug 26, 2024

update package version number and name in a metadata call for get_example_data() to work
hassaniazi
committed
28323aa

Commits on Dec 6, 2024

ensure gcam could be queries for other nestings than the sector subsector tech for example resources subresources etc
hassaniazi
committed
0b75f98
add basin name mappings for old and new gcam names. also remove extra lines from easy_query
hassaniazi
committed
a690442
add a quick function to extract basin names from resource string for example basin_water withdrawals
hassaniazi
committed
f1fa995
include a workflow to disaggregated water source for each demand type in each grid cell
hassaniazi
committed
1ebad61
incorporate water source disaggregation into main tethys class
hassaniazi
committed
4e93953

Commits on Mar 14, 2025

only have water source shares for withdrawal; fix queries; hack to capture transnational basins within the USA
thurber
committed
1fc9616

Commits on Jun 9, 2025

fix
thurber
committed
e24d6dd

Commits on Jun 25, 2025

support `irrigation_conveyance_efficiency` configuration
thurber
committed
d29d640
remove early return
thurber
committed
b32ac44

Commits on Jun 4, 2026

fix metadata incl package name
hassaniazi
committed
72e8d95
fix package versions for a robust set up across machines esp with gcamreader dependencies and adding inputviwer and tests dependencies
hassaniazi
committed
c256a90
make the temporal tests pass with explicityly handling kwargs in tdmethods changing call signature and add checks in tdmethods
hassaniazi
committed
75ee3c7
restore legacy temporal api in model.py as well in line with the last commit
hassaniazi
committed
647be6a
bridge legacy kwargs and the new temporal_config() formal with a format normalization
hassaniazi
committed
b970d43
remove redundant pytest install for the prod build
hassaniazi
committed
bb14a68
catch version-specific issues and use editable dev install in deployment
hassaniazi
committed
1a83af1
bump up the version
hassaniazi
committed
1802990
upgrade action upload artifact to deploy
hassaniazi
committed
cb8eb24
only build paper for main
hassaniazi
committed
bb4b8b5
avoid returning resource names at the first underscore e.g, unlikely but something like upper_colorado could break

hassaniazi
and
Copilot
authored
c6a6e3d
avoid hard coding demand type

hassaniazi
and
Copilot
authored
216a9eb
make region_masks and years mandatory to fail fast before going further

hassaniazi
and
Copilot
authored
a125612
avoid missing share value of a basin with any zero source in a period/basin/subresource

hassaniazi
and
Copilot
authored
fa5a4d6
handle data type for better IO

hassaniazi
and
Copilot
authored
151b16b
retail other vars for muni temporal method and avoid hard coding

hassaniazi
and
Copilot
authored
2dee8db
retain other vars for temporal method and avoid hard coding

hassaniazi
and
Copilot
authored
03e5be0
retain other vars for temporal method and avoid hard coding

hassaniazi
and
Copilot
authored
350a7c9
retain other vars for weights temporal method and avoid hard coding

hassaniazi
and
Copilot
authored
5f1fd2c
correct typo

hassaniazi
and
Copilot
authored
aa984ed