Skip to content

Commit d312c9f

Browse files
authored
Merge branch 'master' into as/generalize-float
2 parents 1ec4858 + e802d33 commit d312c9f

3 files changed

Lines changed: 23 additions & 21 deletions

File tree

Project.toml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@ ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
88
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
99
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1010
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
11-
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
11+
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
1212
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
1313
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
1414
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
1515
Crayons = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
16+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
1617
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
1718
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1819
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
1920
Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
2021
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
2122
DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
23+
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
24+
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
2225
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
23-
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
2426
ElasticArrays = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"
2527
Geodesy = "0ef565a4-170c-5f04-8de2-149903a85f3d"
2628
Gridap = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e"
@@ -31,43 +33,46 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
3133
Infiltrator = "5903a43b-9cc3-4c30-8d17-598619ec4e9b"
3234
InternedStrings = "7d512f48-7fb1-5a58-b986-67e6dc259f01"
3335
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
36+
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
3437
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
3538
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
3639
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
3740
LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
3841
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
39-
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
42+
MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
4043
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
4144
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
4245
P4est_wrapper = "3743d7c0-8adf-11ea-380b-7d33b0ecc1da"
4346
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
4447
PartitionedArrays = "5a9dfac6-5c52-46f7-8278-5e2210713be9"
48+
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
49+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
4550
Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
4651
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
47-
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
4852
Quadmath = "be4d8f0f-7fa4-5f49-b795-2f01399ab2dd"
4953
RRTMGP = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
50-
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
5154
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
55+
Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
5256
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
5357
SnoopCompile = "aa65fe97-06da-5843-b5b1-d5d13cad87d2"
5458
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
5559
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
5660
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
57-
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
58-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5961
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
6062
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
6163
UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
6264
WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
6365

6466
[compat]
65-
MPI = "0.20.22"
66-
Thermodynamics = "0.12.7"
67-
PrettyTables = "2.4.0"
68-
Crayons = "4.1.1"
69-
UnicodePlots = "3.7.2"
70-
Gridap = "0.18.12"
71-
GridapDistributed = "0.4.7"
72-
GridapGmsh = "0.7.2"
73-
GridapP4est = "0.3.11"
67+
CSV = "0.10.15"
68+
Crayons = "=4.1.1"
69+
Gridap = "=0.18.12"
70+
GridapDistributed = "=0.4.7"
71+
GridapGmsh = "=0.7.2"
72+
GridapP4est = "=0.3.11"
73+
MPI = "=0.20.22"
74+
MPIPreferences = "=0.1.11"
75+
PrettyTables = "=2.4.0"
76+
Roots = "2.2.10"
77+
Thermodynamics = "=0.12.7"
78+
UnicodePlots = "=3.7.2"

src/kernel/Adaptivity/Projection.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,6 @@ function scatter_gather_projection!(plane, nglx, ngly, nglz)
157157
return Psg
158158
end
159159

160-
161-
using Test
162-
163-
164160
function build_interpolation(ra, rb, wa)
165161
Nra = length(ra)
166162
Nrb = length(rb)
@@ -3485,4 +3481,4 @@ function redistributed_q!(u, u_old, glue_redistribute, connijk, old_connijk, ngl
34853481
end
34863482
end
34873483
end
3488-
end
3484+
end

test/solnCompare.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module solnCompare
33
export run_example
44

55
using HDF5
6+
using Test
67

78
function find_hdf5_files(directory::String)
89
files = readdir(directory, join=true) # List all files with full paths

0 commit comments

Comments
 (0)