diff --git a/.github/workflows/debug_checks.yml b/.github/workflows/debug_checks.yml index a4da80bc5..468547737 100644 --- a/.github/workflows/debug_checks.yml +++ b/.github/workflows/debug_checks.yml @@ -18,7 +18,7 @@ jobs: - uses: mpi4py/setup-mpi@v1 with: mpi: 'openmpi' - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@latest with: version: '1.10' arch: x64 diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index b563a2f0d..405ffcb9e 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -14,10 +14,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@latest with: version: '1.10' - arch: x64 - uses: julia-actions/cache@v1 - name: Test examples run: | diff --git a/.github/workflows/longtest.yml b/.github/workflows/longtest.yml index 9acc1f36b..80b9a9677 100644 --- a/.github/workflows/longtest.yml +++ b/.github/workflows/longtest.yml @@ -19,10 +19,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@latest with: version: '1.10' - arch: x64 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 with: diff --git a/.github/workflows/parallel_test.yml b/.github/workflows/parallel_test.yml index 30416a0f5..88fd99e63 100644 --- a/.github/workflows/parallel_test.yml +++ b/.github/workflows/parallel_test.yml @@ -17,7 +17,7 @@ jobs: - uses: mpi4py/setup-mpi@v1 with: mpi: 'openmpi' - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@latest with: version: '1.10' arch: x64 @@ -49,14 +49,14 @@ jobs: - uses: mpi4py/setup-mpi@v1 with: mpi: 'openmpi' - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@latest with: version: '1.10' - arch: x64 - uses: julia-actions/cache@v1 - run: | + MPILIBPATH=$(find /opt/homebrew/Cellar/open-mpi/ -name libmpi.dylib) touch Project.toml - julia --project -O3 --check-bounds=no -e 'import Pkg; Pkg.add(["MPI", "MPIPreferences"]); using MPIPreferences; MPIPreferences.use_system_binary()' + julia --project -O3 --check-bounds=no -e 'import Pkg; Pkg.add(["MPI", "MPIPreferences"]); using MPIPreferences; MPIPreferences.use_system_binary(library_names="/opt/homebrew/Cellar/open-mpi/5.0.3/lib/libmpi.dylib")' julia --project -O3 --check-bounds=no -e 'import Pkg; Pkg.add(["NCDatasets", "Random", "SpecialFunctions", "Test"]); Pkg.develop(path="moment_kinetics/")' julia --project -O3 --check-bounds=no -e 'import Pkg; Pkg.precompile()' # Need to use openmpi so that the following arguments work: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ccaca9dc0..edb0bffa2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,10 +18,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@latest with: version: '1.10' - arch: x64 - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 with: diff --git a/moment_kinetics/test/restart_interpolation_tests.jl b/moment_kinetics/test/restart_interpolation_tests.jl index b8c8899c3..7d7ceb14e 100644 --- a/moment_kinetics/test/restart_interpolation_tests.jl +++ b/moment_kinetics/test/restart_interpolation_tests.jl @@ -92,10 +92,15 @@ function run_test(test_input, base, message, rtol, atol; tol_3V, kwargs...) println(" - testing ", message) # Convert from Tuple of Pairs with symbol keys to Dict with String keys - modified_inputs = Dict(String(k) => v for (k, v) in kwargs) + modified_inputs = Dict(String(k) => v for (k, v) in kwargs + if String(k) ∉ keys(test_input["timestepping"])) + modified_timestepping_inputs = Dict(String(k) => v for (k, v) in kwargs + if String(k) ∈ keys(test_input["timestepping"])) # Update default inputs with values to be changed input = merge(test_input, modified_inputs) + input["timestepping"] = merge(test_input["timestepping"], + modified_timestepping_inputs) input["run_name"] = name @@ -299,7 +304,7 @@ function runtests() Dict("evolve_moments_parallel_pressure" => true, "vpa_L" => 1.5*vpa_L, "vz_L" => 1.5*vpa_L)) - for (base, base_label) ∈ ((base_input, "full-f"), + for (base, base_label) ∈ ((base_input_full_f, "full-f"), (base_input_evolve_density, "split 1"), (base_input_evolve_upar, "split 2"), (base_input_evolve_ppar, "split 3"))