Fixes benchmarks

Author: VEZY

Project.toml

@@ -1,7 +1,7 @@
 name = "PlantSimEngine"
 uuid = "9a576370-710b-4269-adf9-4f603a9c6423"
-authors = ["Rémi Vezy <VEZY@users.noreply.github.com> and contributors"]
 version = "0.13.2"
+authors = ["Rémi Vezy <VEZY@users.noreply.github.com> and contributors"]
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

benchmark/Project.toml

@@ -14,4 +14,4 @@ XPalm = "6b523e1e-d512-416c-8e51-a8fbef0064e7"
 [sources]
 PlantSimEngine = {path = ".."}
 XPalm = {rev = "PSe-with-multirate", url = "https://github.com/PalmStudio/XPalm.jl"}
-PlantBiophysics = {rev = "master", url = "https://github.com/VEZY/PlantBiophysics.jl"}
+PlantBiophysics = {rev = "update-plantsimengine", url = "https://github.com/VEZY/PlantBiophysics.jl"}

benchmark/test-multirate-buffer-benchmark.jl

@@ -80,7 +80,6 @@ function benchmark_multirate_status_tracked_run(mtg, mapping, meteo, tracked, ns
         meteo,
         nsteps=nsteps,
         check=true,
-        multirate=true,
         executor=SequentialEx(),
         tracked_outputs=tracked
     )
@@ -93,7 +92,6 @@ function benchmark_multirate_output_request_run(mtg, mapping, meteo, reqs, track
         meteo,
         nsteps=nsteps,
         check=true,
-        multirate=true,
         executor=SequentialEx(),
         tracked_outputs=reqs
     )

benchmark/test-xpalm.jl

@@ -18,22 +18,22 @@ function xpalm_default_param_create()
     #meteo.duration = [Dates.Day(i[1:1]) for i in meteo.duration]
     m = Weather(meteo)
 
-    out_vars = Dict{String,Any}(
-        "Scene" => (:lai,),
-        # "Scene" => (:LAI, :scene_leaf_area, :aPPFD, :TEff),
-        # "Plant" => (:plant_age, :ftsw, :newPhytomerEmergence, :aPPFD, :plant_leaf_area, :carbon_assimilation, :carbon_offer_after_rm, :Rm, :TT_since_init, :TEff, :phytomer_count, :newPhytomerEmergence),
-        "Leaf" => (:Rm, :potential_area, :TT_since_init, :TEff, :biomass, :carbon_demand, :carbon_allocation,),
-        # "Leaf" => (:Rm, :potential_area),
-        # "Internode" => (:Rm, :carbon_allocation, :carbon_demand),
-        "Male" => (:Rm,),
-        # "Female" => (:biomass,),
-        # "Soil" => (:TEff, :ftsw, :root_depth),
+    out_vars = Dict{Symbol,Any}(
+        :Scene => (:lai,),
+        # :Scene => (:LAI, :scene_leaf_area, :aPPFD, :TEff),
+        # :Plant => (:plant_age, :ftsw, :newPhytomerEmergence, :aPPFD, :plant_leaf_area, :carbon_assimilation, :carbon_offer_after_rm, :Rm, :TT_since_init, :TEff, :phytomer_count, :newPhytomerEmergence),
+        :Leaf => (:Rm, :potential_area, :TT_since_init, :TEff, :biomass, :carbon_demand, :carbon_allocation,),
+        # :Leaf => (:Rm, :potential_area),
+        # :Internode => (:Rm, :carbon_allocation, :carbon_demand),
+        :Male => (:Rm,),
+        # :Female => (:biomass,),
+        # :Soil => (:TEff, :ftsw, :root_depth),
     )
 
     # Example 1: Run the model with the default parameters (but output as a DataFrame):
     palm = XPalm.Palm(initiation_age=0, parameters=XPalm.default_parameters())
     models = XPalm.model_mapping(palm)
-    return palm, models, out_vars, meteo
+    return palm, models, out_vars, m
 end
 
 function xpalm_default_param_run(palm, models, out_vars, meteo)

src/mtg/mapping/mapping.jl

@@ -248,9 +248,9 @@ end
 function _show_model_mapping_plain(io::IO, mapping::ModelMapping)
     info = mapping.info
     println(io, "ModelMapping")
-    println(io, "  Validated: ", info.validated, " (", info.is_valid ? "valid" : "invalid", ")")
-    println(io, "  Multirate: ", info.is_multirate)
-    println(io, "  Scales (", length(info.scales), "): ", join(info.scales, ", "))
+    println(io, "  validated: ", info.validated, " (", info.is_valid ? "valid" : "invalid", ")")
+    println(io, "  multirate: ", info.is_multirate)
+    println(io, "  scales (", length(info.scales), "): ", join(info.scales, ", "))
     for scale in info.scales
         print(io, "  - ", scale, ": ", get(info.models_per_scale, scale, 0), " model(s)")
         processes = get(info.processes_per_scale, scale, Symbol[])

src/run.jl

@@ -655,9 +655,10 @@ function run!(
     _validate_meteo_duration(meteo)
     timeline = _timeline_context(meteo)
     meteo_sampler = effective_multirate ? _prepare_meteo_sampler(meteo) : nothing
-    runtime_clock_rows = effective_multirate ? _runtime_clock_rows(object, timeline, dep_graph) : NamedTuple[]
+    runtime_clock_rows = _runtime_clock_rows(object, timeline, dep_graph)
     effective_executor = executor
     # st = status(object)
+    _validate_meteo_derived_timestep_requirements!(runtime_clock_rows, timeline)
     if effective_multirate
         if executor != SequentialEx()
             @warn string(
@@ -667,7 +668,6 @@ function run!(
             ) maxlog = 1
             effective_executor = SequentialEx()
         end
-        _validate_meteo_derived_timestep_requirements!(runtime_clock_rows, timeline)
         _warn_if_no_model_runs_at_base_timestep(runtime_clock_rows, timeline)
         validate_canonical_publishers(object)
         prepare_output_requests!(object, tracked_outputs, timeline)

src/time/runtime/clocks.jl

@@ -250,41 +250,41 @@ function _resolve_meteo_hint_clock(scale::Symbol, process::Symbol, model, timeli
     reason = nothing
 
     if !isnothing(hint.fixed)
-        desired_sec = _seconds_from_period(hint.fixed)
-        if !isapprox(desired_sec, base_sec; atol=1.0e-9, rtol=0.0)
+        required_sec = _seconds_from_period(hint.fixed)
+        if !isapprox(required_sec, base_sec; atol=1.0e-9, rtol=0.0)
             reason = string(
-                "`timestep_hint.required=", hint.fixed,
-                "` differs from meteo base step ", _format_seconds_label(base_sec), "."
+                "Meteo base step ",
+                _format_seconds_label(base_sec),
+                " is outside `timestep_hint.required=",
+                hint.fixed,
+                "` for `",
+                scale,
+                "/",
+                process,
+                "`."
             )
         end
     elseif !isnothing(hint.range)
         lo, hi = hint.range
         lo_sec = _seconds_from_period(lo)
         hi_sec = _seconds_from_period(hi)
-        if base_sec < lo_sec
-            desired_sec = lo_sec
-            reason = string(
-                "meteo base step ", _format_seconds_label(base_sec),
-                " is finer than required lower bound ", lo,
-                "; using ", lo, "."
-            )
-        elseif base_sec > hi_sec
-            desired_sec = hi_sec
+        if base_sec < lo_sec || base_sec > hi_sec
             reason = string(
-                "meteo base step ", _format_seconds_label(base_sec),
-                " is coarser than required upper bound ", hi,
-                "; attempting ", hi, "."
+                "Meteo base step ",
+                _format_seconds_label(base_sec),
+                " is outside `timestep_hint.required=(",
+                lo,
+                ", ",
+                hi,
+                ")` for `",
+                scale,
+                "/",
+                process,
+                "`."
             )
         end
     end
 
-    if desired_sec < base_sec
-        reason = isnothing(reason) ?
-                 string("required timestep ", _format_seconds_label(desired_sec), " is shorter than meteo; using meteo base step.") :
-                 string(reason, " Runtime does not support sub-step execution; using meteo base step.")
-        desired_sec = base_sec
-    end
-
     dt = desired_sec / base_sec
     return ClockSpec(dt, 0.0), reason
 end
@@ -400,19 +400,9 @@ function _validate_meteo_derived_timestep_requirements!(rows, timeline::Timeline
         row.source == :meteo_base_step || continue
 
         if !isnothing(row.hint_reason)
-            @warn string(
-                "Adjusted runtime timestep for `",
-                row.scale,
-                "/",
-                row.process,
-                "` from meteo-derived default: ",
-                row.hint_reason,
-                " Effective timestep is ",
-                _format_seconds_label(float(row.clock.dt) * timeline.base_step_seconds),
-                "."
-            ) maxlog = 1
+            error(row.hint_reason)
         end
     end
 
     return nothing
-end
+end