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
15 changes: 8 additions & 7 deletions src/JulES.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ using YAML
using HDF5

# Used by ifm
using CSV
using Random
using OrdinaryDiffEq
using Lux
using ComponentArrays
using Interpolations
using JLD2
#using CSV
#using Random
#using OrdinaryDiffEq
#using Lux
#using ComponentArrays
#using Interpolations
#using JLD2

# Used by Nerual inflow model but not HBV
# using DiffEqFlux
# using SciMLSensitivity
Expand Down
19 changes: 17 additions & 2 deletions src/run_jules_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ function getdataset(config, names, filename_clearing, filename_aggregated)
)
end

function load_ifm_dep()
mod = @__MODULE__
@everywhere begin
@eval $mod using CSV
@eval $mod using Random
@eval $mod using OrdinaryDiffEq
@eval $mod using Lux
@eval $mod using ComponentArrays
@eval $mod using Interpolations
@eval $mod using JLD2
end
end

function run_jules(
config_path,
datayear,
Expand All @@ -59,8 +72,10 @@ function run_jules(
)

input = JulES.DefaultJulESInput(config, dataset, datayear, weatheryear)

@time data = JulES.run_serial(input)

has_ifm_results(input) && load_ifm_dep()

@time data = JulES.run_serial(input)
println("Total serial time above")

println("Save output")
Expand Down
Loading