diff --git a/Source/Geometry.cpp b/Source/Geometry.cpp index c98b639..d6d3d03 100644 --- a/Source/Geometry.cpp +++ b/Source/Geometry.cpp @@ -57,7 +57,7 @@ void ExtrudedTriangles::build( std::string pointstr = "tri_" + std ::to_string(itri) + "_point_" + std::to_string(ipt); amrex::Vector vecpt; - pp.getarr(pointstr.c_str(), vecpt, 0, AMREX_SPACEDIM); + pp.getarr(pointstr, vecpt, 0, AMREX_SPACEDIM); for (int dir = 0; dir < AMREX_SPACEDIM; dir++) { point[dir] = vecpt[dir]; } diff --git a/Source/LBM.cpp b/Source/LBM.cpp index 410bf9c..2c20abf 100644 --- a/Source/LBM.cpp +++ b/Source/LBM.cpp @@ -262,12 +262,12 @@ void LBM::read_parameters() has_vel_bc = true; } } - if (!(pp.contains(vel_bc_key.c_str())) && has_vel_bc) { + if (!(pp.contains(vel_bc_key)) && has_vel_bc) { amrex::Abort( "LBM::read_paramaters: velocity BC is used without specifying " "the type to be used"); } - pp.query(vel_bc_key.c_str(), m_velocity_bc_type); + pp.query(vel_bc_key, m_velocity_bc_type); pp.get("ic_type", m_ic_type); diff --git a/Submodules/AMReX b/Submodules/AMReX index 5d1b6c2..3c1f1c7 160000 --- a/Submodules/AMReX +++ b/Submodules/AMReX @@ -1 +1 @@ -Subproject commit 5d1b6c2bdec3498971fa4a00788e4bab3aeaaac2 +Subproject commit 3c1f1c78f60530e4ee17f766cf195c2c776f7b00