Skip to content

Commit

Permalink
Merge pull request #217 from Deltares/parameter-g_sifrac
Browse files Browse the repository at this point in the history
Glacier parameter g_sifrac (conversion)
  • Loading branch information
verseve authored Aug 22, 2022
2 parents 2fb1090 + 2c7580e commit 155d050
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions docs/src/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
to zero).
- In the grid output netCDFs, don't set the `_FillValue` attribute, since the CF conventions
don't allow it.
- Glacier parameter `g_sifrac` needs to be converted during initialization (time dependent).

### Changed
- Changed depth `h` for reservoir and lake locations as part of the river local inertial
Expand Down
6 changes: 3 additions & 3 deletions docs/src/model_docs/params_vertical.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ specific_leaf = "Sl"
| **`cf_soil`** | controls soil infiltration reduction factor when soil is frozen | - | 0.038 |
| **`g_tt`** | threshold temperature for snowfall above glacier | ᵒC| 0.0 |
| **`g_cfmax`** | Degree-day factor for glacier | mm ᵒC``^{-1}`` Δt``^{-1}``| 3.0 mm ᵒC``^{-1}`` day``^{-1}`` |
| **`g_sifrac`** | fraction of the snowpack on top of the glacier converted into ice | - | 0.001 |
| **`g_sifrac`** | fraction of the snowpack on top of the glacier converted into ice | Δt``^{-1}`` | 0.001 day``^{-1}`` |
| **`glacierfrac`** | fraction covered by a glacier | - | 0.0 |
| **`glacierstore`** | water within the glacier | mm | 5500.0 |
| **`θₛ`** (`theta_s`) | saturated water content (porosity) | - | 0.6 |
Expand Down Expand Up @@ -134,7 +134,7 @@ internal model parameter to the external netCDF variable.
| **`whc`** | water holding capacity as fraction of current snow pack | - | 0.1 |
| **`g_tt`** | threshold temperature for snowfall above glacier | ᵒC| 0.0 |
| **`g_cfmax`** | Degree-day factor for glacier | mm ᵒC``^{-1}`` Δt``^{-1}``| 3.0 mm ᵒC``^{-1}`` day``^{-1}`` |
| **`g_sifrac`** | fraction of the snowpack on top of the glacier converted into ice | - | 0.001 |
| **`g_sifrac`** | fraction of the snowpack on top of the glacier converted into ice | Δt``^{-1}``| 0.001 day``^{-1}`` |
| **`glacierfrac`** | fraction covered by a glacier | - | 0.0 |
| **`glacierstore`** | water within the glacier | mm | 5500.0 |
| **`fc`** | field capacity | mm | 260.0 |
Expand Down Expand Up @@ -199,7 +199,7 @@ internal model parameter to the external netCDF variable.
| **`cfr`** | refreezing efficiency constant in refreezing of freewater in snow | - | 0.05 |
| **`g_tt`** | threshold temperature for snowfall above glacier | ᵒC| 0.0 |
| **`g_cfmax`** | Degree-day factor for glacier | mm ᵒC``^{-1}`` Δt``^{-1}``| 3.0 mm ᵒC``^{-1}`` day``^{-1}`` |
| **`g_sifrac`** | fraction of the snowpack on top of the glacier converted into ice | - | 0.001 |
| **`g_sifrac`** | fraction of the snowpack on top of the glacier converted into ice | Δt``^{-1}`` | 0.001 day``^{-1}`` |
| **`glacierfrac`** | fraction covered by a glacier | - | 0.0 |
| **`glacierstore`** | water within the glacier | mm | 5500.0 |
| **`ecorr`** | evaporation correction | - | 1.0 |
Expand Down
4 changes: 2 additions & 2 deletions src/flextopo.jl
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
g_tt::Vector{T} | "ᵒC"
# Degree-day factor [mm ᵒC⁻¹ Δt⁻¹] for glacier
g_cfmax::Vector{T} | "mm ᵒC-1 Δt-1"
# Fraction of the snowpack on top of the glacier converted into ice [-]
g_sifrac::Vector{T} | "-"
# Fraction of the snowpack on top of the glacier converted into ice [Δt⁻¹]
g_sifrac::Vector{T} | "Δt-1"
# Water within the glacier [mm]
glacierstore::Vector{T} | "mm"
# Fraction covered by a glacier [-]
Expand Down
2 changes: 1 addition & 1 deletion src/flextopo_model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function initialize_flextopo_model(config::Config)
defaults = 0.001,
type = Float,
fill = 0.0,
)
) .* (Δt / basetimestep)
glacierfrac = ncread(
nc,
config,
Expand Down
2 changes: 1 addition & 1 deletion src/hbv.jl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
whc::Vector{T} | "-" # Fraction of snow volume that can store water [-]
g_tt::Vector{T} | "ᵒC" # Threshold temperature for snowfall above glacier [ᵒC]
g_cfmax::Vector{T} | "mm ᵒC-1 Δt-1" # Degree-day factor [mm ᵒC⁻¹ Δt⁻¹] for glacier
g_sifrac::Vector{T} | "-" # Fraction of the snowpack on top of the glacier converted into ice [-]
g_sifrac::Vector{T} | "Δt-1" # Fraction of the snowpack on top of the glacier converted into ice [Δt⁻¹]
glacierstore::Vector{T} | "mm" # Water within the glacier [mm]
glacierfrac::Vector{T} | "-" # Fraction covered by a glacier [-]
precipitation::Vector{T} # Precipitation [mm Δt⁻¹]
Expand Down
2 changes: 1 addition & 1 deletion src/hbv_model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function initialize_hbv_model(config::Config)
defaults = 0.001,
type = Float,
fill = 0.0,
)
) .* (Δt / basetimestep)
glacierfrac = ncread(
nc,
config,
Expand Down
6 changes: 3 additions & 3 deletions src/sbm.jl
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@
g_tt::Vector{T} | "ᵒC"
# Degree-day factor [mm ᵒC⁻¹ Δt⁻¹] for glacier
g_cfmax::Vector{T} | "mm ᵒC-1 Δt-1"
# Fraction of the snowpack on top of the glacier converted into ice [-]
g_sifrac::Vector{T} | "-"
# Fraction of the snowpack on top of the glacier converted into ice [Δt⁻¹]
g_sifrac::Vector{T} | "Δt-1"
# Water within the glacier [mm]
glacierstore::Vector{T} | "mm"
# Fraction covered by a glacier [-]
Expand Down Expand Up @@ -317,7 +317,7 @@ function initialize_sbm(nc, config, riverfrac, inds)
defaults = 0.001,
type = Float,
fill = 0.0,
)
) .* (Δt / basetimestep)
glacierfrac = ncread(
nc,
config,
Expand Down

0 comments on commit 155d050

Please sign in to comment.