From e72e06d1e59c05e3cfdfb734aab152254ffb3649 Mon Sep 17 00:00:00 2001 From: David Grote Date: Mon, 30 Aug 2021 16:55:49 -0700 Subject: Added parsing in intervals (#2246) * Added parsing in intervals, minor clean up of querywithparser routines * Split up documentation * Added documentation * Added tests to inputs_2d_multi_rz_rt Co-authored-by: Axel Huebl --- Source/Utils/IntervalsParser.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Utils/IntervalsParser.cpp') diff --git a/Source/Utils/IntervalsParser.cpp b/Source/Utils/IntervalsParser.cpp index 7b7540d0c..33d32b578 100644 --- a/Source/Utils/IntervalsParser.cpp +++ b/Source/Utils/IntervalsParser.cpp @@ -14,23 +14,23 @@ SliceParser::SliceParser (const std::string& instr) auto insplit = WarpXUtilStr::split>(instr, m_separator, true); if(insplit.size() == 1){ // no colon in input string. The input is the period. - WarpXUtilMsg::AlwaysAssert(amrex::is_it(insplit[0], m_period),assert_msg);} + m_period = parseStringtoInt(insplit[0], "interval period");} else if(insplit.size() == 2) // 1 colon in input string. The input is start:stop { if (!insplit[0].empty()){ - WarpXUtilMsg::AlwaysAssert(amrex::is_it(insplit[0], m_start),assert_msg);} + m_start = parseStringtoInt(insplit[0], "interval start");} if (!insplit[1].empty()){ - WarpXUtilMsg::AlwaysAssert(amrex::is_it(insplit[1], m_stop),assert_msg);} + m_stop = parseStringtoInt(insplit[1], "interval stop");} } else // 2 colons in input string. The input is start:stop:period { WarpXUtilMsg::AlwaysAssert(insplit.size() == 3,assert_msg); if (!insplit[0].empty()){ - WarpXUtilMsg::AlwaysAssert(amrex::is_it(insplit[0], m_start),assert_msg);} + m_start = parseStringtoInt(insplit[0], "interval start");} if (!insplit[1].empty()){ - WarpXUtilMsg::AlwaysAssert(amrex::is_it(insplit[1], m_stop),assert_msg);} + m_stop = parseStringtoInt(insplit[1], "interval stop");} if (!insplit[2].empty()){ - WarpXUtilMsg::AlwaysAssert(amrex::is_it(insplit[2], m_period),assert_msg);} + m_period = parseStringtoInt(insplit[2], "interval period");} } } -- cgit v1.2.3