Reorganize into et/ and snow/ topic folders, add snow example#1
Open
reedmaxwell wants to merge 1 commit into
Open
Reorganize into et/ and snow/ topic folders, add snow example#1reedmaxwell wants to merge 1 commit into
reedmaxwell wants to merge 1 commit into
Conversation
Splits the repo into two parallel worked examples sharing helpers.py,
clm_inputs/ templates, and the runs/ tree:
- et/ — existing 3 notebooks moved, paths updated to ../runs/et/ and
../clm_inputs/{shared,et}/, sys.path shim added for helpers.py import,
phase8_clump renamed to clm_et_improved, prereq switched from
feature/clm_et branch to ParFlow master (PRs #695/#698/#701/#709/#712
are all merged).
- snow/ — new 3-notebook trio mirroring ET structure:
SNOTEL site picker -> PF-CLM run with clm_snow_improved defaults
(FracSnoScheme=CLM, AlbedoDecay Vis/NIR=0.3/0.1, AlbedoNew
Vis/NIR=0.97/0.67, shrubland IGBP 7; SZA-scheme variant commented) ->
SNOTEL SWE comparison (NSE, RMSE, |bias|%, peak-date delta, melt-out
delta, CW3E-vs-SNOTEL cumulative precip).
- helpers.py gains SNOTEL_SITES (12 curated low-bias sites) and a
SNOTEL_SHOWCASE 6-site-year selection.
- clm_inputs/{drv_clmin_template,et/drv_vegp,snow/drv_vegp}.dat now
track PR #714 best-practice files verbatim (snow vegp refreshed from
the stale snow_model_sensitivity copy). clm_inputs/README.md
documents the intentional et/snow duplication and the planned
collapse to a single shared drv_vegp.dat.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
This PR reorganizes the single-column PF-CLM examples into parallel et/ and snow/ workflows, sharing top-level helpers and CLM input templates while adding a new SNOTEL-based snow evaluation example.
Changes:
- Moves the existing ET notebooks into
et/and updates paths/imports for the new layout. - Adds a three-notebook snow workflow using SNOTEL sites, CW3E forcing, snow-specific CLM settings, and SWE comparison metrics.
- Adds topic-specific CLM input folders plus documentation for the duplicated
drv_vegp.datfiles and shared helper additions.
Reviewed changes
Copilot reviewed 10 out of 11 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
README.md |
Documents the new ET/snow structure, quick starts, physics settings, and tested/showcase sites. |
helpers.py |
Adds SNOTEL site metadata and showcase site-year selections. |
et/locate_plot_station_get_forcing.ipynb |
Updates ET Notebook 1 imports and output/input paths for the new et/ folder. |
et/Single_Column_PFCLM_netcdf.ipynb |
Updates ET Notebook 2 title, prerequisites, helper import path, and run directory. |
et/pfclm_ameriflux_compare.ipynb |
Updates ET comparison notebook helper import and run directory paths. |
snow/locate_plot_station_get_forcing.ipynb |
Adds snow Notebook 1 for SNOTEL site selection, forcing download, CLM input preparation, and SWE preview. |
snow/Single_Column_PFCLM_netcdf.ipynb |
Adds snow Notebook 2 for configuring/running PF-CLM with snow physics defaults. |
snow/pfclm_snotel_compare.ipynb |
Adds snow Notebook 3 for comparing PF-CLM SWE and precipitation against SNOTEL. |
clm_inputs/README.md |
Documents shared/topic CLM input files, duplication rationale, consolidation plan, and upstream drift checks. |
clm_inputs/et/drv_vegp.dat |
Adds ET topic copy of the best-practice vegetation parameter file. |
clm_inputs/snow/drv_vegp.dat |
Adds snow topic copy of the best-practice vegetation parameter file. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+96
to
+97
| "Donner_Summit": {"coords": (39.32, -120.33), "elev_m": 2103, "state": "CA", | ||
| "region": "Sierra Nevada", "triplet": "428:CA:SNTL"}, |
Comment on lines
+82
to
+85
| for f in drv_clmin_bestpractice drv_vegp_bestpractice; do | ||
| curl -sL "https://raw.githubusercontent.com/parflow/parflow/master/test/tcl/clm/${f}.dat" | \ | ||
| diff - clm_inputs/${f%_bestpractice}_template.dat # or et/drv_vegp.dat, snow/drv_vegp.dat | ||
| done |
Comment on lines
+209
to
+210
| 2. Set `site_name` and `water_year` in Notebook 1. | ||
| 3. The notebooks pick up the rest automatically. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Splits the repo into two parallel worked examples sharing helpers.py, clm_inputs/ templates, and the runs/ tree:
et/ — existing 3 notebooks moved, paths updated to ../runs/et/ and ../clm_inputs/{shared,et}/, sys.path shim added for helpers.py import, phase8_clump renamed to clm_et_improved, prereq switched from feature/clm_et branch to ParFlow master (PRs #695/#698/#701/#709/#712 are all merged).
snow/ — new 3-notebook trio mirroring ET structure: SNOTEL site picker -> PF-CLM run with clm_snow_improved defaults (FracSnoScheme=CLM, AlbedoDecay Vis/NIR=0.3/0.1, AlbedoNew Vis/NIR=0.97/0.67, shrubland IGBP 7; SZA-scheme variant commented) -> SNOTEL SWE comparison (NSE, RMSE, |bias|%, peak-date delta, melt-out delta, CW3E-vs-SNOTEL cumulative precip).
helpers.py gains SNOTEL_SITES (12 curated low-bias sites) and a SNOTEL_SHOWCASE 6-site-year selection.
clm_inputs/{drv_clmin_template,et/drv_vegp,snow/drv_vegp}.dat now track PR #714 best-practice files verbatim (snow vegp refreshed from the stale snow_model_sensitivity copy). clm_inputs/README.md documents the intentional et/snow duplication and the planned collapse to a single shared drv_vegp.dat.