Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prototype update of opm-common #171

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
28c46a4
Merge pull request #11969 from OPM/dev
magnesj Dec 5, 2024
19ae259
Prepare for release 2024.12
magnesj Dec 6, 2024
ca4a201
#11989 Check indices before accessing two-dimensional vector
magnesj Dec 12, 2024
af7addd
Add test for tab as delimiter
magnesj Dec 12, 2024
6171053
Bump to dev.02
magnesj Dec 12, 2024
8423b17
Rel perm plot legend adjustments
jonjenssen Dec 13, 2024
a18728b
#11989 Check indices before accessing two-dimensional vector
magnesj Dec 12, 2024
37de827
Rel perm plot legend adjustments
jonjenssen Dec 13, 2024
e746e6b
Bump to 2024.12.1
magnesj Dec 14, 2024
73f6937
Merge remote-tracking branch 'origin/main' into dev
magnesj Dec 16, 2024
c32e669
Bump to 2024.12.2-dev.01
magnesj Dec 16, 2024
6fea38e
Reset RIPS_DIST_VERSION to 1
magnesj Dec 16, 2024
707c5f4
Merge pull request #11998 from OPM/update-dev-after-release
magnesj Dec 16, 2024
4f3b7d2
Janitor: reduce scope of loop indexes.
kriben Dec 13, 2024
fb90844
Generate well target candidates statistics for ensembles.
kriben Oct 2, 2024
997e14c
#11993 Improve ensemble search dialog
magnesj Dec 19, 2024
356a3a8
Delete unused file
magnesj Dec 11, 2024
2eb57eb
Add dependency on boost-test
magnesj Dec 11, 2024
8f5d653
Add CREATE_OPM_COMMON_KEYWORDS used to create keywords
magnesj Dec 11, 2024
b7034b8
Update opm-common and improve cmake config
magnesj Dec 11, 2024
2db141c
Fixes by cmake-format
magnesj Dec 11, 2024
9ab15e8
Add more files to cmake-format
magnesj Dec 11, 2024
a410429
Fixes by cmake-format
magnesj Dec 11, 2024
0c8483e
Update submodule
magnesj Dec 14, 2024
1c1ce44
Update submodule
magnesj Dec 17, 2024
5c31dbd
Update submodule
magnesj Dec 19, 2024
75d399d
Update submodule
magnesj Dec 19, 2024
dc162c6
API changes opm-common
magnesj Dec 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/cmake-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
cd Fwk/AppFwk
find -name CMake*.txt | xargs ~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i
cd ..
cd ..

~/.local/bin/cmake-format -c ${{ github.workspace }}/cmake/cmake-format.py -i ThirdParty/custom-opm-common/CMakeLists.txt

git diff
- uses: peter-evans/create-pull-request@v7
Expand Down
15 changes: 13 additions & 2 deletions ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,19 +309,30 @@ std::set<int> RiaStdStringTools::valuesFromRangeSelection( const std::string& s

std::istringstream tokenStream( token );
int startIndex, endIndex;
char dash;
char dash, colon;
int step = 1;

if ( tokenStream >> startIndex )
{
if ( tokenStream >> dash && dash == '-' && tokenStream >> endIndex )
{
if ( tokenStream >> colon && colon == ':' )
{
tokenStream >> step;
}

if ( step <= 0 )
{
step = 1; // Ensure step is positive
}

if ( startIndex > endIndex )
{
// If start is greater than end, swap them
std::swap( startIndex, endIndex );
}

for ( int i = startIndex; i <= endIndex; ++i )
for ( int i = startIndex; i <= endIndex; i += step )
{
result.insert( i );
}
Expand Down
Loading
Loading