Fix type usage in new temporary locations.

Also remove one extraenous scratch location.

Author: daverumph

src/cache/temporary_quantities.jl

@@ -100,8 +100,7 @@ function temporary_quantities(Y, atmos)
                 ClimaCore.Geometry.WVector{FT},
             },
         ),
-        ᶠtracer_advection = similar(Y.f, BidiagonalMatrixRow{Adjoint{FT, C3{FT}}}),
-        ᶠtracer_advection_upwind = similar(Y.f, TridiagonalMatrixRow{FT}),
+        ᶜtracer_advection = similar(Y.c, BidiagonalMatrixRow{Adjoint{FT, C3{FT}}}),
         ᶠdiagonal_matrix_ct3xct3 = similar(
             Y.f,
             DiagonalMatrixRow{
@@ -122,10 +121,7 @@ function temporary_quantities(Y, atmos)
             Y.c,
             BidiagonalMatrixRow{Adjoint{FT, C3{FT}}},
         ),
-        ᶜadvection_matrix_2 = similar(
-            Y.c,
-            BidiagonalMatrixRow{Adjoint{FT, C3{FT}}},
-        ),
+        ᶜtridiagonal_matrix_c3 = similar(Y.c, TridiagonalMatrixRow{FT}),
         ᶜdiffusion_h_matrix = similar(Y.c, TridiagonalMatrixRow{FT}),
         ᶜdiffusion_u_matrix = similar(Y.c, TridiagonalMatrixRow{FT}),
         ᶜtridiagonal_matrix_scalar = similar(Y.c, TridiagonalMatrixRow{FT}),

src/prognostic_equations/implicit/manual_sparse_jacobian.jl

@@ -418,10 +418,10 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
         ᶜdiffusion_u_matrix,
         ᶜtridiagonal_matrix_scalar,
         ᶠsed_tracer_advection,
-        ᶠtracer_advection,
-        ᶠtracer_advection_upwind,
+        ᶜtracer_advection,
         ᶠbidiagonal_matrix_ct3,
         ᶠbidiagonal_matrix_ct3_2,
+        ᶜtridiagonal_matrix_c3,
         ᶠtridiagonal_matrix_c3,
     ) = p.scratch
     rs = p.atmos.rayleigh_sponge
@@ -1091,8 +1091,8 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
 
                     # sedimentation
                     # (pull out common subexpression for performance)
-                    ᶠsed_tracer_advection =
-                        @. DiagonalMatrixRow(ᶠinterp(ᶜρʲs.:(1) * ᶜJ) / ᶠJ) ⋅
+                    @. ᶠsed_tracer_advection =
+                        DiagonalMatrixRow(ᶠinterp(ᶜρʲs.:(1) * ᶜJ) / ᶠJ) ⋅
                            ᶠright_bias_matrix() ⋅
                            DiagonalMatrixRow(-Geometry.WVector(ᶜwʲ))
                     @. ᶜtridiagonal_matrix_scalar =
@@ -1365,10 +1365,10 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
 
                     # pull common subexpressions that don't depend on which
                     # tracer out of the tracer loop for performance
-                    ᶠtracer_advection = @. -(ᶜadvdivᵥ_matrix()) ⋅
+                    @. ᶜtracer_advection = -(ᶜadvdivᵥ_matrix()) ⋅
                        DiagonalMatrixRow(ᶠinterp(ᶜρʲs.:(1) * ᶜJ) / ᶠJ)
-                    ᶠtracer_advection_upwind =
-                        @. ᶠtracer_advection ⋅ ᶠset_tracer_upwind_matrix_bcs(
+                    @. ᶜtridiagonal_matrix_c3 =
+                        ᶜtracer_advection ⋅ ᶠset_tracer_upwind_matrix_bcs(
                             ᶠtracer_upwind_matrix(ᶠu³ʲs.:(1)),
                         )
                     MatrixFields.unrolled_foreach(
@@ -1381,21 +1381,21 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
                             matrix[ρχ_name, χʲ_name]
                         @. ∂ᶜρχ_err_∂ᶜχʲ =
                             dtγ *
-                            ᶠtracer_advection_upwind ⋅
+                            ᶜtridiagonal_matrix_c3 ⋅
                             DiagonalMatrixRow(draft_area(Y.c.sgsʲs.:(1).ρa, ᶜρʲs.:(1)))
 
                         ∂ᶜρχ_err_∂ᶜρa =
                             matrix[ρχ_name, @name(c.sgsʲs.:(1).ρa)]
                         @. ∂ᶜρχ_err_∂ᶜρa =
                             dtγ *
-                            ᶠtracer_advection_upwind ⋅
+                            ᶜtridiagonal_matrix_c3 ⋅
                             DiagonalMatrixRow(ᶜχʲ / ᶜρʲs.:(1))
 
                         ∂ᶜρχ_err_∂ᶠu₃ʲ =
                             matrix[ρχ_name, @name(f.sgsʲs.:(1).u₃)]
                         @. ∂ᶜρχ_err_∂ᶠu₃ʲ =
                             dtγ * (
-                                ᶠtracer_advection ⋅
+                                ᶜtracer_advection ⋅
                                 DiagonalMatrixRow(
                                     ᶠset_tracer_upwind_bcs(
                                         ᶠtracer_upwind(CT3(sign(ᶠu³ʲ_data)),