Fix some timestep mapping -related bugs that are caught by more complex examples, and add/remove some tests

Author: Samuel-amap

src/dependencies/hard_dependencies.jl

@@ -192,7 +192,9 @@ end
 
 function extract_timestep_mapped_outputs(m::MultiScaleModel, organ::String, outputs_process, timestep_mapped_outputs_process)
     if length(m.timestep_mapped_variables) > 0
-        timestep_mapped_outputs_process[organ] = Dict{Symbol,Vector}()
+        if !haskey(timestep_mapped_outputs_process, organ)
+            timestep_mapped_outputs_process[organ] = Dict{Symbol,Vector}()
+        end
         key = process(m.model)
         extra_outputs = timestep_mapped_outputs_(m)
         #ind = findfirst(x -> first(x) == key, outputs_process[organ][key])

src/dependencies/soft_dependencies.jl

@@ -431,6 +431,16 @@ search_inputs_in_output(:process3, in_, out_)
 (process4 = (:var1, :var2),)
 ```
 """
+
+
+function extract_mapped_outputs(timestep_mapped_outputs)
+    extracted = Pair[]
+    for pair in timestep_mapped_outputs
+        push!(extracted, Pair(first(last(pair)).name_to, last(last(pair))))
+    end
+    return extracted
+end
+
 function search_inputs_in_output(process, inputs, outputs, timestep_mapped_outputs=Dict{Symbol,NamedTuple}())
     # proc, ins, outs
     # get the inputs of the node:
@@ -442,7 +452,7 @@ function search_inputs_in_output(process, inputs, outputs, timestep_mapped_outpu
             vars_output = flatten_vars(pairs_vars_output)
             vars_all_outputs = vars_output
             if haskey(timestep_mapped_outputs, proc_output)
-                vars_all_outputs = (; vars_output..., flatten_vars(timestep_mapped_outputs[proc_output])...)
+                vars_all_outputs = (; vars_output..., extract_mapped_outputs(timestep_mapped_outputs[proc_output])...)
             end
 
             inputs_in_outputs = vars_in_variables(vars_input, vars_all_outputs)
@@ -549,14 +559,6 @@ function search_inputs_in_multiscale_output(process, organ, inputs, soft_dep_gra
     return inputs_as_output_of_other_scale
 end
 
-function extract_mapped_outputs(timestep_mapped_outputs)
-    extracted = Pair[]
-    for pair in timestep_mapped_outputs
-        push!(extracted, Pair(first(last(pair)).name_to, last(last(pair))))
-    end
-    return extracted
-end
-
 function add_input_as_output!(inputs_as_output_of_other_scale, soft_dep_graphs, organ_source, variable, value)
 
     timestep_mapped_outputs = soft_dep_graphs[organ_source][:timestep_mapped_outputs]