-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2520 from OPM/2018.01.01-patch
2018.01.01 patch
- Loading branch information
Showing
162 changed files
with
4,392 additions
and
583 deletions.
There are no files selected for viewing
1,678 changes: 1,678 additions & 0 deletions
1,678
ApplicationCode/Adm/projectfilekeywords/2018.01/ri-fieldKeywords.txt
Large diffs are not rendered by default.
Oops, something went wrong.
188 changes: 188 additions & 0 deletions
188
ApplicationCode/Adm/projectfilekeywords/2018.01/ri-objectKeywords.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| // ResInsight version string : 2018.01.00-dev.01 | ||
| // Report generated : Fri 5. Jan 15:39:23 2018 | ||
| // | ||
| // | ||
|
|
||
| AsciiDataCurve | ||
| CalcScript | ||
| CalculatedSummaryCase | ||
| CellEdgeResultSlot | ||
| CellFilter | ||
| CellPropertyFilter | ||
| CellPropertyFilters | ||
| CellRangeFilter | ||
| CellRangeFilterCollection | ||
| ChangeDataSourceFeatureUi | ||
| CmdAddItemExecData | ||
| CmdDeleteItemExecData | ||
| CmdFieldChangeExecData | ||
| CrossSection | ||
| CrossSectionCollection | ||
| EclipseCase | ||
| EclipseGeometrySelectionItem | ||
| Fault | ||
| Faults | ||
| FileSummaryCase | ||
| FishbonesCollection | ||
| FishbonesMultipleSubs | ||
| FishbonesPipeProperties | ||
| FlowCharacteristicsPlot | ||
| FlowDiagSolution | ||
| FlowPlotCollection | ||
| FormationNames | ||
| FormationNamesCollectionObject | ||
| FractureContainment | ||
| FractureDefinitionCollection | ||
| GeoMechGeometrySelectionItem | ||
| GeoMechPropertyFilter | ||
| GeoMechPropertyFilters | ||
| GeoMechResultDefinition | ||
| GeoMechResultSlot | ||
| GeoMechView | ||
| GridCollection | ||
| GridSummaryCase | ||
| GridTimeHistoryCurve | ||
| IntersectionBox | ||
| Legend | ||
| MainPlotCollection | ||
| MdiWindowController | ||
| MockModelSettings | ||
| MultiSnapshotDefinition | ||
| NoCommonAreaNNC | ||
| ObservedDataCollection | ||
| PdmDocument | ||
| PdmObjectCollection | ||
| PdmObjectGroup | ||
| Perforation | ||
| PerforationCollection | ||
| PropertyFilter | ||
| ResInsightAnalysisModels | ||
| ResInsightGeoMechCase | ||
| ResInsightGeoMechModels | ||
| ResInsightOilField | ||
| ResInsightProject | ||
| ReservoirCellResultStorage | ||
| ReservoirView | ||
| ResultDefinition | ||
| ResultSlot | ||
| ResultStorageEntryInfo | ||
| RftAddress | ||
| RiaPreferences | ||
| RiaRegressionTest | ||
| RicCaseAndFileExportSettingsUi | ||
| RicCellRangeUi | ||
| RicDeleteItemExecData | ||
| RicExportCarfinUi | ||
| RicExportCompletionDataSettingsUi | ||
| RicExportToLasFileObj | ||
| RicExportToLasFileResampleUi | ||
| RicLinkVisibleViewsFeatureUi | ||
| RicPasteAsciiDataToSummaryPlotFeatureUi | ||
| RicSaveEclipseInputVisibleCellsUi | ||
| RicSelectSummaryPlotUI | ||
| RicSelectViewUI | ||
| RicSummaryAddressSelection | ||
| RicSummaryCurveCalculator | ||
| RicSummaryCurveCreator | ||
| RicWellPathsUnitSystemSettingsUi | ||
| RifReaderSettings | ||
| RimBinaryExportSettings | ||
| RimCaseCollection | ||
| RimCommandExecuteScript | ||
| RimCommandIssueFieldChanged | ||
| RimCommandObject | ||
| RimCsvUserData | ||
| RimDialogData | ||
| RimEllipseFractureTemplate | ||
| RimExportInputSettings | ||
| RimFaultResultSlot | ||
| RimFractureExportSettings | ||
| RimIdenticalGridCaseGroup | ||
| RimInputProperty | ||
| RimInputPropertyCollection | ||
| RimInputReservoir | ||
| RimNoCommonAreaNncCollection | ||
| RimObservedEclipseUserData | ||
| RimOilFieldEntry | ||
| RimOilRegionEntry | ||
| RimStatisticalCalculation | ||
| RimStatisticalCollection | ||
| RimStimPlanColors | ||
| RimStimPlanFractureTemplate | ||
| RimStimPlanLegendConfig | ||
| RimSummaryCalculation | ||
| RimSummaryCalculationCollection | ||
| RimSummaryCalculationVariable | ||
| RimSummaryCurveCollection | ||
| RimSummaryCurveCollectionModifier | ||
| RimTernaryLegendConfig | ||
| RimTimeStepFilter | ||
| RimViewLinkerCollection | ||
| RimWellLogExtractionCurve | ||
| RimWellPathEntry | ||
| RimWellPathImport | ||
| ScriptLocation | ||
| SimWellFracture | ||
| SimWellFractureCollection | ||
| SummaryAddress | ||
| SummaryCaseCollection | ||
| SummaryCaseSubCollection | ||
| SummaryCrossPlot | ||
| SummaryCrossPlotCollection | ||
| SummaryCurve | ||
| SummaryCurveAutoName | ||
| SummaryCurveFilter | ||
| SummaryFilterSettings | ||
| SummaryObservedDataFile | ||
| SummaryPageDownloadEntity | ||
| SummaryPlot | ||
| SummaryPlotCollection | ||
| SummaryTimeAxisProperties | ||
| SummaryYAxisProperties | ||
| TC2 | ||
| TestCommand1 | ||
| TofAccumulatedPhaseFractionsPlot | ||
| TotalWellAllocationPlot | ||
| View3dOverlayInfoConfig | ||
| ViewController | ||
| ViewLinker | ||
| Well | ||
| WellAllocationPlot | ||
| WellAllocationPlotLegend | ||
| WellFlowRateCurve | ||
| WellLogFile | ||
| WellLogFileChannel | ||
| WellLogFileCurve | ||
| WellLogPlot | ||
| WellLogPlotCollection | ||
| WellLogPlotTrack | ||
| WellLogRftCurve | ||
| WellPath | ||
| WellPathCompletion | ||
| WellPathCompletionCollection | ||
| WellPathCompletions | ||
| WellPathFracture | ||
| WellPathFractureCollection | ||
| WellPaths | ||
| WellPltPlot | ||
| WellPltPlotCollection | ||
| WellRftPlot | ||
| WellRftPlotCollection | ||
| Wells | ||
| closeProject | ||
| computeCaseGroupStatistics | ||
| exportMsw | ||
| exportMultiCaseSnapshots | ||
| exportProperty | ||
| exportSimWellCompletions | ||
| exportSnapshots | ||
| exportWellPathCompletions | ||
| loadCase | ||
| openProject | ||
| replaceCase | ||
| replaceSourceCases | ||
| runOctaveScript | ||
| setExportFolder | ||
| setMainWindowSize | ||
| setStartDir | ||
| setTimeStep |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
ApplicationCode/Application/Tools/RiaStringEncodingTools.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Copyright (C) 2011- Statoil ASA | ||
| // Copyright (C) 2013- Ceetron Solutions AS | ||
| // Copyright (C) 2011-2012 Ceetron AS | ||
| // | ||
| // ResInsight is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> | ||
| // for more details. | ||
| // | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #include "RiaStringEncodingTools.h" | ||
|
|
||
|
|
||
| const std::string RiaStringEncodingTools::toNativeEncoded(const QString& qstring) | ||
| { | ||
| #ifdef WIN32 | ||
| return std::string(qstring.toLatin1().data()); | ||
| #else | ||
| return std::string(qstring.toUtf8().data()); | ||
| #endif | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| const QString RiaStringEncodingTools::fromNativeEncoded(const char* native) | ||
| { | ||
| #ifdef WIN32 | ||
| return QString::fromLatin1(native); | ||
| #else | ||
| return QString::fromUtf8(native); | ||
| #endif | ||
| } |
38 changes: 38 additions & 0 deletions
38
ApplicationCode/Application/Tools/RiaStringEncodingTools.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Copyright (C) 2011- Statoil ASA | ||
| // Copyright (C) 2013- Ceetron Solutions AS | ||
| // Copyright (C) 2011-2012 Ceetron AS | ||
| // | ||
| // ResInsight is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> | ||
| // for more details. | ||
| // | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <QString> | ||
| #include <QByteArray> | ||
| #include <string> | ||
|
|
||
| //================================================================================================== | ||
| // | ||
| // | ||
| // | ||
| //================================================================================================== | ||
| class RiaStringEncodingTools | ||
| { | ||
| public: | ||
| static const std::string toNativeEncoded(const QString& qstring); | ||
|
|
||
| static const QString fromNativeEncoded(const char* native); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.