diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a01a76..260c6f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,8 @@ jobs: ${{ runner.os }}-test- ${{ runner.os }}- - uses: julia-actions/julia-buildpkg@v1 + - name: Install dependencies + run: julia --project -e 'using Pkg; Pkg.add(url = "https://github.com/CliMA/ClimaComms.jl.git", rev = "gb/artifacts"); Pkg.instantiate()' - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v1 diff --git a/Project.toml b/Project.toml index 638a9c4..4cb57d0 100644 --- a/Project.toml +++ b/Project.toml @@ -4,7 +4,6 @@ authors = ["Climate Modeling Alliance"] version = "0.9.2" [deps] -Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab" Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" @@ -17,7 +16,6 @@ ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" CreateParametersExt = "ClimaParams" [compat] -Artifacts = "<0.0.1, 1" Dates = "<0.0.1, 1" DelimitedFiles = "<0.0.1, 1" Interpolations = "0.13, 0.14, 0.15" diff --git a/src/Insolation.jl b/src/Insolation.jl index 1a14c3c..af13921 100644 --- a/src/Insolation.jl +++ b/src/Insolation.jl @@ -1,7 +1,7 @@ module Insolation +using ClimaComms using Dates, DelimitedFiles, Interpolations -using Artifacts include("Parameters.jl") import .Parameters as IP @@ -15,7 +15,7 @@ export orbital_params The parameters vary due to Milankovitch cycles. Orbital parameters from the Laskar 2004 paper are -lazily downloaded from Caltech Box to the +lazily downloaded from Caltech Data Archive to the `orbital_parameters_dataset_path(artifact_dir)` path where `artifact_dir` is the path and filename to save the artifacts toml file. @@ -27,7 +27,7 @@ struct OrbitalData{E, G, O} end function OrbitalData() - datapath = joinpath(artifact"laskar2004", "INSOL.LA2004.BTL.csv") + datapath = joinpath(@clima_artifact("laskar2004"), "INSOL.LA2004.BTL.csv") x, _ = readdlm(datapath, ',', Float64, header = true) t_range = (x[1, 1] * 1e3):1e3:(x[end, 1] * 1e3) # array of every 1 kyr to range of years e_spline_etp =