OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide External Access to Well-Order Sorting

Browse Source 
This commit extracts the 'NameOrder' sorting operation to a new
public member function, WellMatcher::sort(vector<string>).  The
immediate use-case for this function is to provide a stable sorting
order for wells that are matched in an ACTIONX block.  Well IDs
often end up in various output arrays in the restart files--e.g., in
the IUAP array the matching wells are used in a WCON* keyword that
employs a user-defined argument as part of setting its targets or
limits--and we should strive to keep those arrays as deterministic
as possible.
This commit is contained in:
Bård Skaflestad
2021-10-29 12:01:12 +02:00
parent 9685946196
commit 1f03a0e726
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp
View File

@@ -36,6 +36,7 @@ public:
explicit WellMatcher(std::initializer_list<std::string> wells);
explicit WellMatcher(const std::vector<std::string>& wells);
WellMatcher(const NameOrder& well_order, const WListManager& wlm);
std::vector<std::string> sort(std::vector<std::string> wells) const;
std::vector<std::string> wells(const std::string& pattern) const;
const std::vector<std::string>& wells() const;

7
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.cpp
View File

@@ -17,6 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <algorithm>
#include <utility>
#include <fnmatch.h>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp>
@@ -45,6 +46,10 @@ WellMatcher::WellMatcher(const NameOrder& well_order, const WListManager &wlm) :
{
}
std::vector<std::string> WellMatcher::sort(std::vector<std::string> wells) const {
return this->m_well_order.sort(std::move(wells));
}
const std::vector<std::string>& WellMatcher::wells() const {
return this->m_well_order.names();
}
@@ -56,7 +61,7 @@ std::vector<std::string> WellMatcher::wells(const std::string& pattern) const {
// WLIST
if (pattern[0] == '*' && pattern.size() > 1)
return this->m_well_order.sort( this->m_wlm.wells(pattern) );
return this->sort( this->m_wlm.wells(pattern) );
// Normal pattern matching
auto star_pos = pattern.find('*');