Skip to content

Commit 36d7a50

Browse files
committed
Fix merge conflict in docs/examples/index.md - resolve duplicate entries and add .md extensions
1 parent cc38965 commit 36d7a50

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

docs/examples/index.md

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,25 @@ Interactive Python notebooks using NeqSim through [neqsim-python](https://github
1616

1717
| Notebook | Description | View Options |
1818
|----------|-------------|--------------|
19-
<<<<<<< HEAD
20-
| **AIPlatformIntegration** | See notebook for details | [Markdown](AIPlatformIntegration) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/AIPlatformIntegration.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/AIPlatformIntegration.ipynb) |
21-
| **AdvancedRiskFramework Tutorial** | See notebook for details | [Markdown](AdvancedRiskFramework_Tutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/AdvancedRiskFramework_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/AdvancedRiskFramework_Tutorial.ipynb) |
22-
| **ESP Pump Tutorial** | See notebook for details | [Markdown](ESP_Pump_Tutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ESP_Pump_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ESP_Pump_Tutorial.ipynb) |
23-
| **FieldDevelopmentWorkflow** | See notebook for details | [Markdown](FieldDevelopmentWorkflow) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/FieldDevelopmentWorkflow.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/FieldDevelopmentWorkflow.ipynb) |
24-
| **GraphBasedProcessSimulation** | See notebook for details | [Markdown](GraphBasedProcessSimulation) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/GraphBasedProcessSimulation.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/GraphBasedProcessSimulation.ipynb) |
25-
| **LoopedPipelineNetworkExample** | See notebook for details | [Markdown](LoopedPipelineNetworkExample) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/LoopedPipelineNetworkExample.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/LoopedPipelineNetworkExample.ipynb) |
26-
| **MPC Integration Tutorial** | See notebook for details | [Markdown](MPC_Integration_Tutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/MPC_Integration_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/MPC_Integration_Tutorial.ipynb) |
27-
| **MultiScenarioVFP Tutorial** | VFP generation with varying GOR/water cut | [Markdown](MultiScenarioVFP_Tutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/MultiScenarioVFP_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/MultiScenarioVFP_Tutorial.ipynb) |
28-
| **NeqSim Python Optimization** | See notebook for details | [Markdown](NeqSim_Python_Optimization) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/NeqSim_Python_Optimization.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/NeqSim_Python_Optimization.ipynb) |
29-
| **NetworkSolverTutorial** | See notebook for details | [Markdown](NetworkSolverTutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/NetworkSolverTutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/NetworkSolverTutorial.ipynb) |
30-
| **PVT Simulation and Tuning** | See notebook for details | [Markdown](PVT_Simulation_and_Tuning) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/PVT_Simulation_and_Tuning.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/PVT_Simulation_and_Tuning.ipynb) |
31-
| **ProducedWaterEmissions Tutorial** | See notebook for details | [Markdown](ProducedWaterEmissions_Tutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ProducedWaterEmissions_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ProducedWaterEmissions_Tutorial.ipynb) |
32-
| **ProductionOptimizer Tutorial** | See notebook for details | [Markdown](ProductionOptimizer_Tutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ProductionOptimizer_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ProductionOptimizer_Tutorial.ipynb) |
33-
| **ProductionSystem Bottleneck Analysis** | Multi-well optimization and bottleneck identification | [Markdown](ProductionSystem_BottleneckAnalysis) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ProductionSystem_BottleneckAnalysis.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ProductionSystem_BottleneckAnalysis.ipynb) |
34-
| **IntegratedProductionRiskAnalysis** | Complete operational workflow with risk simulation | [Markdown](IntegratedProductionRiskAnalysis) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/IntegratedProductionRiskAnalysis.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/IntegratedProductionRiskAnalysis.ipynb) |
35-
| **ReadingFluidProperties** | See notebook for details | [Markdown](ReadingFluidProperties) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ReadingFluidProperties.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ReadingFluidProperties.ipynb) |
36-
| **TVP RVP Study** | See notebook for details | [Markdown](TVP_RVP_Study) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/TVP_RVP_Study.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/TVP_RVP_Study.ipynb) |
37-
| **TwoFluidPipe Tutorial** | See notebook for details | [Markdown](TwoFluidPipe_Tutorial) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/TwoFluidPipe_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/TwoFluidPipe_Tutorial.ipynb) |
38-
=======
3919
| **AIPlatformIntegration** | See notebook for details | [Markdown](AIPlatformIntegration.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/AIPlatformIntegration.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/AIPlatformIntegration.ipynb) |
4020
| **AdvancedRiskFramework Tutorial** | See notebook for details | [Markdown](AdvancedRiskFramework_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/AdvancedRiskFramework_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/AdvancedRiskFramework_Tutorial.ipynb) |
4121
| **ESP Pump Tutorial** | See notebook for details | [Markdown](ESP_Pump_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ESP_Pump_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ESP_Pump_Tutorial.ipynb) |
4222
| **FieldDevelopmentWorkflow** | See notebook for details | [Markdown](FieldDevelopmentWorkflow.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/FieldDevelopmentWorkflow.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/FieldDevelopmentWorkflow.ipynb) |
4323
| **GraphBasedProcessSimulation** | See notebook for details | [Markdown](GraphBasedProcessSimulation.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/GraphBasedProcessSimulation.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/GraphBasedProcessSimulation.ipynb) |
4424
| **H2S Distribution Modeling** | See notebook for details | [Markdown](H2S_Distribution_Modeling.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/H2S_Distribution_Modeling.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/H2S_Distribution_Modeling.ipynb) |
25+
| **IntegratedProductionRiskAnalysis** | Complete operational workflow with risk simulation | [Markdown](IntegratedProductionRiskAnalysis.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/IntegratedProductionRiskAnalysis.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/IntegratedProductionRiskAnalysis.ipynb) |
4526
| **LoopedPipelineNetworkExample** | See notebook for details | [Markdown](LoopedPipelineNetworkExample.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/LoopedPipelineNetworkExample.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/LoopedPipelineNetworkExample.ipynb) |
4627
| **MPC Integration Tutorial** | See notebook for details | [Markdown](MPC_Integration_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/MPC_Integration_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/MPC_Integration_Tutorial.ipynb) |
47-
| **MultiScenarioVFP Tutorial** | See notebook for details | [Markdown](MultiScenarioVFP_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/MultiScenarioVFP_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/MultiScenarioVFP_Tutorial.ipynb) |
28+
| **MultiScenarioVFP Tutorial** | VFP generation with varying GOR/water cut | [Markdown](MultiScenarioVFP_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/MultiScenarioVFP_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/MultiScenarioVFP_Tutorial.ipynb) |
4829
| **NeqSim Python Optimization** | See notebook for details | [Markdown](NeqSim_Python_Optimization.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/NeqSim_Python_Optimization.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/NeqSim_Python_Optimization.ipynb) |
4930
| **NetworkSolverTutorial** | See notebook for details | [Markdown](NetworkSolverTutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/NetworkSolverTutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/NetworkSolverTutorial.ipynb) |
5031
| **PVT Simulation and Tuning** | See notebook for details | [Markdown](PVT_Simulation_and_Tuning.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/PVT_Simulation_and_Tuning.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/PVT_Simulation_and_Tuning.ipynb) |
5132
| **ProducedWaterEmissions Tutorial** | See notebook for details | [Markdown](ProducedWaterEmissions_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ProducedWaterEmissions_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ProducedWaterEmissions_Tutorial.ipynb) |
5233
| **ProductionOptimizer Tutorial** | See notebook for details | [Markdown](ProductionOptimizer_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ProductionOptimizer_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ProductionOptimizer_Tutorial.ipynb) |
53-
| **ProductionSystem BottleneckAnalysis** | See notebook for details | [Markdown](ProductionSystem_BottleneckAnalysis.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ProductionSystem_BottleneckAnalysis.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ProductionSystem_BottleneckAnalysis.ipynb) |
34+
| **ProductionSystem BottleneckAnalysis** | Multi-well optimization and bottleneck identification | [Markdown](ProductionSystem_BottleneckAnalysis.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ProductionSystem_BottleneckAnalysis.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ProductionSystem_BottleneckAnalysis.ipynb) |
5435
| **ReadingFluidProperties** | See notebook for details | [Markdown](ReadingFluidProperties.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/ReadingFluidProperties.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/ReadingFluidProperties.ipynb) |
5536
| **TVP RVP Study** | See notebook for details | [Markdown](TVP_RVP_Study.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/TVP_RVP_Study.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/TVP_RVP_Study.ipynb) |
5637
| **TwoFluidPipe Tutorial** | See notebook for details | [Markdown](TwoFluidPipe_Tutorial.md) \| [nbviewer](https://nbviewer.org/github/equinor/neqsim/blob/master/docs/examples/TwoFluidPipe_Tutorial.ipynb) \| [Colab](https://colab.research.google.com/github/equinor/neqsim/blob/master/docs/examples/TwoFluidPipe_Tutorial.ipynb) |
57-
>>>>>>> b96bc2d0285f1eb6a5ddf00c2268212f9802f297
5838

5939
## Java Examples
6040

0 commit comments

Comments
 (0)