From 26ddbeac6b9c054aa35f4402408fe1b7feea9cda Mon Sep 17 00:00:00 2001 From: Pete Bachant Date: Mon, 3 Mar 2025 11:39:41 -0800 Subject: [PATCH 1/2] Make InputOutput hybrid box tests use more unique values --- test/InputOutput/unit_hybrid2dbox.jl | 4 ++-- test/InputOutput/unit_hybrid2dbox_stretched.jl | 4 ++-- test/InputOutput/unit_hybrid2dbox_topography.jl | 4 ++-- test/InputOutput/unit_hybrid3dbox.jl | 7 +++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/test/InputOutput/unit_hybrid2dbox.jl b/test/InputOutput/unit_hybrid2dbox.jl index 35d1a5a0e8..850e22824d 100644 --- a/test/InputOutput/unit_hybrid2dbox.jl +++ b/test/InputOutput/unit_hybrid2dbox.jl @@ -104,8 +104,8 @@ end coord -> init_dry_rising_bubble_2d(coord.x, coord.z, params), coords, ) - uₕ = map(_ -> Geometry.Covariant1Vector(0.0), coords) - w = map(_ -> Geometry.Covariant3Vector(0.0), face_coords) + uₕ = map(coord -> Geometry.Covariant1Vector(coord.x * 0.1), coords) + w = map(coord -> Geometry.Covariant3Vector(coord.x * 0.2), face_coords) Y = Fields.FieldVector(Yc = Yc, uₕ = uₕ, w = w) # write field vector to hdf5 file diff --git a/test/InputOutput/unit_hybrid2dbox_stretched.jl b/test/InputOutput/unit_hybrid2dbox_stretched.jl index 05bd887937..55e15187a5 100644 --- a/test/InputOutput/unit_hybrid2dbox_stretched.jl +++ b/test/InputOutput/unit_hybrid2dbox_stretched.jl @@ -105,8 +105,8 @@ end coord -> init_dry_rising_bubble_2d(coord.x, coord.z, params), coords, ) - uₕ = map(_ -> Geometry.Covariant1Vector(0.0), coords) - w = map(_ -> Geometry.Covariant3Vector(0.0), face_coords) + uₕ = map(coord -> Geometry.Covariant1Vector(coord.x * 0.1), coords) + w = map(coord -> Geometry.Covariant3Vector(coord.z * 0.2), face_coords) Y = Fields.FieldVector(Yc = Yc, uₕ = uₕ, w = w) # write field vector to hdf5 file diff --git a/test/InputOutput/unit_hybrid2dbox_topography.jl b/test/InputOutput/unit_hybrid2dbox_topography.jl index a42707a356..0d810802fd 100644 --- a/test/InputOutput/unit_hybrid2dbox_topography.jl +++ b/test/InputOutput/unit_hybrid2dbox_topography.jl @@ -116,8 +116,8 @@ end coord -> init_dry_rising_bubble_2d(coord.x, coord.z, params), coords, ) - uₕ = map(_ -> Geometry.Covariant1Vector(0.0), coords) - w = map(_ -> Geometry.Covariant3Vector(0.0), face_coords) + uₕ = map(coord -> Geometry.Covariant1Vector(coord.x * 0.11), coords) + w = map(coord -> Geometry.Covariant3Vector(coord.z * 0.25), face_coords) Y = Fields.FieldVector(Yc = Yc, uₕ = uₕ, w = w) # write field vector to hdf5 file diff --git a/test/InputOutput/unit_hybrid3dbox.jl b/test/InputOutput/unit_hybrid3dbox.jl index ef548418f8..4588ae0f17 100644 --- a/test/InputOutput/unit_hybrid3dbox.jl +++ b/test/InputOutput/unit_hybrid3dbox.jl @@ -116,8 +116,11 @@ end init_dry_rising_bubble_3d(coord.x, coord.y, coord.z, params), coords, ) - uₕ = map(_ -> Geometry.Covariant12Vector(0.0, 0.0), coords) - w = map(_ -> Geometry.Covariant3Vector(0.0), face_coords) + uₕ = map( + coord -> Geometry.Covariant12Vector(coord.x * 0.1, coord.y * 0.15), + coords, + ) + w = map(coord -> Geometry.Covariant3Vector(coord.z * 0.3), face_coords) Y = Fields.FieldVector(Yc = Yc, uₕ = uₕ, w = w) # write field vector to hdf5 file From a8f321ca6f5f8da726fd6c3e10ada333dbcc396c Mon Sep 17 00:00:00 2001 From: Pete Bachant Date: Mon, 3 Mar 2025 11:42:23 -0800 Subject: [PATCH 2/2] Use z-component in test for consistency --- test/InputOutput/unit_hybrid2dbox.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/InputOutput/unit_hybrid2dbox.jl b/test/InputOutput/unit_hybrid2dbox.jl index 850e22824d..57fb4bf34c 100644 --- a/test/InputOutput/unit_hybrid2dbox.jl +++ b/test/InputOutput/unit_hybrid2dbox.jl @@ -105,7 +105,7 @@ end coords, ) uₕ = map(coord -> Geometry.Covariant1Vector(coord.x * 0.1), coords) - w = map(coord -> Geometry.Covariant3Vector(coord.x * 0.2), face_coords) + w = map(coord -> Geometry.Covariant3Vector(coord.z * 0.2), face_coords) Y = Fields.FieldVector(Yc = Yc, uₕ = uₕ, w = w) # write field vector to hdf5 file