Skip to content

fix PEC + parser sigma logic bug #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajnonaka merged 1 commit into from
May 24, 2026
Merged

fix PEC + parser sigma logic bug #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,16 @@ MacroscopicProperties::InitData ()

// call this before setting sigma in the rest of the domain since this zeros sigma once the PEC mask is defined
if (warpx.use_PEC_mask) {

// read in the layer(s) from the numpy file(s)
if (m_sigma_s == "parse_sigma_npy_file" || m_sigma_s == "parse_sigma_both") {
InitializeMacroMultiFabFromNumpy(m_sigma_mf.get(), m_sigma_npy_filename, lev, m_npy_k_index, m_sigma_npy_value);
if (!m_sigma_npy_filename2.empty()) {
InitializeMacroMultiFabFromNumpy(m_sigma_mf.get(), m_sigma_npy_filename2, lev, m_npy_k_index2, m_sigma_npy_value);
}
} else {
amrex::Abort("warpx.use_PEC_mask requies a npy file);
}
// get pointer to PEC mask in WarpX class
amrex::MultiFab * PECx = warpx.get_pointer_PEC_fp(lev,0);
amrex::MultiFab * PECy = warpx.get_pointer_PEC_fp(lev,1);
Expand Down Expand Up @@ -293,11 +303,13 @@ MacroscopicProperties::InitData ()
InitializeMacroMultiFabUsingParser(m_sigma_mf.get(), m_sigma_parser->compile<3>(), lev);
}

// Step 2: Overwrite with numpy mask in valid region if provided
if (m_sigma_s == "parse_sigma_npy_file" || m_sigma_s == "parse_sigma_both") {
InitializeMacroMultiFabFromNumpy(m_sigma_mf.get(), m_sigma_npy_filename, lev, m_npy_k_index, m_sigma_npy_value);
if (!m_sigma_npy_filename2.empty()) {
InitializeMacroMultiFabFromNumpy(m_sigma_mf.get(), m_sigma_npy_filename2, lev, m_npy_k_index2, m_sigma_npy_value);
// Step 2: If not using PEC mask, overwrite with numpy mask in valid region if provided
if (!warpx.use_PEC_mask) {
if (m_sigma_s == "parse_sigma_npy_file" || m_sigma_s == "parse_sigma_both") {
InitializeMacroMultiFabFromNumpy(m_sigma_mf.get(), m_sigma_npy_filename, lev, m_npy_k_index, m_sigma_npy_value);
if (!m_sigma_npy_filename2.empty()) {
InitializeMacroMultiFabFromNumpy(m_sigma_mf.get(), m_sigma_npy_filename2, lev, m_npy_k_index2, m_sigma_npy_value);
}
}
}

Expand Down
Loading