addressing reviewing comments for OPM#4334

Author: GitPaean

opm/input/eclipse/Schedule/ScheduleState.hpp

@@ -203,10 +203,9 @@ namespace Opm {
             }
 
             void update(const K& key, std::shared_ptr<T> value) {
-                this->m_data[key] = value;
+                this->m_data.insert_or_assign(key, std::move(value));
             }
 
-
             void update(T object) {
                 auto key = object.name();
                 this->m_data[key] = std::make_shared<T>( std::move(object) );

opm/input/eclipse/Schedule/Well/WellKeywordHandlers.cpp

@@ -449,8 +449,8 @@ void handleWELLSTRE(HandlerContext& handlerContext)
 {
     auto& inj_streams = handlerContext.state().inj_streams;
     for (const auto& record : handlerContext.keyword) {
-        const std::string& stream_name = record.getItem("STREAM").getTrimmedString(0);
-        const auto& composition = record.getItem("COMPOSITIONS").getData<double>();
+        const auto stream_name = record.getItem<ParserKeywords::WELLSTRE::STREAM>().getTrimmedString(0);
+        const auto& composition = record.getItem<ParserKeywords::WELLSTRE::COMPOSITIONS>().getSIDoubleData();
         const std::size_t num_comps = handlerContext.static_schedule().m_runspec.numComps();
         if (composition.size() != num_comps) {
             const std::string msg = fmt::format("The number of the composition values for stream '{}' is not the same as the number of components.", stream_name);
@@ -462,8 +462,8 @@ void handleWELLSTRE(HandlerContext& handlerContext)
             const std::string msg = fmt::format("The sum of the composition values for stream '{}' is not 1.0, but {}.", stream_name, sum);
             throw OpmInputError(msg, handlerContext.keyword.location());
         }
-        auto composition_ptr = std::make_shared<std::vector<double>>(std::move(composition));
-        inj_streams.update(stream_name, composition_ptr);
+        auto composition_ptr = std::make_shared<std::vector<double>>(composition);
+        inj_streams.update(stream_name, std::move(composition_ptr));
     }
 
 }
@@ -554,9 +554,7 @@ void handleWINJGAS(HandlerContext& handlerContext)
 {
     // \Note: we do not support the item 4 MAKEUPGAS and item 5 STAGE in WINJGAS keyword yet
     for (const auto& record : handlerContext.keyword) {
-        const std::string& wellNamePattern = record.getItem("WELL").getTrimmedString(0);
-        const auto well_names = handlerContext.wellNames(wellNamePattern, false);
-        const std::string fluid_nature = record.getItem("FLUID").getTrimmedString(0);
+        const std::string fluid_nature = record.getItem<ParserKeywords::WINJGAS::FLUID>().getTrimmedString(0);
 
         // \Note: technically, only the first two characters are significant
         // with some testing, we can determine whether we want to enforce this.
@@ -565,15 +563,17 @@ void handleWINJGAS(HandlerContext& handlerContext)
             const std::string msg = fmt::format("The fluid nature '{}' is not supported in WINJGAS keyword.", fluid_nature);
             throw OpmInputError(msg, handlerContext.keyword.location());
         }
-        const std::string stream_name = record.getItem("STREAM").getTrimmedString(0);
 
+        const std::string stream_name = record.getItem<ParserKeywords::WINJGAS::STREAM>().getTrimmedString(0);
         // we make sure the stream is defined in WELLSTRE keyword
         const auto& inj_streams = handlerContext.state().inj_streams;
         if (!inj_streams.has(stream_name)) {
             const std::string msg = fmt::format("The stream '{}' is not defined in WELLSTRE keyword.", stream_name);
             throw OpmInputError(msg, handlerContext.keyword.location());
         }
 
+        const std::string wellNamePattern = record.getItem<ParserKeywords::WINJGAS::WELL>().getTrimmedString(0);
+        const auto well_names = handlerContext.wellNames(wellNamePattern, false);
         for (const auto& well_name : well_names) {
             auto well2 = handlerContext.state().wells.get(well_name);
             auto injection = std::make_shared<Well::WellInjectionProperties>(well2.getInjectionProperties());