From 643059b645195948a4d945d0a72f58ec0fc207bc Mon Sep 17 00:00:00 2001 From: Andy Nonaka Date: Fri, 16 Oct 2026 10:14:31 -0700 Subject: [PATCH] fix compilation issues for LLG and non-LLG --- Source/Evolve/WarpXEvolve.cpp | 5 ++++- Source/FieldSolver/WarpXExternalEMFields.cpp | 14 -------------- Source/Initialization/WarpXInitData.cpp | 2 ++ Source/Utils/WarpXAlgorithmSelection.H | 2 +- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp index 71d387c2d..5ff7a4cba 100644 --- a/Source/Evolve/WarpXEvolve.cpp +++ b/Source/Evolve/WarpXEvolve.cpp @@ -632,7 +632,8 @@ void WarpX::SyncCurrentAndRho () SyncCurrent(current_fp, current_cp); SyncRho(rho_fp, rho_cp); } -#endif // ifndef WARPX_DIM_RZ +#ifdef WARPX_MAG_LLG +#ifndef WARPX_DIM_RZ // H and M are up-to-date in the domain, but all guard cells are // outdated. if ( safe_guard_cells ){ @@ -643,6 +644,8 @@ void WarpX::SyncCurrentAndRho () ApplyExternalFieldExcitationOnGrid(ExternalFieldType::HbiasfieldExternal); // apply H external excitation; soft source to be fixed } +#endif // ifndef WARPX_DIM_RZ +#endif // WARPX_MAG_LLG } } else // FDTD diff --git a/Source/FieldSolver/WarpXExternalEMFields.cpp b/Source/FieldSolver/WarpXExternalEMFields.cpp index 35d929834..4b7d19e38 100644 --- a/Source/FieldSolver/WarpXExternalEMFields.cpp +++ b/Source/FieldSolver/WarpXExternalEMFields.cpp @@ -96,20 +96,6 @@ WarpX::ApplyExternalFieldExcitationOnGrid (int const externalfieldtype, DtType a lev, a_dt_type ); } } - if (externalfieldtype == ExternalFieldType::AllExternal || externalfieldtype == ExternalFieldType::HbiasfieldExternal) { - if (H_bias_excitation_grid_s == "parse_h_bias_excitation_grid_function") { - ApplyExternalFieldExcitationOnGrid(H_biasfield_fp[lev][0].get(), - H_biasfield_fp[lev][1].get(), - H_biasfield_fp[lev][2].get(), - Hx_biasfield_xt_grid_parser->compile<4>(), - Hy_biasfield_xt_grid_parser->compile<4>(), - Hz_biasfield_xt_grid_parser->compile<4>(), - Hx_biasfield_flag_parser->compile<3>(), - Hy_biasfield_flag_parser->compile<3>(), - Hz_biasfield_flag_parser->compile<3>(), - lev ); - } - } #endif } // for loop over level } diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp index ade792947..db63185f9 100644 --- a/Source/Initialization/WarpXInitData.cpp +++ b/Source/Initialization/WarpXInitData.cpp @@ -712,6 +712,8 @@ WarpX::PostRestart () void WarpX::InitLevelData (int lev, Real /*time*/) { + using utils::parser::makeParser; + using utils::parser::Store_parserString; ParmParse pp_warpx("warpx"); diff --git a/Source/Utils/WarpXAlgorithmSelection.H b/Source/Utils/WarpXAlgorithmSelection.H index a82334df6..0e5de537c 100644 --- a/Source/Utils/WarpXAlgorithmSelection.H +++ b/Source/Utils/WarpXAlgorithmSelection.H @@ -174,7 +174,7 @@ struct ExternalFieldType { BfieldExternal = 2, #ifdef WARPX_MAG_LLG HfieldExternal = 3, - HbiasfieldExternal = 4 + HbiasfieldExternal = 4, #endif EfieldExternalPML = 5 };