fix rebase bugs.

JustinRayAngus · JustinRayAngus · commit 1189771d63aa · 2025-11-25T10:18:39.000-08:00
diff --git a/Source/FieldSolver/ImplicitSolvers/ThetaImplicitEM.H b/Source/FieldSolver/ImplicitSolvers/ThetaImplicitEM.H
@@ -123,11 +123,6 @@ private:
      */
     void FinishFieldUpdate ( amrex::Real end_time );
 
-    /**
-     * \brief Inititialize the BC masks for the curl curl operator
-     */
-    void InitializeCurlCurlBCMasks ();
-
 };
 
 #endif
diff --git a/Source/NonlinearSolvers/MatrixPC.H b/Source/NonlinearSolvers/MatrixPC.H
@@ -648,7 +648,7 @@ int MatrixPC<T,Ops>::Assemble (const T& a_U)
                         int icol = num_nz_ptr[ridx_l];
                         {
                             int cidx_g_lhs = dof_arr(i,j,k,1);
-                            amrex::Real val = sigma_ii_arr(i,j,k,0);
+                            amrex::Real val = sigma_ii_arr(i,j,k,diag_MM_comp);
                             auto flag = MatrixPCUtils::insertOrAdd( cidx_g_lhs, val,
                                                                     &c_indices_g_ptr[ridx_l*nnz_max],
                                                                     &a_ij_ptr[ridx_l*nnz_max],

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ int MatrixPC<T,Ops>::Assemble (const T& a_U)`
`648`	`648`	`int icol = num_nz_ptr[ridx_l];`
`649`	`649`	`{`
`650`	`650`	`int cidx_g_lhs = dof_arr(i,j,k,1);`
`651`		`- amrex::Real val = sigma_ii_arr(i,j,k,0);`
	`651`	`+ amrex::Real val = sigma_ii_arr(i,j,k,diag_MM_comp);`
`652`	`652`	`auto flag = MatrixPCUtils::insertOrAdd( cidx_g_lhs, val,`
`653`	`653`	`&c_indices_g_ptr[ridx_l*nnz_max],`
`654`	`654`	`&a_ij_ptr[ridx_l*nnz_max],`