Merge #712

712: fix threaded_copyto r=simonbyrne a=simonbyrne This was causing failures in ClimaAtmos: https://buildkite.com/clima/climaatmos-ci/builds/804#b7326cba-26f7-4c79-86e3-987c64dd4f13 Unfortunately we don't have any tests which enable threading (this is rather complicated). - [X] Code follows the [style guidelines](https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/) OR N/A. - [ ] Unit tests are included OR N/A. - [X] Code is exercised in an integration test OR N/A. - [X] Documentation has been added/updated OR N/A. Co-authored-by: Simon Byrne <[email protected]>
CliMA · May 6, 2022 · b9cc1ab · b9cc1ab · simonbyrne · May 6, 2022
2 parents 9e35919 + 4d02145
commit b9cc1ab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ClimaCore"
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
 authors = ["CliMA Contributors <[email protected]>"]
-version = "0.10.2"
+version = "0.10.3"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
@@ -173,7 +173,7 @@ version = "0.3.0"
 deps = ["Adapt", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DiffEqBase", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "RecursiveArrayTools", "RootSolvers", "Rotations", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"]
 path = ".."
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
-version = "0.10.2"
+version = "0.10.3"
 
 [[deps.ClimaCoreMakie]]
 deps = ["ClimaCore", "Makie"]

diff --git a/examples/Manifest.toml b/examples/Manifest.toml
@@ -151,7 +151,7 @@ version = "0.3.2"
 deps = ["Adapt", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DiffEqBase", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "RecursiveArrayTools", "RootSolvers", "Rotations", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"]
 path = ".."
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
-version = "0.10.2"
+version = "0.10.3"
 
 [[deps.ClimaCorePlots]]
 deps = ["ClimaCore", "RecipesBase", "StaticArrays", "TriplotBase"]

diff --git a/src/Operators/finitedifference.jl b/src/Operators/finitedifference.jl
@@ -2773,7 +2773,7 @@ function _threaded_copyto!(
 ) where {S <: AbstractStencilStyle}
  Threads.@threads for h in 1:Nh
  for j in 1:Nj, i in 1:Ni
- apply_stencil!(column_field_out, column_bc, (i, j, h))
+ apply_stencil!(field_out, bc, (i, j, h))
  end
  end
  return field_out