Skip to content

Fixing tws target and summa executable name#15

Merged
DarriEy merged 13 commits intoDarriEy:developfrom
ashleymedin:develop
Feb 7, 2026
Merged

Fixing tws target and summa executable name#15
DarriEy merged 13 commits intoDarriEy:developfrom
ashleymedin:develop

Conversation

@ashleymedin
Copy link

The use of the summa_install_path and the summa_exe input was inconsistent -- I fixed it here. I also added updates to the tws.target (a lot more needs to be done there as well as the NSGA_II implementation.

* commit '6c7a3c00e8a051a36ce828e8683cb26cbbf18cb0': (92 commits)
  Fix HPC module handling for UDUNITS2/expat and GEOS/PROJ
  Fix CMake argument parsing for expat linker flags
  Fix ngen final link stage expat library path
  Fix HPC build failures for ngen and rhessys
  organise calibration algorithms
  Use git_clean wrapper consistently for all submodule operations
  Add set -o pipefail to properly detect cmake failures
  Disable git hooks via core.hooksPath=/dev/null
  Skip recursive t-route submodule init to avoid gmake trigger
  Add MAKEFLAGS debugging and disable git config/hooks
  Use inline MAKEFLAGS= assignment to clear make vars for git
  Use env -u to strip MAKE vars from git submodule commands
  Unset all MAKE variables to prevent spurious make during git submodule
  Build EXPAT from source if not found (required by UDUNITS2)
  Add EXPAT detection for UDUNITS2 build
  Fix TauDEM executable staging with better find and debugging
  Use --allow-shlib-undefined to work around missing Level Zero
  Dynamically find Level Zero via ldd and module system
  Add Level Zero to library paths for MPI linking test
  Use gcc/g++ instead of mpicc on Compute Canada (broken hwloc dep)
  ...
* commit '8e94a4218608e2a82e6c56860da8838bf81810a6':
  working on vm-fire preprocessing
  Prioritize geos-config/pkg-config over HPC module paths
  Improve flex/libfl detection for HPC systems
  Fix WMFire library path in RHESSys build
  Add flex library flags to RHESSys build for HPC compatibility
  Fix 9 failing tests across config, FUSE, HYPE, and data handlers
* commit '4a410724de0653ccdc18563085c94da75b3495c1': (21 commits)
  docs: Modernize documentation with PyData theme and card navigation
  fix registry refactoring
  refactor(models): Split ModelRegistry into focused sub-registries
  fix(docs): Remove full package install from RTD build
  docs(website): Simplify landing page by removing contributors and projects sections
  fix(ci): Add missing GDAL dependencies to binary-validation job
  fix(tests): Fix CI test failures for NetCDF and missing test data
  fix(ci): Track symfluence script and fix lint error
  feat(hbv): Working HBV model implementation with calibration studies
  fix(types): Resolve remaining mypy type errors
  chore: Pre-release cleanup and type safety improvements
  chore: Pre-release cleanup and CHANGELOG update
  refactor(mesh): Consolidate MESH preprocessing and improve defaults
  refactor(hbv): Modularize HBV-96 into dedicated losses and parameters modules
  chore: pre-release code hygiene cleanup
  feat(calibration): HBV sub-daily support, hydrograph signatures, and optimizer improvements
  feat(hbv): Add parameter regionalization via neural transfer functions
  chore(release): Pre-release cleanup and uv compatibility
  fix(models): Patch RHESSys build and WMFire generation
  fix(calibration): Ensure consistent warmup handling in HBV final evaluation
  ...
* commit 'aea4dd65e47cc0771d2e90e73bd869baa7d6eefd':
  Fix pre-commit hook errors: ruff, bandit, and mypy issues
  fix(data): Include dataset-specific variables in forcing cache key
  Working on HBV implementation
  chore(release): Sync versions to 0.6.1 and fix npm configs
  working on diagnostic module scaffolding
* commit '9e822014598cc5acd07d6283a8bdf9aea0f8d51e':
  workshop notebooks for Utah
* commit '6705d8922e23d73efc1b9e54c867a60992137cb8':
  fix(ngen): Multiple calibration and coupling fixes
  chore: Remove paper/ directory from git tracking
  docs: Add paper source files with selective .gitignore
  feat: Model-specific pipelines and CanSWE observation handler
  fix(ngen): Fix cmake quoting for conda linker flags
  fix(build): Fix ngen and SUMMA builds on 2i2c conda environments
  fix(bootstrap): Add OpenBLAS to conda env and fix validation of optional tools
  fix(bootstrap): Install CPU-only PyTorch on 2i2c to save disk space
  fix(bootstrap): Guard pip venv-only logic on 2i2c path
  fix(binary): Mark ignacio, wmfire, and ngiab as optional installs
  fix(bootstrap): Move 2i2c conda env from /tmp to repo root
  fix(rhessys): Fix snowmelt timing, initial conditions, and default parameters
  fix(ci): Fix docs and lint CI failures
  feat: Add VIC model, workshop notebooks, and broad model improvements
* commit '7dfd0c1b5dd4ac41fffecac9a492160d7856c09e':
  fix(resampling): Use h5netcdf engine throughout forcing resampling pipeline
  fix(aorc): Use h5netcdf engine for all AORC NetCDF read/write operations
  fix(aorc): Clear Zarr encoding before NetCDF write to prevent HDF5 errors
@DarriEy DarriEy merged commit 0e9e5eb into DarriEy:develop Feb 7, 2026
17 of 23 checks passed
DarriEy added a commit that referenced this pull request Feb 7, 2026
- Fix broken docstring (unterminated string in TWS_STORAGE_COMPONENTS doc)
- Add return None guard when mass balance obs are neither annual nor biannual
  (prevents UnboundLocalError on obs_anomaly/sim_anomaly)
- Raise ValueError instead of returning None for missing glacier variables
  (matches base class return type contract)
- Add explicit return None in _get_observed_data_column stor_mb branch
- Use config_dict.get() instead of config.get() for FORCING_TIME_STEP_SIZE
  (config is typed Pydantic model, not a dict)
- Fix docstring indentation (3 spaces -> 4 spaces)
- Remove unused year_start/year_end variables (ruff F841)
- Remove f-string without placeholders (ruff F541)
- Align _run_summa_direct() exe path logic with run_model() pattern

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants