diff options
| author |  Revathi Jambunathan <41089244+RevathiJambunathan@users.noreply.github.com>
| 2022-03-10 11:58:22 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-03-10 11:58:22 -0800 |
| commit | da837aaffd1d2fbce14a6bea4a3a38331a56df72 (patch) | |
| tree | dbc0f06ddbcbac13419e653c9f402f979cba2fd6 /Source/Particles | |
| parent | 8b8760d2cb9d288b3c6f3f52c2bf2536f232afc0 (diff) | |
| download | WarpX-da837aaffd1d2fbce14a6bea4a3a38331a56df72.tar.gz WarpX-da837aaffd1d2fbce14a6bea4a3a38331a56df72.tar.zst WarpX-da837aaffd1d2fbce14a6bea4a3a38331a56df72.zip | |
fix ambiguity in Parser from amrex and ExternalFieldInitType (#2955)
Diffstat (limited to 'Source/Particles')
| -rw-r--r-- | Source/Particles/Gather/GetExternalFields.H | 4 | ||||
| -rw-r--r-- | Source/Particles/Gather/GetExternalFields.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Particles/Gather/GetExternalFields.H b/Source/Particles/Gather/GetExternalFields.H index 37d90cdba..3c1dfdf60 100644 --- a/Source/Particles/Gather/GetExternalFields.H +++ b/Source/Particles/Gather/GetExternalFields.H @@ -82,7 +82,7 @@ struct GetExternalEBField Ey = m_Efield_value[1]; Ez = m_Efield_value[2]; } - else if (m_Etype == Parser) + else if (m_Etype == ExternalFieldInitType::Parser) { amrex::ParticleReal x, y, z; m_get_position(i, x, y, z); @@ -102,7 +102,7 @@ struct GetExternalEBField By = m_Bfield_value[1]; Bz = m_Bfield_value[2]; } - else if (m_Btype == Parser) + else if (m_Btype == ExternalFieldInitType::Parser) { amrex::ParticleReal x, y, z; m_get_position(i, x, y, z); diff --git a/Source/Particles/Gather/GetExternalFields.cpp b/Source/Particles/Gather/GetExternalFields.cpp index 8d226badb..8c57ab9cc 100644 --- a/Source/Particles/Gather/GetExternalFields.cpp +++ b/Source/Particles/Gather/GetExternalFields.cpp @@ -52,7 +52,7 @@ GetExternalEBField::GetExternalEBField (const WarpXParIter& a_pti, int a_offset) if (mypc.m_E_ext_particle_s == "parse_e_ext_particle_function") { - m_Etype = Parser; + m_Etype = ExternalFieldInitType::Parser; m_Exfield_partparser = mypc.m_Ex_particle_parser->compile<4>(); m_Eyfield_partparser = mypc.m_Ey_particle_parser->compile<4>(); m_Ezfield_partparser = mypc.m_Ez_particle_parser->compile<4>(); @@ -60,7 +60,7 @@ GetExternalEBField::GetExternalEBField (const WarpXParIter& a_pti, int a_offset) if (mypc.m_B_ext_particle_s == "parse_b_ext_particle_function") { - m_Btype = Parser; + m_Btype = ExternalFieldInitType::Parser; m_Bxfield_partparser = mypc.m_Bx_particle_parser->compile<4>(); m_Byfield_partparser = mypc.m_By_particle_parser->compile<4>(); m_Bzfield_partparser = mypc.m_Bz_particle_parser->compile<4>(); |