Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
9272d10
Initial plan
Copilot Mar 25, 2026
f633810
Add rQSWATPlus R package with core functions, tests, vignettes, and e…
Copilot Mar 26, 2026
ca9c55e
Fix SpatRaster typo in data-requirements vignette
Copilot Mar 26, 2026
fce90eb
update roxygen
tadhg-moore Mar 26, 2026
8c8dafc
Ad deps and fix traudem bugs
tadhg-moore Mar 26, 2026
98e457f
Switch quiet to TRUE
tadhg-moore Mar 26, 2026
0a73b49
Add writing data
tadhg-moore Mar 26, 2026
41ba438
Work with outlet file
tadhg-moore Mar 26, 2026
3d79e6a
ad test with outlet
tadhg-moore Mar 26, 2026
313db75
swith on eal and set quiet = T
tadhg-moore Mar 26, 2026
499d18f
Add visualization functions (tmap/ggplot2) and SWAT+ Editor database …
Copilot Mar 26, 2026
bc49f51
Address code review: add comments for magic numbers in validate_datab…
Copilot Mar 26, 2026
f92202f
Add catch for print
tadhg-moore Mar 26, 2026
1abff5a
Update to latest version of tmap
tadhg-moore Mar 26, 2026
b31357e
Improve test
tadhg-moore Mar 26, 2026
da849dd
Ad db file to projet object
tadhg-moore Mar 26, 2026
28dc643
Add all SWAT+ Editor required tables and project_config to database o…
Copilot Mar 26, 2026
9ab0fbd
Address code review: fix slope label fallback, add LSU reference comment
Copilot Mar 26, 2026
e9b0b51
Add weather_sta_cli table to database output
Copilot Mar 27, 2026
fc7100f
add gwflow
tadhg-moore Mar 27, 2026
2150fd5
Merge branch 'copilot/develop-r-package-for-qgis-plugin' of https://g…
tadhg-moore Mar 27, 2026
1b02610
Add missing db fields
tadhg-moore Mar 30, 2026
95bfae9
Update test
tadhg-moore Mar 30, 2026
b4e794d
Update write functions, validation, and tests for new database fields
Copilot Mar 30, 2026
2c77518
Improve test assertion specificity for referential integrity check
Copilot Mar 30, 2026
b1b68aa
Add ref database and gwflow ini file
tadhg-moore Mar 31, 2026
0dab37e
Add reference database copy, project_config update, and R gwflow module
Copilot Mar 31, 2026
9dc7850
Fix column type mismatches in gwflow_base table schema
Copilot Mar 31, 2026
b0607e3
Add SWAT+ Editor-readiness integration test using ravn example dataset
Copilot Mar 31, 2026
2602f02
Fix helper function name: remove dot prefix from skip_if_no_taudem
Copilot Mar 31, 2026
0acee95
Fix WSNO=0 outlet-reach channel/routing bug and add regression test
Copilot Mar 31, 2026
33523bc
Update colnames
tadhg-moore Mar 31, 2026
700f19a
Update ns
tadhg-moore Mar 31, 2026
f53aba6
Add verbose
tadhg-moore Mar 31, 2026
ca0d756
Added table function
tadhg-moore Mar 31, 2026
a757d13
Fix populate_from_datasets crash and add all Python QSWAT+ plugin tables
Copilot Mar 31, 2026
6409806
Address code review: use expect_true with info for better failure mes…
Copilot Mar 31, 2026
ca334ce
Added ref db
tadhg-moore Mar 31, 2026
cf4a57a
Rewrite database init to import tables from HAWQS databases
Copilot Mar 31, 2026
03668cc
Remove misleading comment about on.exit handler
Copilot Mar 31, 2026
0de0e69
Update database validation to include HAWQS reference and project tables
Copilot Apr 1, 2026
eb6be4e
Use arguments in project
tadhg-moore Apr 1, 2026
79b00ad
Use ellipsis arg
tadhg-moore Apr 1, 2026
f82123e
Update docs
tadhg-moore Apr 1, 2026
72e98e2
Improve tests
tadhg-moore Apr 1, 2026
ce83909
feat: add usersoil option to qswat_write_database() and qswat_read_us…
Copilot Apr 6, 2026
a9536a3
fix: address code review comments - restore slope classes doc title, …
Copilot Apr 6, 2026
131a756
Update funs
tadhg-moore Apr 6, 2026
c5901a9
Remove fun
tadhg-moore Apr 6, 2026
858ab94
feat: add usersoil to qswat_project object via qswat_setup()
Copilot Apr 6, 2026
c296885
Add usersoil
tadhg-moore Apr 6, 2026
2ef0915
Update docs
tadhg-moore Apr 6, 2026
876c086
Add in usersoil where needed
tadhg-moore Apr 6, 2026
c2a9325
test: update hru and workflow tests to use ravn_usersoil.csv
Copilot Apr 7, 2026
f849a89
fix: compute midlat/midlon from stream geometry in .write_channel_tab…
Copilot Apr 7, 2026
61c80d2
fix: cast st_line_sample result to POINT for uniform coordinate extra…
Copilot Apr 7, 2026
e1d6d36
Add DEM
tadhg-moore Apr 7, 2026
de5ae0a
feat: add qswat_read_gis and fix lat/lon in all gis tables from water…
Copilot Apr 7, 2026
269f5ae
refactor: simplify deep aquifer centroid calc, remove redundant test dir
Copilot Apr 7, 2026
ce40c19
Fix column naming
tadhg-moore Apr 7, 2026
dd2ee9e
Fix col naming
tadhg-moore Apr 7, 2026
68d28a2
Update col name
tadhg-moore Apr 7, 2026
a744141
Merge branch 'copilot/develop-r-package-for-qgis-plugin' of https://g…
tadhg-moore Apr 7, 2026
ff9914a
Fix soils_sol and soils_sol_layer schemas and add population from glo…
Copilot Apr 7, 2026
33297e8
Move get_val helper and row_names outside inner loop per review feedback
Copilot Apr 7, 2026
37f7ac5
Remove non-Python-QSWATPlus tables from ensure_write_tables
Copilot Apr 8, 2026
15af808
Remove SWAT+ Editor tables from ensure_write_tables - keep only Pytho…
Copilot Apr 8, 2026
c77cae7
Add docs
tadhg-moore Apr 8, 2026
396d1b8
Remove dep
tadhg-moore Apr 8, 2026
1fc5ff8
Add hru_method, threshold_type, area_threshold, use_gwflow, use_aquif…
Copilot Apr 8, 2026
5e54bdf
Address code review: add filter_area validation and improve error mes…
Copilot Apr 8, 2026
1c93cfe
Add hru_sf/lsu_sf output and qswat_plot_hrus/lsus/overview
Copilot Apr 8, 2026
a23c5d9
set defaults
tadhg-moore Apr 8, 2026
c2cf745
Merge branch 'copilot/develop-r-package-for-qgis-plugin' of https://g…
tadhg-moore Apr 8, 2026
88cd83c
Add docs
tadhg-moore Apr 8, 2026
6532edd
Implement qswat_populate_gwflow_gis() with GIS-dependent gwflow table…
Copilot Apr 17, 2026
adf4c67
Address code review: fix test logic, optimize ID assignment, improve …
Copilot Apr 17, 2026
a0d99ab
Final polish: improved comments, add recharge=1 test case
Copilot Apr 17, 2026
2e32362
Merge pull request #2 from limnotrack/copilot/implement-gwflow-tables…
tadhg-moore Apr 19, 2026
117cd18
Check tables
tadhg-moore Apr 19, 2026
f541c0a
Merge branch 'copilot/develop-r-package-for-qgis-plugin' of https://g…
tadhg-moore Apr 19, 2026
45073a2
Revert "Implement qswat_populate_gwflow_gis() for GIS-dependent gwflo…
tadhg-moore Apr 19, 2026
10b6d7c
Merge pull request #3 from limnotrack/revert-2-copilot/implement-gwfl…
tadhg-moore Apr 19, 2026
ca4615a
feat: integrate gwflow functions into qswat_run workflow
Copilot Apr 20, 2026
7756935
Merge pull request #4 from limnotrack/copilot/integrate-gwflow-functions
tadhg-moore Apr 20, 2026
8b4ef57
Merge pull request #5 from limnotrack/revert-2-copilot/implement-gwfl…
tadhg-moore Apr 20, 2026
42ba6ee
Merge branch 'copilot/develop-r-package-for-qgis-plugin' of https://g…
tadhg-moore Apr 20, 2026
f3a51d2
feat: add gwflow validation checks to qswat_check_database
Copilot Apr 20, 2026
a7295d7
refactor: improve gwflow check robustness and test comments
Copilot Apr 20, 2026
aaa72c1
Remove test
tadhg-moore Apr 20, 2026
6d578ee
feat: populate gwflow spatial tables (zone, grid, rivcell, lsucell, h…
Copilot Apr 20, 2026
d5f5d8f
fix: address code review comments (thickness fallback, GLHYMPS commen…
Copilot Apr 20, 2026
5c881ff
Update docs
tadhg-moore Apr 20, 2026
d1daf03
Merge pull request #7 from limnotrack/copilot/update-qswat-check-data…
tadhg-moore Apr 20, 2026
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@
*.tgz
*.o

rQSWATPlus.Rcheck/
rQSWATPlus_*.tar.gz
5 changes: 5 additions & 0 deletions rQSWATPlus/.Rbuildignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
^.*\.Rproj$
^\.Rproj\.user$
^LICENSE\.md$
^README\.Rmd$
^\.github$
40 changes: 40 additions & 0 deletions rQSWATPlus/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Package: rQSWATPlus
Title: R Interface to QSWATPlus for SWAT+ Model Setup
Version: 0.1.0
Authors@R:
person("QSWATPlus Contributors", role = c("aut", "cre"),
email = "qswatplus@example.com")
Author: QSWATPlus Contributors [aut, cre]
Maintainer: QSWATPlus Contributors <qswatplus@example.com>
Description: Provides R functions to replicate the QSWATPlus QGIS plugin
workflow for setting up SWAT+ (Soil and Water Assessment Tool) models.
Includes watershed delineation using TauDEM (via the 'traudem' package),
Hydrologic Response Unit (HRU) creation from landuse, soil, and slope
data, and generation of SWAT+ project databases. The package supports
the complete workflow from DEM processing to database creation.
License: GPL (>= 3) + file LICENSE
URL: https://github.com/limnotrack/QSWATPlus
BugReports: https://github.com/limnotrack/QSWATPlus/issues
Depends:
R (>= 4.1.0)
Imports:
terra,
sf,
RSQLite,
DBI,
cli,
rlang
Suggests:
testthat (>= 3.0.0),
traudem,
tmap,
ggplot2,
knitr,
rmarkdown,
withr
Config/testthat/edition: 3
Encoding: UTF-8
LazyData: false
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.3
VignetteBuilder: knitr
2 changes: 2 additions & 0 deletions rQSWATPlus/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
YEAR: 2024
COPYRIGHT HOLDER: QSWATPlus Contributors
47 changes: 47 additions & 0 deletions rQSWATPlus/NAMESPACE
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Generated by roxygen2: do not edit by hand

S3method(print,qswat_db_check)
S3method(print,qswat_project)
export(qswat_check_database)
export(qswat_create_hrus)
export(qswat_create_slope_classes)
export(qswat_create_streams)
export(qswat_delineate)
export(qswat_plot_dem)
export(qswat_plot_hru_summary)
export(qswat_plot_hrus)
export(qswat_plot_landuse)
export(qswat_plot_landuse_summary)
export(qswat_plot_lsus)
export(qswat_plot_overview)
export(qswat_plot_soil)
export(qswat_plot_soil_summary)
export(qswat_plot_streams)
export(qswat_plot_watershed)
export(qswat_read_gis)
export(qswat_read_gwflow_config)
export(qswat_read_landuse_lookup)
export(qswat_read_soil_lookup)
export(qswat_read_usersoil)
export(qswat_run)
export(qswat_setup)
export(qswat_setup_gwflow)
export(qswat_write_database)
import(terra)
importFrom(DBI,dbConnect)
importFrom(DBI,dbDisconnect)
importFrom(DBI,dbExecute)
importFrom(DBI,dbGetQuery)
importFrom(DBI,dbListTables)
importFrom(DBI,dbWriteTable)
importFrom(RSQLite,SQLite)
importFrom(rlang,.data)
importFrom(sf,st_as_sf)
importFrom(sf,st_bbox)
importFrom(sf,st_coordinates)
importFrom(sf,st_crs)
importFrom(sf,st_geometry_type)
importFrom(sf,st_read)
importFrom(sf,st_transform)
importFrom(sf,st_write)
importFrom(utils,read.csv)
Loading