Merge pull request #271 from CliMA/ck/warning

Fix Vararg warning in MultipleConditions struct

Author: charleskawczynski

Project.toml

@@ -1,7 +1,7 @@
 name = "ClimaTimeSteppers"
 uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
 authors = ["Climate Modeling Alliance"]
-version = "0.7.19"
+version = "0.7.20"
 
 [deps]
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"

src/utilities/convergence_condition.jl

@@ -92,15 +92,18 @@ updated_cache((; rate, order)::MinimumRateOfConvergence, cache, val, err, iter)
 Checks multiple `ConvergenceCondition`s, combining their results with either
 `all` or `any`.
 """
-struct MultipleConditions{
-    CC <: Union{typeof(all), typeof(any)},
-    C <: Tuple{Vararg{T} where {T <: ConvergenceCondition}},
-} <: ConvergenceCondition
+struct MultipleConditions{CC, C} <: ConvergenceCondition
     condition_combiner::CC
     conditions::C
+    function MultipleConditions(
+        condition_combiner::Union{typeof(all), typeof(any)},
+        conditions::Vararg{<:ConvergenceCondition},
+    )
+        return new{typeof(condition_combiner), typeof(conditions)}(condition_combiner, conditions)
+    end
 end
-MultipleConditions(condition_combiner::Union{typeof(all), typeof(any)} = all, conditions::ConvergenceCondition...) =
-    MultipleConditions(condition_combiner, conditions)
+
+MultipleConditions(conditions::ConvergenceCondition...) = MultipleConditions(all, conditions)
 cache_type((; conditions)::MultipleConditions, ::Type{FT}) where {FT} =
     Tuple{map(condition -> cache_type(condition, FT), conditions)...}
 has_converged(alg::MultipleConditions, caches, val, err, iter) = alg.condition_combiner(