diff --git a/src/setup.cpp b/src/setup.cpp index 8717de7..876a45e 100644 --- a/src/setup.cpp +++ b/src/setup.cpp @@ -75,13 +75,8 @@ namespace fea { } std::vector createNodeVecFromJSON(const rapidjson::Document &config_doc) { - std::vector > nodes_vec; - try { - fea::createVectorFromJSON(config_doc, "nodes", nodes_vec); - } - catch (std::runtime_error &e) { - throw; - } + std::vector< std::vector > nodes_vec; + fea::createVectorFromJSON(config_doc, "nodes", nodes_vec); std::vector nodes_out(nodes_vec.size()); Node n; @@ -100,15 +95,10 @@ namespace fea { } std::vector createElemVecFromJSON(const rapidjson::Document &config_doc) { - std::vector > elems_vec; - std::vector > props_vec; - try { - fea::createVectorFromJSON(config_doc, "elems", elems_vec); - fea::createVectorFromJSON(config_doc, "props", props_vec); - } - catch (std::runtime_error &e) { - throw; - } + std::vector< std::vector > elems_vec; + std::vector< std::vector > props_vec; + fea::createVectorFromJSON(config_doc, "elems", elems_vec); + fea::createVectorFromJSON(config_doc, "props", props_vec); if (elems_vec.size() != props_vec.size()) { throw std::runtime_error("The number of rows in elems did not match props."); @@ -139,13 +129,8 @@ namespace fea { } std::vector createBCVecFromJSON(const rapidjson::Document &config_doc) { - std::vector > bcs_vec; - try { - fea::createVectorFromJSON(config_doc, "bcs", bcs_vec); - } - catch (std::runtime_error &e) { - throw; - } + std::vector< std::vector > bcs_vec; + fea::createVectorFromJSON(config_doc, "bcs", bcs_vec); std::vector bcs_out(bcs_vec.size()); @@ -161,13 +146,8 @@ namespace fea { } std::vector createForceVecFromJSON(const rapidjson::Document &config_doc) { - std::vector > forces_vec; - try { - fea::createVectorFromJSON(config_doc, "forces", forces_vec); - } - catch (std::runtime_error &e) { - throw; - } + std::vector< std::vector > forces_vec; + fea::createVectorFromJSON(config_doc, "forces", forces_vec); std::vector forces_out(forces_vec.size()); @@ -183,13 +163,8 @@ namespace fea { } std::vector createTieVecFromJSON(const rapidjson::Document &config_doc) { - std::vector > ties_vec; - try { - fea::createVectorFromJSON(config_doc, "ties", ties_vec); - } - catch (std::runtime_error &e) { - throw; - } + std::vector< std::vector > ties_vec; + fea::createVectorFromJSON(config_doc, "ties", ties_vec); std::vector ties_out(ties_vec.size());