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

Update dev branch after release #10746

Merged
merged 149 commits into from
Oct 23, 2023
Merged

Update dev branch after release #10746

merged 149 commits into from
Oct 23, 2023

Conversation

magnesj
Copy link
Member

@magnesj magnesj commented Oct 23, 2023

No description provided.

magnesj and others added 30 commits January 11, 2023 13:01
Make sure to call apt-get update before apt-get install
* Add toolbar toggle button for showing displacements
Avoid calling submodule update on specific subfolders. 
Fixes by cmake-format
Compute time_t based on the "TIME" values in summary file
- Plot for showing well allocation over time. 
- Select time range
- Option to exclude time steps in selected range
- Possible value types: Flow rate, flow rate percentage, flow volume, accumulated flow volume, accumulated flow volume percentage
- Group small contributors into group "Others"
Support for showing frames in geomech data.
Add new toolbar with slider that controls visible timestep in the view
Enable c++20 in top level cmake. Keep c++17 for GrpcInterface, as the protoc tool does not work with c++20.
Several code adjustments to fix compiler issues.
…intervals.

Filter out invalid fracture cells (conductivity == positive infinity) when
calculating fracture to well transmissibilities.

Fixes #9652.
* Check if data is present
* Move plot update to geomech case
* Return empty vector if no data is present
* Add support for creating depth adjustment LAS files
* Add RiaDefine for LAS file depth property names
* Remove incorrect check in K-index Calculator

Co-authored-by: jorgenherje <[email protected]>
Co-authored-by: Magne Sjaastad <[email protected]>
* Remove reference well feature from plot objects
* Move Reference Well functionality to WellLogExtractionCurve
* Reset reference well selection if new selected well path equals ref
* Trim spaces and avoid spaces in generated address text
* Fix unit test
* Use horizontalAdvance
* Remove unused code
* Hide some warnings from Qt code
* Remove message for _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
* Use CMP0077 NEW
* Move roff libraries to folder Thirdparty
* avoid operator()==
* Remove cmake_minimum_required and set version to 3.15
Support option for loading only the last frame for each geomech timestep. Turn it default on for old projects.
Headless plot export requires qoffscreen.dll, make sure this file is included in installer.
jonjenssen and others added 26 commits March 16, 2023 07:16
* Show segment plots in Well Log Plot collection
* Improve menu text for operations related to segment plots
* Show reservoir rates for annulus and device
* Make sure curve objects are visible in the Project Tree
* When importing the first summary case, expand case in project tree
* Bump version
Use spaceship operator to fix issue for multiple pressure/depth curves

It was not possible to show two pressure/drop curves at the same time. This was caused by inconsistent implementation of operator< and operator==. Implement operator <=> to simplify the code.
* Add CON*RAT track for tubing branch
* Set long summary vector name as default, and allow both in curve name
* Use line shift if multiple quantities are present on axis title
Insert line shift if multiple quantities are present, otherwise insert space between individual vector names and the unit text.
* Move Groups between Field and Wells
* Bump version
When multiple ensemble curve sets are toggled on/off, it is required to do a full RimSummaryPlot::loadDataAndUpdate() that will call RimEnsembleCurveSet::updateCurves() on all ensembles in the plot. This can be a heavy operation, but will happen only once.
* #9963 Rft reader: Search for DATA file when required
WSEGLINK is used to establish the branch topology for MSW wells. Search and read WSEGLINK data when segment data is requested by the user. This can be a time consuming operation.
Avoid doing this search for standard RFT plots.

* Make sure that single summary curves are displayed correctly
* Make sure single summary curves are visible in the plot
* #9966 Summary calculations: add support for imported vectors.
* #9966 Summary Calculation: add support for imported and observed data.
* Summary Address: avoid extra level in tree for imported data.
* #9966 Update observed data when calculation is updated.
Crash is seen on application exit
Increase the distribution version number to be able to upload new package
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
@magnesj magnesj marked this pull request as ready for review October 23, 2023 07:11
@magnesj magnesj merged commit b5b9ac0 into dev Oct 23, 2023
15 checks passed
@magnesj magnesj deleted the test-branch-update-dev branch October 23, 2023 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants