fix rebase bug.

JustinRayAngus · JustinRayAngus · commit d971ca2c1ef7 · 2026-05-02T13:55:37.000-07:00
diff --git a/Source/Particles/Deposition/MassMatricesDeposition.H b/Source/Particles/Deposition/MassMatricesDeposition.H
@@ -461,9 +461,9 @@ void doDirectJandSigmaDepositionKernel ([[maybe_unused]] const amrex::ParticleRe
 
             }
             else { // Deposit mass matrices for diagonal PC only
-                amrex::Gpu::Atomic::AddNoRet(&Syy_arr(lo.x+j_jy+ix, lo.y+l_jy+iz, 0, 0), weight_Jy*fpyy);
-#if !defined(WARPX_EM_TEY)
                 amrex::Gpu::Atomic::AddNoRet(&Sxx_arr(lo.x+j_jx+ix, lo.y+l_jx+iz, 0, 0), weight_Jx*fpxx);
+#if !defined(WARPX_EM_TEY)
+                amrex::Gpu::Atomic::AddNoRet(&Syy_arr(lo.x+j_jy+ix, lo.y+l_jy+iz, 0, 0), weight_Jy*fpyy);
 #endif
                 amrex::Gpu::Atomic::AddNoRet(&Szz_arr(lo.x+j_jz+ix, lo.y+l_jz+iz, 0, 0), weight_Jz*fpzz);
             }

Original file line number	Diff line number	Diff line change
`@@ -461,9 +461,9 @@ void doDirectJandSigmaDepositionKernel ([[maybe_unused]] const amrex::ParticleRe`
`461`	`461`
`462`	`462`	`}`
`463`	`463`	`else { // Deposit mass matrices for diagonal PC only`
`464`		`- amrex::Gpu::Atomic::AddNoRet(&Syy_arr(lo.x+j_jy+ix, lo.y+l_jy+iz, 0, 0), weight_Jy*fpyy);`
`465`		`-#if !defined(WARPX_EM_TEY)`
`466`	`464`	`amrex::Gpu::Atomic::AddNoRet(&Sxx_arr(lo.x+j_jx+ix, lo.y+l_jx+iz, 0, 0), weight_Jx*fpxx);`
	`465`	`+#if !defined(WARPX_EM_TEY)`
	`466`	`+ amrex::Gpu::Atomic::AddNoRet(&Syy_arr(lo.x+j_jy+ix, lo.y+l_jy+iz, 0, 0), weight_Jy*fpyy);`
`467`	`467`	`#endif`
`468`	`468`	`amrex::Gpu::Atomic::AddNoRet(&Szz_arr(lo.x+j_jz+ix, lo.y+l_jz+iz, 0, 0), weight_Jz*fpzz);`
`469`	`469`	`}`