Skip to content

Commit 79c3e32

Browse files
committed
Relax the MultiScaleModel constructor : either mapped_variables or timestep_mapped_variables can be optional
1 parent 0b13e5f commit 79c3e32

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

src/mtg/MultiScaleModel.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,13 @@ function MultiScaleModel(model::T, mapped_variables, timestep_mapped_variables)
220220
MultiScaleModel{T}(model, mapped_variables, timestep_mapped_variables)
221221
end
222222

223-
MultiScaleModel(; model, mapped_variables, timestep_mapped_variables=TimestepMappedVariable[]) = MultiScaleModel(model, mapped_variables, timestep_mapped_variables)
224-
225-
#MultiScaleModel(model::T, mapped_variables) where {T<:AbstractModel} = MultiScaleModel(model, mapped_variables, TimestepMappedVariable[])
223+
function MultiScaleModel(; model, mapped_variables=[], timestep_mapped_variables=TimestepMappedVariable[])
224+
if isempty(mapped_variables) && isempty(timestep_mapped_variables)
225+
error("mapped_variables and timestep_mapped_variables keyword arguments for $model's MultiScaleModel wrapper cannot both be empty.")
226+
end
227+
228+
MultiScaleModel(model, mapped_variables, timestep_mapped_variables)
229+
end
226230

227231
mapped_variables_(m::MultiScaleModel) = m.mapped_variables
228232

0 commit comments

Comments
 (0)