diff --git a/Project.toml b/Project.toml index 29ee7fd..7209367 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ClimateModels" uuid = "f6adb021-9183-4f40-84dc-8cea6f651bb0" authors = ["gaelforget "] -version = "0.2.18" +version = "0.2.19" [deps] CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" diff --git a/docs/src/API.md b/docs/src/API.md index 870c204..a616c82 100644 --- a/docs/src/API.md +++ b/docs/src/API.md @@ -25,7 +25,7 @@ launch log ``` -Also provided : [`pathof`](@ref), [`readdir`](@ref), [`show`](@ref), [`clean`](@ref), and [`@ModelRun`](@ref) +Also provided : [`pathof`](@ref), [`joinpath`](@ref), [`readdir`](@ref), [`show`](@ref), [`clean`](@ref), and [`@ModelRun`](@ref) ## [Notebook Methods](@id notebook_methods) @@ -52,6 +52,7 @@ ModelRun ```@docs pathof +joinpath readdir show clean diff --git a/src/ClimateModels.jl b/src/ClimateModels.jl index 3ebbfef..41f73ae 100644 --- a/src/ClimateModels.jl +++ b/src/ClimateModels.jl @@ -3,9 +3,15 @@ module ClimateModels using UUIDs, Suppressor, OrderedCollections using Pkg, Git, TOML, NetCDF +include("interface.jl") +include("notebooks.jl") +include("toy_models.jl") + +import .notebooks: update + export AbstractModelConfig, ModelConfig, PlutoConfig export ModelRun, @ModelRun, PkgDevConfig -export clean, build, compile, setup, launch, notebooks +export clean, build, compile, setup, launch, update, notebooks export put!, take!, pathof, readdir, log #export git_log_init, git_log_msg, git_log_fil #export git_log_prm, git_log_show @@ -13,10 +19,6 @@ export put!, take!, pathof, readdir, log #export train, compare, analyze export RandomWalker -export OrderedDict, UUID, uuid4, @suppress #should be commented out? - -include("interface.jl") -include("notebooks.jl") -include("toy_models.jl") +#export OrderedDict, UUID, uuid4, @suppress end diff --git a/src/interface.jl b/src/interface.jl index 04ad9a1..91605a4 100644 --- a/src/interface.jl +++ b/src/interface.jl @@ -1,5 +1,5 @@ -import Base: put!, take!, pathof, readdir, log, run +import Base: put!, take!, pathof, joinpath, readdir, log, run abstract type AbstractModelConfig end @@ -96,7 +96,7 @@ PkgDevConfig(url::String,func::Function,inputs::NamedTuple) = """ pathof(x::AbstractModelConfig) -Returns the run directory path for x ; i.e. joinpath(x.folder,string(x.ID)) +Returns the run directory path for x ; i.e. `joinpath(x.folder,string(x.ID))` """ pathof(x::AbstractModelConfig) = joinpath(x.folder,string(x.ID)) @@ -104,9 +104,17 @@ pathof(x::AbstractModelConfig) = joinpath(x.folder,string(x.ID)) """ pathof(x::AbstractModelConfig,subfolder::String) -Same as pathof(joinpath(x,subfolder)). +Same as `pathof(joinpath(x,subfolder))` or `joinpath(pathof(x),subfolder)` """ -pathof(x::AbstractModelConfig,subfolder::String) = joinpath(pathof(x),subfolder) +pathof(x::AbstractModelConfig,subfolder...) = joinpath(x,subfolder...) + + +""" + joinpath(x::AbstractModelConfig,y...) + +Same as `joinpath(pathof(x),y...)` +""" +joinpath(x::AbstractModelConfig,y...) = joinpath(pathof(x),y...) """ readdir(x::AbstractModelConfig) diff --git a/src/notebooks.jl b/src/notebooks.jl index 902bef8..29f4922 100644 --- a/src/notebooks.jl +++ b/src/notebooks.jl @@ -259,8 +259,10 @@ function notebook_launch(MC::PlutoConfig) Pkg.instantiate() try - include("main.jl") + run(`julia --project=. main.jl`) + write("aok.txt","main.jl seems to have run aok") catch e + write("fail.txt","main.jl seems to have FAILED") tmp[1]="model run may have failed" end