Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/core/defs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,14 @@ function reset_run_periods!(md, first, last)
last_per = last_period(comp_def)

if first_per !== nothing && first_per < first
@warn "Resetting $(comp_def.name) component's first timestep to $first"
@debug "Resetting $(comp_def.name) component's first timestep to $first"
changed = true
else
first = first_per
end

if last_per !== nothing && last_per > last
@warn "Resetting $(comp_def.name) component's last timestep to $last"
@debug "Resetting $(comp_def.name) component's last timestep to $last"
changed = true
else
last = last_per
Expand All @@ -217,7 +217,7 @@ set_dimension!(md::ModelDef, name::Symbol, keys::Union{Int, Vector, Tuple, Abstr
function set_dimension!(md::ModelDef, name::Symbol, dim::Dimension)
redefined = haskey(md, name)
if redefined
@warn "Redefining dimension :$name"
@debug "Redefining dimension :$name"
end

if name == :time
Expand Down Expand Up @@ -667,7 +667,7 @@ function replace_comp!(md::ModelDef, comp_id::ComponentId, comp_name::Symbol=com
for epc in external_param_conns(md, comp_name)
param_name = epc.param_name
if ! haskey(new_params, param_name) # TODO: is this the behavior we want? don't error in this case? just (warn)?
@warn "Removing external parameter connection from component $comp_name; parameter $param_name no longer exists in component."
@debug "Removing external parameter connection from component $comp_name; parameter $param_name no longer exists in component."
push!(remove, epc)
else
old_p = old_comp.parameters[param_name]
Expand Down
8 changes: 4 additions & 4 deletions test/test_dimensions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ add_comp!(m, foo2; first = 2005, last = 2095)

# Test that foo's time dimension is unchanged
@test_logs(
(:warn, "Redefining dimension :time"),
# (:warn, "Redefining dimension :time"),
set_dimension!(m, :time, 1990:2200)
)
@test m.md.comp_defs[:foo2].first == 2005
Expand All @@ -110,9 +110,9 @@ set_param!(m, :foo2, :x, 2005:2095) # Shouldn't throw an error

# Test that foo's time dimension is updated
@test_logs(
(:warn, "Redefining dimension :time"),
(:warn, "Resetting foo2 component's first timestep to 2010"),
(:warn, "Resetting foo2 component's last timestep to 2050"),
# (:warn, "Redefining dimension :time"),
# (:warn, "Resetting foo2 component's first timestep to 2010"),
# (:warn, "Resetting foo2 component's last timestep to 2050"),
set_dimension!(m, :time, 2010:2050)
)
@test m.md.comp_defs[:foo2].first == 2010
Expand Down
2 changes: 1 addition & 1 deletion test/test_model_structure.jl
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ run(m)
# run for just one timestep, so init sets the value here
# This results in 2 warnings, so we test for both.
@test_logs(
(:warn, "Redefining dimension :time"),
# (:warn, "Redefining dimension :time"),
# (:warn, "Resetting E component's last timestep to 2015"),
set_dimension!(m, :time, [2015])
)
Expand Down
17 changes: 10 additions & 7 deletions test/test_parametertypes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ add_comp!(m, MyComp2; first=2000, last=2002)
set_param!(m, :MyComp2, :x, [1, 2, 3])

@test_logs(
(:warn, "Redefining dimension :time"),
(:warn, "Resetting MyComp2 component's first timestep to 2001"),
# (:warn, "Redefining dimension :time"),
# (:warn, "Resetting MyComp2 component's first timestep to 2001"),
set_dimension!(m, :time, 2001:2003)
)

Expand Down Expand Up @@ -158,8 +158,8 @@ add_comp!(m, MyComp2; first=2000, last=2020)
set_param!(m, :MyComp2, :x, [1, 2, 3])

@test_logs(
(:warn, "Redefining dimension :time"),
(:warn, "Resetting MyComp2 component's first timestep to 2005"),
# (:warn, "Redefining dimension :time"),
# (:warn, "Resetting MyComp2 component's first timestep to 2005"),
set_dimension!(m, :time, [2005, 2020, 2050])
)

Expand Down Expand Up @@ -187,7 +187,7 @@ set_dimension!(m, :time, [2000, 2005, 2020])
add_comp!(m, MyComp2)
set_param!(m, :MyComp2, :x, [1, 2, 3])
@test_logs(
(:warn, "Redefining dimension :time"),
# (:warn, "Redefining dimension :time"),
# (:warn, "Resetting MyComp2 component's first timestep to 2005"),
set_dimension!(m, :time, [2005, 2020, 2050])
)
Expand All @@ -209,7 +209,10 @@ set_dimension!(m, :time, 2000:2002) # length 3
add_comp!(m, MyComp2)
set_param!(m, :MyComp2, :x, [1, 2, 3])

@test_logs (:warn, "Redefining dimension :time") set_dimension!(m, :time, 1999:2003) # length 5
@test_logs(
# (:warn, "Redefining dimension :time"),
set_dimension!(m, :time, 1999:2003) # length 5
)

@test_throws ErrorException update_param!(m, :x, [2, 3, 4, 5, 6], update_timesteps = false)
update_param!(m, :x, [2, 3, 4, 5, 6], update_timesteps = true)
Expand Down Expand Up @@ -248,7 +251,7 @@ update_param!(m, :z, 1)

# Reset the time dimensions
@test_logs(
(:warn, "Redefining dimension :time"),
# (:warn, "Redefining dimension :time"),
# (:warn, "Resetting MyComp3 component's first timestep to 2005"),
set_dimension!(m, :time, 2005:2007)
)
Expand Down
5 changes: 4 additions & 1 deletion test/test_replace_comp.jl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ add_comp!(m, X)
set_param!(m, :X, :x, zeros(6)) # Set external parameter for :x

# Replaces with bad3, but warns that there is no parameter by the same name :x
@test_logs (:warn, r".*parameter x no longer exists in component.*") replace_comp!(m, bad3, :X)
@test_logs(
# (:warn, r".*parameter x no longer exists in component.*"),
replace_comp!(m, bad3, :X)
)

@test m.md.comp_defs[:X].comp_id.comp_name == :bad3 # The replacement was still successful
@test length(m.md.external_param_conns) == 0 # The external paramter connection was removed
Expand Down
2 changes: 1 addition & 1 deletion test/test_timesteps.jl
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ t_matrix = get_timestep_array(m.md, Float64, 2, matrix)

#try with variable timestep
@test_logs(
(:warn, "Redefining dimension :time"),
# (:warn, "Redefining dimension :time"),
set_dimension!(m, :time, [2000:1:2004; 2005:2:2016])
)

Expand Down