diff --git a/_data/docs.yml b/_data/docs.yml
index c27abbf60f..0edbf365d4 100644
--- a/_data/docs.yml
+++ b/_data/docs.yml
@@ -7,14 +7,19 @@
- title: Application
docs:
- reservoirviews
+ - gridimportexport
+ - simulationwells
+ - faults
+ - filters
+ - wellpaths
+ - derivedresults
- casegroupsandstatistics
- octaveinterface
- - wellpaths
- - faults
- batchcommands
- title: Appendix
docs:
+ - modelnavigation
- buildinstructions
- octaveinterfacereference
- regressiontestsystem
diff --git a/_posts/2014-09-24-resinsight-1-3-0-released.md b/_posts/2014-09-24-resinsight-1-3-0-released.md
new file mode 100644
index 0000000000..e11ee93bee
--- /dev/null
+++ b/_posts/2014-09-24-resinsight-1-3-0-released.md
@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: "ResInsight 1.3.0 Released"
+date: "2014-09-24 02:12:52 +0200"
+author: magnesj
+version: 1.3.0
+categories:
+ - release
+---
+
+## Main features
+
+- Added several [derived results]({{ site.baseurl }}/docs/derivedresults)
+- Added support for mapping a separate result on faults
+- Improved text in Result Info when picking in 3D scene
+
+## Download
+[Release Binaries on GitHub](https://github.com/OPM/ResInsight/releases/tag/v1.3.0)
+
diff --git a/docs/BatchCommands.md b/docs/BatchCommands.md
index 86753fec15..661cc76ba7 100644
--- a/docs/BatchCommands.md
+++ b/docs/BatchCommands.md
@@ -1,7 +1,7 @@
---
layout: docs
-prev_section: faults
-next_section: regressiontestsystem
+prev_section: octaveinterface
+next_section: modelnavigation
title: Batch Commands
permalink: /docs/batchcommands/
published: true
diff --git a/docs/BuildInstructions.md b/docs/BuildInstructions.md
index 7a47470b89..48ff0cfb5e 100644
--- a/docs/BuildInstructions.md
+++ b/docs/BuildInstructions.md
@@ -1,8 +1,8 @@
---
layout: docs
-prev_section: batchcommands
+prev_section: modelnavigation
next_section: octaveinterfacereference
-title: Build instructions
+title: Build Instructions
permalink: /docs/buildinstructions/
published: true
---
@@ -16,12 +16,12 @@ If you check the button 'Grouped' in the GUI, the CMake variables are grouped by
| CMake Name | Description |
|--------------|---------|
-| `RESINSIGHT_USE_OPENMP` | Enable OpenMP multi-core parallel building |
-| `RESINSIGHT_PRIVATE_INSTALL` | Install as an independent bundle including the necessary Qt libraries |
| `RESINSIGHT_BUILD_DOCUMENTATION` | Use Doxygen to create the HTML based API documentation |
+| `RESINSIGHT_OCTAVE_PLUGIN_32_BIT` | Windows 64-bit: Flag used to control if Octave plugins will be compiled using 32-bit build environment |
| `RESINSIGHT_OCTAVE_PLUGIN_MKOCTFILE` | Location of Octave tool mkoctfile used to compile Octave plugins |
| `RESINSIGHT_OCTAVE_PLUGIN_QMAKE` | Location of qmake to find Qt include files and libraries used to compile Octave plugins |
-| `RESINSIGHT_OCTAVE_PLUGIN_32_BIT` | Windows 64-bit: Flag used to control if Octave plugins will be compiled using 32-bit build environment |
+| `RESINSIGHT_PRIVATE_INSTALL` | Install as an independent bundle including the necessary Qt libraries |
+| `RESINSIGHT_USE_OPENMP` | Enable OpenMP multi-core parallel building |
### Build without Octave plugins
It is possible to compile ResInsight without compiling the Octave plugins. This can be done by specifying blank for the Octave CMake variables. The Octave plugin module will not be build, and CMake will show warnings like 'Failed to find mkoctfile'. This will not break the build or compilation of ResInsight.
@@ -39,13 +39,6 @@ It is possible to compile ResInsight without compiling the Octave plugins. This
To be able to compile the Octave plugins, the path to the Octave development tool `mkoctfile` must be provided. In addition, if you compile x64, you must specify the location of 32-bit version of Qt, as the Octave plugins on Windows are currently only supported for x86.
See description for `RESINSIGHT_OCTAVE_PLUGIN_QMAKE` and `RESINSIGHT_OCTAVE_PLUGIN_32_BIT` above.
-#### Octave installation
-Currently tested and verified version on Windows is Octave 3.6.1. NB! Version 3.6.2 has compile issues using VS2010, this version will not be able to compile the Octave plugins.
-
-- Download and install Octave 3.6.1 for VS2010 from [SourceForge](http://sourceforge.net/projects/octave/files/Octave%20Windows%20binaries/Octave%203.6.1%20for%20Windows%20Microsoft%20Visual%20Studio/octave-3.6.1-vs2010-setup-1.exe/download)
-- Download a [missing library file](http://dl.dropbox.com/u/45539519/dirent-vs2010.lib), rename to **dirent.lib** and copy it into Octave lib folder, typically **c:/Octave-3.6.1/lib/dirent.lib** See details on [SourceForge](http://sourceforge.net/mailarchive/message.php?msg_id=28933804)
-
-
## Linux
An out-of-tree build is typically done with
diff --git a/docs/CaseGroupsAndStatistics.md b/docs/CaseGroupsAndStatistics.md
index 54db19edcf..4a9163140a 100644
--- a/docs/CaseGroupsAndStatistics.md
+++ b/docs/CaseGroupsAndStatistics.md
@@ -1,6 +1,6 @@
---
layout: docs
-prev_section: reservoirviews
+prev_section: derivedresults
next_section: octaveinterface
title: Grid Case Groups and Statistics
permalink: /docs/casegroupsandstatistics/
@@ -49,7 +49,7 @@ To reduce memory usage, project loading time etc. remember to delete the 3D View
After creating a grid case group, an empty **Statistics Case** is created for you in the **Derived Statistics** folder of the **Grid Case Group**.
### Setting up and Calculate
-The properties of an uncalculated and a calculated **Statistics Case** is shown below:
+The properties of non-calculated and calculated **Statistics Case** is shown below:
 
diff --git a/docs/DerivedResults.md b/docs/DerivedResults.md
index 85c18275f1..6ff9d08c99 100644
--- a/docs/DerivedResults.md
+++ b/docs/DerivedResults.md
@@ -1,12 +1,28 @@
-##Derived Results
+---
+layout: docs
+prev_section: wellpaths
+next_section: casegroupsandstatistics
+title: Derived Results
+permalink: /docs/derivedresults/
+published: true
+---
+
+
+ResInsight is able to compute derived results listed at the bottom **Static** properties.
+
+
+
###Transmissibility normalized by area
-The transmissibility for cells and Non-Neighbor Connections (NNCs) are dependent on both cell properties and geometry. ResInsight normalizes TRANX, TRANY and TRANZ with the overlapping flow area for both neighbor cells and NNC-cells. The results are named riTRANXbyArea, riTRANYbyArea and riTRANZbyArea respectively and are listed under **Static** properties.
+The transmissibility for cells and Non-Neighbor Connections (NNCs) are dependent on both cell properties and geometry. ResInsight normalizes TRANX, TRANY and TRANZ with the overlapping flow area for both neighbor cells and NNC-cells. The results are named riTRANXbyArea, riTRANYbyArea and riTRANZbyArea respectively.
The normalized transmissibilities make it easier to compare and check the flow capacity visually. This can be useful when history matching pressure differences across a fault.
###Identification of questionable NNCs
-In the process of normalizing transmissibility by the overlapping flow area, the NNCs in the model without any shared surface between two cells are identified. These NNCs are listed in the **Faults/NNCs With No Common Area** folder. These NNCs are questionable since flow normally is associated with a flow area.
+In the process of normalizing transmissibility by the overlapping flow area, the NNCs in the model without any shared surface between two cells are identified. These NNCs are listed in the **Faults/NNCs With No Common Area** folder. These NNCs are questionable since flow normally is associated with a flow area.
+
+
+
###Overall transmissibility multiplyer
Transmissibility can be set or adjusted with multiple keywords in an Eclipse data deck. To visualize the adjustments made, ResInsight calculates a multiplicator for the overall change. First unadjusted transmissibilities for all neighbor cells and NNCs are evaluated based on geometry and permeabilities, similar to the NEWTRAN algorithm in Eclipse. For x- and y-directions, the NTG parameter is also included. The results are named riTRANX, riTRANY and riTRANZ respectively.
@@ -17,8 +33,9 @@ The TRANX, TRANY and TRANZ used in the simulation are divided by the ResInsight
Some static properties with directional dependency can be visualized in x-, y- and z-direction combined in **Cell Result** and **Separate Fault Result**. The face of a cell is then colored based on the value associated with that particular face. The Positive I-face of the cell gets the cell X-value, while the J-face gets the Y-value etc. The negative faces, however, get the value from the neighbor cell on that side. The negative I-face gets the X-value of the IJK-neighbor in negative I direction, and so on for the J- and K-faces.
The directional combined parameters available are:
+
- **TRANXYZ** (inluding NNCs)
- **MULTXYZ**
- **riTRANXYZ** (inluding NNCs)
- **riMULTXYZ** (inluding NNCs)
-- **riTRANXYZbyArea** (inluding NNCs)
+- **riTRANXYZbyArea** (inluding NNCs)
\ No newline at end of file
diff --git a/docs/Faults.md b/docs/Faults.md
index 4cfd43e187..c6e6967b52 100644
--- a/docs/Faults.md
+++ b/docs/Faults.md
@@ -1,25 +1,28 @@
---
layout: docs
-prev_section: wellpaths
-next_section: batchcommands
+prev_section: simulationwells
+next_section: filters
title: Faults
permalink: /docs/faults/
published: true
---
-ResInsight will detect all the cell faces with no geometrically matching neighbours, and display them as *Faults*.
-This means that the are drawn in special ways, and that their visual appearance can be controlled separately from the rest of the grid.
+Faults are organized in a folder named **Faults**. Overall settings can be controlled from the **Faults** item in the **Project Tree**.
## Fault Names and NNC
### Import of Fault info from `*.DATA`-files
-If enabled, ResInsight will also import fault information from the `*.DATA` files and use this information to group the detected faces into named items which is available in the  **Faults** item in the **Project Tree**. The imported faults are ordered in ascending order based on their name.
+If enabled in **Preferences**, ResInsight will import fault information from the `*.DATA` files and use this information to group the detected faces into named items. The imported faults are ordered in ascending order based on their name.
->
+
+
Technical Functionality
+The DATA file is parsed for the FAULT keyword. Also INCLUDE keywords are read, and included files are parsed for the FAULTS keyword.
+Currently the PATH keyword is NOT supported.
+
-
+
Reduce case loading time
-As import of faults can be time consuming, reading of faults can be disabled from Preferences -> Read fault data
+As import of faults can be time consuming, reading of faults can be disabled from Preferences ->Import faults
### Undefined grid faults
@@ -28,13 +31,14 @@ All the detected cell faces are compared to the faults imported from the `*.DATA
### Fault color
Each named Fault is given a color on import. This color can be controlled by selecting the fault and edit its **Fault color** in the **Property Editor.**
+### Fault visibility
+Faults can be disabled from the context menu in the 3D view. Also unchecking the checkbox in front of the fault will hide the fault. Visibility for multiple faults can be controlled from the context menu of the **Faults** tree item.
+
### NNC visualization
-ResInsight will read Non Neighbor Connections from the Eclipse output file (`*.INIT`), and create explicit visualizations of those witch have a common surface area. These NNC's are then sorted onto the Fault's and their visibility is controlled from the **Property Editor** of the **Faults** Item in the **Project Tree**.
+If enabled in **Preferences**, ResInsight will read Non Neighbor Connections from the Eclipse output file (`*.INIT`), and create explicit visualizations of those witch have a common surface area. These NNC's are then sorted onto the Fault's and their visibility is controlled from the **Property Editor** of the **Faults** Item in the **Project Tree**.
The color of the NNC faces are set to be a bit lighter than their corresponding named fault, and can not be controlled directly.
-Currently the only result property that is mapped onto the NNC is the static TRANSXYZ property which displays the transmissibility associated to each face.
-
### Picking info
When clicking on a cell face that is member of a fault, the fault name is displayed in the **Result Info** window, along with cell, and result property info.
@@ -66,7 +70,6 @@ By clicking the  **Fau
#### Fault options
- **Show faults outside filters**: Turning this option on, will display faults outside the filter region, making the fault visualization completely ignore the Range and Property filters in action.
- **Show results on faults**: This toggle controls whether to show the selected result property on the faults or not. This should normally be left on.
-- **Show NNCs**: Toggles whether to display the Non Neighbor Connections, or not.
#### Fault Face Visibility
This group of options controls the visibility of the fault faces. Since they work together, and in some cases are overridden by the system, they can be a bit confusing.
@@ -80,6 +83,11 @@ Secondly: The option you would normally want to adjust is **Dynamic Face Selecti
*These two options should normally be left **On***.
They are useful when investigating the exact faults information provided on the `*.DATA` file.
If you need to use them, it is normally wise to set the **Dynamic Face Selection** to "Show Both"
+#### NNC Visibility
+
+- **Show NNCs**: Toggles whether to display the Non Neighbor Connections, or not.
+- **Hide NNC geometry if no NNC result is available**: Automatically hides NNC geometry if no NNC results are available
+
##### Dynamic Face Selection
At one particular position on a fault there are usually two cells competing for your attention: The cell closer to you as the viewer, or the one further from you. When showing results, this becomes important because these two cell faces have different result property values, and thus color.
diff --git a/docs/Filters.md b/docs/Filters.md
new file mode 100644
index 0000000000..c467ae006a
--- /dev/null
+++ b/docs/Filters.md
@@ -0,0 +1,45 @@
+---
+layout: docs
+prev_section: faults
+next_section: wellpaths
+title: Cell Filters
+permalink: /docs/filters/
+published: true
+---
+
+Cell Filters are used to control visibility of the cells in the 3D view. Three types of filters exists:
+
+- **Range filter** : Define a IJK subset of the model.
+- **Property filter** : Define a value range for a property to control cell visibility.
+- **Well cell filter** : Display grid cells that has connections to a well. Controlled from the **Simulation Wells** item.
+
+All filters can be turned on or off using the toggle in the **Project Tree** and controlled from their corresponding **Property Editor**.
+
+## Range filters
+
+Using range filters enables the user to define a set of IJK visible regions in the 3D view.
+A new range filter can be added by activating the context menu for the **Range Filters** collection in the **Project Tree**.
+
+*TIP:* An I,J or K-slice range filter can be added directly from a Cell in the **3D View** by rightclicking the cell and using the context menu.
+
+Below is a snapshot of the **Property Editor** of the **Range Filter** :
+
+
+
+ - **Filter Type** : The filter can either make the specified range visible ( *Include* ), or remove the range from the View ( *Exclude* ).
+ - **Grid** : This option selects which of the grids the range is addressing.
+ - **Apply to Subgrids** : This option tells ResInsight to use the visibility of the cells in the current grid to control the visibility of the cells in sub-LGR's. If this option is turned off, Sub LGR-cells is not included in this particular Range Filter.
+
+The **Start** and **Width** labels in front of the sliders features a number in parenthesis denoting maximum available value.
+The **Start** labels shows the index of the start of the active cells.
+The **Width** labels shows the number of active cells from the start of the active cells.
+
+## Property filters
+
+**Property filters** apply to the results of the **Range filters**. Below is a snapshot of the **Property Editor** of the **Property Filter**.
+
+
+
+This filter filters the cells based on a property value range (Min - Max). Cells in the range are either shown or hidden depending on the **Filter Type** ( *Include* / *Exclude* ). Exclude-filters removes the selected cells from the **View** even if some other filter includes them.
+
+A new property filter can be made by activating the context menu for **Property Filters**. The new property filter is based on the currently viewed cell result by default.
diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
index 56f55abb31..c4c48d3f46 100644
--- a/docs/GettingStarted.md
+++ b/docs/GettingStarted.md
@@ -35,7 +35,7 @@ A selected subset of actions are presented as controls in the toolbar. The diffe
#### 3D Views
-In the main area of the application, several 3D views can be open at the same time. One of them will be active and the active view can be either maximized to use the whole main area, or normalized so that you can see all the open 3D views.
+In the main area of the application, several 3D views can be open at the same time. One of them will be active and the active view can be either maximized to use the whole main area, or normalized so that you can see all the open 3D views.
Docking window management
@@ -51,13 +51,16 @@ Toggling a checkbox next to an item in the **Project Tree** will toggle visibili
Context menu commands are also available to do special operations on a selected set of items.
+How to interact and manipulate the 3D model is described in [Model Navigation]({{ site.baseurl }}/docs/modelnavigation)
+
+
### Cases and their types
A *Case* in ResInsight means a Grid model with a particular set of results or property data. There are
three different Case types:
##### Result case 
-This is a Case based on the results of an Eclipse analysis, read from a grid file together with restart data.
+This is a Case based on the results of an Eclipse simulation, read from a grid file together with static and restart data. Multiple Cases can be selected and read from a folder.
##### Input case 
This Case type is based on a `*.GRDECL` file, or a part of an Eclipse *Input* file. This Case type supports loading single ASCII files defining Eclipse Cell Properties, and also to export modified property sets to ASCII files.
@@ -74,68 +77,6 @@ The purpose of a Grid Case group is to make it easy to calculate statistics acro
See [ Multiple realizations and statistics ]({{ site.baseurl }}/docs/casegroupsandstatistics) for more on this.
-### Importing data
-
-#### Input data support ###
-
-ResInsight supports the following type of Eclipse input data:
-- `*.GRID` and `*.EGRID` files along with their `*.INIT` and restart files `*.XNNN` and `*.UNRST`.
-- Grid and Property data from `*.GRDECL` files.
-
-#### Importing Eclipse cases
-
-##### Eclipse Results
-1. Select **File->Import->Import Eclipse Case** and select an `*.EGRID` or `*.GRID` Eclipse file for import.
-2. The case is imported, and a view of the case is created
-
-*TIP:* You can select several grid files in one go by multiple selection of files( Ctrl + left mouse button, Shift + left mouse button).
-
-##### Eclipse ASCII input data
-1. Select **File->Import->Import Input Eclipse Case** and select a `*.GRDECL` file.
-2. The case is imported, and a view of the case is created
-3. Right click the **Input Properties** in the generated **Input Case** and use the context menu to import additional Eclipse Property data files.
-
-##### Handling missing or wrong MAPAXES
-
-The X and Y grid data can be negated in order to make the Grid model appear correctly in ResInsight. This functionality is accessible in the **Property Editor** for all Case types as the toggle buttons **Flip X Axis** and **Flip Y Axis** as shown in the example below.
-
-
-
-
-### Model navigation
-
-ResInsight comes with two 3D navigation modes. The active mode can be selected in the **Preferences** dialog (**Edit -> Preferences**).
-
-|Abbreviation | Meaning |
-|-------------|---------|
-|LMB | Pressing left mouse button |
-|MMB | Pressing Middle mouse button or scroll wheel button |
-|RMB | Pressing Right mouse button |
-
-
-#### Ceetron navigation mode
-
-|Mouse interaction | Action |
-|------------------|---------|
-|LMB | Pan model |
-|MMB | Zoom to mouse pointer location |
-|Scroll wheel | Zoom to mouse pointer location |
-|RMB | Rotate model |
-| | |
-|RMB single click | Context menu |
-|LMB single click | Update status bar and **Result Info** |
-
-#### CAD navigation mode
-
-|Mouse interaction | Action |
-|------------------|--------|
-|MMB | Rotate model |
-|MMB + Shift | Pan model |
-|Scroll wheel | Zoom to mouse pointer location |
-| | |
-|RMB single click | Context menu |
-|LMB single click | Update status bar and **Result Info** |
-
### Project files and Cache directory
@@ -156,14 +97,4 @@ Image export of current 3D view can be launched from **File -> Export -> Snapsho
##### All Views 
If a project contains multiple views, all views can be exported using **File -> Export -> Snapshot All Views To File**.
-It is also possible to snapshot all views from the command line. See [ Command Line Arguments] (CommandLineParameters.md)
-
-#### Export of Eclipse Properties as ASCII data
-Eclipse Properties can be exported to Eclipse ASCII files by activating the context menu for a **Cell Result**. 
-
-The command will export the property set currently loaded and shown in the 3D View to a file with the following format:
-
- -- Exported from ResInsight
-
-
- /
\ No newline at end of file
+It is also possible to snapshot all views from the command line. See [ Command Line Arguments ]({{ site.baseurl }}/docs/commandlineparameters)
diff --git a/docs/GridImportExport.md b/docs/GridImportExport.md
new file mode 100644
index 0000000000..675cc9e48a
--- /dev/null
+++ b/docs/GridImportExport.md
@@ -0,0 +1,43 @@
+---
+layout: docs
+prev_section: reservoirviews
+next_section: simulationwells
+title: Grid Import
+permalink: /docs/gridimportexport/
+published: true
+---
+
+
+ResInsight supports the following type of Eclipse input data:
+- `*.GRID` and `*.EGRID` files along with their `*.INIT` and restart files `*.XNNN` and `*.UNRST`.
+- Grid and Property data from `*.GRDECL` files.
+
+### Importing Eclipse cases
+
+#### Eclipse Results
+1. Select **File->Import->Import Eclipse Case** and select an `*.EGRID` or `*.GRID` Eclipse file for import.
+2. The case is imported, and a view of the case is created
+
+*TIP:* You can select several grid files in one go by multiple selection of files( Ctrl + left mouse button, Shift + left mouse button).
+
+#### Eclipse ASCII input data
+1. Select **File->Import->Import Input Eclipse Case** and select a `*.GRDECL` file.
+2. The case is imported, and a view of the case is created
+3. Right click the **Input Properties** in the generated **Input Case** and use the context menu to import additional Eclipse Property data files.
+
+#### Handling missing or wrong MAPAXES
+
+The X and Y grid data can be negated in order to make the Grid model appear correctly in ResInsight. This functionality is accessible in the **Property Editor** for all Case types as the toggle buttons **Flip X Axis** and **Flip Y Axis** as shown in the example below.
+
+
+
+
+## Export of Eclipse Properties as ASCII data
+Eclipse Properties can be exported to Eclipse ASCII files by activating the context menu for a **Cell Result**. 
+
+The command will export the property set currently loaded and shown in the 3D View to a file with the following format:
+
+ -- Exported from ResInsight
+
+
+ /
\ No newline at end of file
diff --git a/docs/Home.md b/docs/Home.md
index 31394b4a17..b1f41acbc0 100644
--- a/docs/Home.md
+++ b/docs/Home.md
@@ -1,6 +1,6 @@
---
layout: docs
-title: ResInsight 1.2 Users Guide
+title: ResInsight 1.3 Users Guide
next_section: gettingstarted
permalink: /docs/home/
published: true
diff --git a/docs/Installation.md b/docs/Installation.md
index ac71db5dd1..f4deb43e89 100644
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -2,7 +2,7 @@
layout: docs
prev_section: gettingstarted
next_section: reservoirviews
-title: Installation and configuration
+title: Installation and Configuration
permalink: /docs/installation/
published: true
---
@@ -11,13 +11,17 @@ published: true
1. Download ZIP binary distribution from [https://github.com/OPM/ResInsight/releases](https://github.com/OPM/ResInsight/releases "release section on GitHub")
2. Extract content from ZIP file
-3. (OPTIONAL) Launch ResInsight.exe, open **Edit ->Preferences** and define location of Octave, usually 'ResInsightRoot/octave/bin/octave.exe'
+3. (OPTIONAL) Launch ResInsight.exe, open **Edit->Preferences** and define location of Octave, usually 'ResInsightRoot/octave/bin/octave.exe'
#### Optional - Octave installation
-Currently tested and verified version on Windows is Octave 3.6.1. NB! Version 3.6.2 has compile issues using VS2010, this version will not be able to compile the Octave plugins.
-
-- Download and install Octave 3.6.1 for VS2010 from [SourceForge](http://sourceforge.net/projects/octave/files/Octave%20Windows%20binaries/Octave%203.6.1%20for%20Windows%20Microsoft%20Visual%20Studio/octave-3.6.1-vs2010-setup-1.exe/download)
-- Download a [missing library file](https://github.com/OPM/ResInsight/releases/download/1.0.0/dirent.lib) and copy it into Octave lib folder, typically **c:/Octave-3.6.1/lib/dirent.lib** See details on [SourceForge](http://sourceforge.net/mailarchive/message.php?msg_id=28933804)
+Currently tested and verified version on Windows is Octave 3.6.1.
+
+- Download and install Octave 3.6.1 for VS2010 from [release section on GitHub](https://github.com/OPM/ResInsight/releases/download/1.0.0/octave-3.6.1-vs2010-setup-1.2.exe)
+- Download an [additional library file](https://github.com/OPM/ResInsight/releases/download/1.0.0/dirent.lib) and copy it into Octave lib folder, typically **c:/Octave-3.6.1/lib/dirent.lib**
+
+
+We are aware that this procedure is a bit cumbersome, and we are currently investigating improvements on how to install Octave on Windows.
+
## Linux
diff --git a/docs/ModelNavigation.md b/docs/ModelNavigation.md
new file mode 100644
index 0000000000..8ae2f806cf
--- /dev/null
+++ b/docs/ModelNavigation.md
@@ -0,0 +1,44 @@
+---
+layout: docs
+prev_section: batchcommands
+next_section: buildinstructions
+title: Model Navigation
+permalink: /docs/modelnavigation/
+published: true
+---
+
+
+
+ResInsight comes with two navigation modes. The active mode can be selected in the **Preferences** dialog (**Edit -> Preferences**).
+
+|Abbreviation | Meaning |
+|-------------|---------|
+|LMB | Pressing left mouse button |
+|MMB | Pressing Middle mouse button or scroll wheel button |
+|RMB | Pressing Right mouse button |
+
+
+#### Ceetron navigation mode
+
+|Mouse interaction | Action |
+|------------------|---------|
+|LMB | Pan model |
+|MMB | Zoom to mouse pointer location |
+|Scroll wheel | Zoom to mouse pointer location |
+|RMB | Rotate model |
+| | |
+|RMB single click | Context menu |
+|LMB single click | Update status bar and **Result Info** |
+
+#### CAD navigation mode
+
+|Mouse interaction | Action |
+|------------------|--------|
+|MMB | Rotate model |
+|MMB + Shift | Pan model |
+|Scroll wheel | Zoom to mouse pointer location |
+| | |
+|RMB single click | Context menu |
+|LMB single click | Update status bar and **Result Info** |
+
+
diff --git a/docs/OctaveInterface.md b/docs/OctaveInterface.md
index 887277dcb3..6119e4f4a8 100644
--- a/docs/OctaveInterface.md
+++ b/docs/OctaveInterface.md
@@ -1,7 +1,7 @@
---
layout: docs
prev_section: casegroupsandstatistics
-next_section: wellpaths
+next_section: batchcommands
title: Octave Interface
permalink: /docs/octaveinterface/
published: true
diff --git a/docs/RegressionTestSystem.md b/docs/RegressionTestSystem.md
index e69c5b5b0b..39a431d471 100644
--- a/docs/RegressionTestSystem.md
+++ b/docs/RegressionTestSystem.md
@@ -2,7 +2,7 @@
layout: docs
prev_section: octaveinterfacereference
next_section: commandlineparameters
-title: Regression test system
+title: Regression Test System
permalink: /docs/regressiontestsystem/
published: true
---
diff --git a/docs/ReservoirViews.md b/docs/ReservoirViews.md
index 4f0e53667f..30caeb0835 100644
--- a/docs/ReservoirViews.md
+++ b/docs/ReservoirViews.md
@@ -1,13 +1,13 @@
---
layout: docs
prev_section: installation
-next_section: casegroupsandstatistics
+next_section: gridimportexport
title: Working with 3D Views
permalink: /docs/reservoirviews/
published: true
---
-3D Views are the windows displaying the Grid Models. The visualization is controlled by the **Project Tree** item representing the **View** and their subitems. Each item has a set of proerties that can be editied in the **Property View**.
+3D Views are the windows displaying the Grid Models. The visualization is controlled by the **Project Tree** item representing the **View** and their subitems. Each item has a set of proerties that can be editied in the **Property Editor**.

@@ -17,10 +17,6 @@ Below is a description of the most important View settings and their properties.
The **Cell Result** item defines which Eclipse property the 3D View uses for the main cell color. The property can be chosen in the property panel of the **Cell Result** item. The mapping between cell values and color is defined by the **Legend Definition**  along with some appearance settings on the Legend itself. (Number format etc.)
-### TRANSXYZ
-Normally the Cell Result setting gives one cell color based on the legend and the selected Result Property. This is *not* the case for the special static TRANXYZ property. This property gives each face the correct color based on the TRANS value that is associated with that particular face.
-The Positive I-face of the cell gets the cell TRANX value, while the J-face gets the TRANY-value etc. The negative faces, however, get the value from the neighbor cell in that direction. The negative I-face gets the TRANX value of the IJK-neighbor in negative I direction, and so on for the J- and K-faces.
-
### Cell Edge Results 
The **Cell Edge Result** visualization mode is one of ResInsight's special features. Its main use is to show the MULT(X, Y, Z) properties at the same time.
@@ -32,11 +28,15 @@ ResInsight supports all properties ending with X, Y, Z and X-, Y-, Z-. However,
When selecting a result variable for cell edge, a second legend shows up in the 3D view showing the variation in values for this second property. Color legend management is available when selecting the **Legend Definition** item belonging to the **Cell Edge Result** item.
+### Separate Fault Result
+
+Default result mapping on faults is using the result specified in **Cell Result**. If a different result mapping is wanted, enable the checkbox and select the result from the result selection dialog in the **Property Editor**. A second legend for the fault result is added to the view.
+
### Info Box
The **Info Box** controls the visibility of the animation progress, the Case description box, and the results histogram.
-The **Results Histogram** shows a histogram of the complete time series of the currently loaded **Cell Result** together with:
+The **Histogram** shows a histogram of the complete time series of the currently loaded **Cell Result** together with:
- The mean value ( a blue line )
- P10 and P90 ( red lines )
@@ -44,103 +44,4 @@ The **Results Histogram** shows a histogram of the complete time series of the c

-### Cell Filters
-Cell Filters are used to control visibility of the cells in the 3D view. Three types of filters exists:
-- **Range filter** : Define a IJK subset of the model.
-- **Property filter** : Define a value range for a property to control cell visibility.
-- **Well cell filter** : Display grid cells that has connections to a well. Controlled from the **Simulation Wells** item.
-
-All filters can be turned on or off using the toggle in the **Project Tree** and controlled from their corresponding **Property Editor**.
-
-#### Range filters
-
-Using range filters enables the user to define a set of IJK visible regions in the 3D view.
-A new range filter can be added by activating the context menu for the **Range Filters** collection in the **Project Tree**.
-
-*TIP:* An I,J or K-slice range filter can be added directly from a Cell in the **3D View** by rightclicking the cell and using the context menu.
-
-Below is a snapshot of the **Property Editor** of the **Range Filter** :
-
-
-
- - **Filter Type** : The filter can either make the specified range visible ( *Include* ), or remove the range from the View ( *Exclude* ).
- - **Grid** : This option selects which of the grids the range is addressing.
- - **Apply to Subgrids** : This option tells ResInsight to use the visibility of the cells in the current grid to control the visibility of the cells in sub-LGR's. If this option is turned off, Sub LGR-cells is not included in this particular Range Filter.
-
-The **Start** and **Width** labels in front of the sliders features a number in parenthesis denoting maximum available value.
-The **Start** labels shows the index of the start of the active cells.
-The **Width** labels shows the number of active cells from the start of the active cells.
-
-#### Property filters
-
-**Property filters** apply to the results of the **Range filters**. Below is a snapshot of the **Property Editor** of the **Property Filter**.
-
-
-
-This filter filters the cells based on a property value range (Min - Max). Cells in the range are either shown or hidden depending on the **Filter Type** ( *Include* / *Exclude* ). Exclude-filters removes the selected cells from the **View** even if some other filter includes them.
-
-A new property filter can be made by activating the context menu for **Property Filters**. The new property filter is based on the currently viewed cell result by default.
-
-### Simulation Wells
-
-This item controls the overall settings for how wells in the Eclipse simulation are visualized.
-The wells are shown in two ways:
-
-1. A pipe through all cells with well connections
-2. By adding the well cells to the set of visible cells
-
-The latter is handled internally as a special range filter, and adds cells to the set of range filtered cells.
-
-The Property Editor of the **Simulation Wells** item is shown below:
-
-
-
-
-
-- **Add cells to range filter** This option controls how the well cells
- (cells with connections to wells) are added to the set of range filtered cells.
- - *All On* will add the cells from all wells disregarding the individual settings on the well.
- - *All Off* will prevent any well cells to be added.
- - *Individually* will respect the individual settings for each well, and add the cells from the wells with this option set on.
-- **Use Well Fence** and
-- **Well Fence direction** Controls whether to add extensions of the well cells in the I, J or K direction to the set of range filtered cells
-- **Well head** These options control the appearance and position of the well labels and and symbols of the top of the well
-- **Global Well Pipe Visibility** Controls if and when to show the pipe representation of the wells. The options are:
- - *All On* will show the pipes from all wells disregarding the individual settings on the well.
- - *All Off* will hide all simulation well pipes.
- - *Individual* Will respect the individual settings for each well, and only show the well pipes from the wells with this option set on. See below.
- - *Visible Cells Filtered* This option will only show the pipes of wells that are connected to visible cells. That means the combined result of **Range Filters**, **Property Filters** and any **Well Range Filters**.
- *NOTE* : All Wells with **Well Range Filter** turned on will always be visible with this option selected.
-- **Pipe Radius Scale** Scaling the pipe radius by the average max cell size.
-- **Geometry based Branch detection** Applies only to ordinary wells (not MSW)
- and will detect that parts of a well really is a branch. Those well parts will
- be visualized as a branch starting at the well head instead of at the previous connected cell.
-
-##### Well pipes of Multi Segment Wells
-
-###### Geometry approximation
-The pipe geometry generated for MSW's are based on the topology of the well (branch/segment structure) and the position of the cells being connected. The segment lengths are used as hints to place the branch points at sensible places. Thus the pipe geometry itself is not geometrically correct, but makes the topology of the well easier to see.
-
-###### Dummy branches
-Often MSW's are modeled using a long stem without connections and a multitude of small branches; one for each connection. ResInsight offsets the the pipe within the cell to clearly show how the topology of the well is defined.
-
-
-
-###### Picking reveals Segment/Branch info
-
-Branch and segment info of a MSW-connected-Cell is shown in the **Result Info** window when picking a cell in the 3D View. This can be handy when relating the visualization to the input files.
-
-### Individual Simulation Well options
-
-Each of the wells can have some individual settings. These options works as specializations of the ones set on the global level (**Simulation Wells** See above) but will *only come into play when they are not ignored by the global settings*.
-
-This is particularly important to notice for the **Show Well Pipe** and **Range Filter** options. They will not have effect if the corresponding global settings in **Simulation Wells** allows them to.
-
-The properties of a single well are shown below.
-
-
-
-One option needs further explanation:
-
-- **Pipe Radius Scale** This option is a scale that is added to the "global" scale set in the **Simulation Wells** properties.
diff --git a/docs/SimulationWells.md b/docs/SimulationWells.md
new file mode 100644
index 0000000000..cf9a48c025
--- /dev/null
+++ b/docs/SimulationWells.md
@@ -0,0 +1,71 @@
+---
+layout: docs
+prev_section: gridimportexport
+next_section: faults
+title: Simulation Wells
+permalink: /docs/simulationwells/
+published: true
+---
+
+This item controls the overall settings for how wells in the Eclipse simulation are visualized.
+The wells are shown in two ways:
+
+1. A pipe through all cells with well connections
+2. By adding the well cells to the set of visible cells
+
+The latter is handled internally as a special range filter, and adds cells to the set of range filtered cells.
+
+The Property Editor of the **Simulation Wells** item is shown below:
+
+
+
+
+
+- **Add cells to range filter** This option controls how the well cells
+ (cells with connections to wells) are added to the set of range filtered cells.
+ - *All On* will add the cells from all wells disregarding the individual settings on the well.
+ - *All Off* will prevent any well cells to be added.
+ - *Individually* will respect the individual settings for each well, and add the cells from the wells with this option set on.
+- **Use Well Fence** and
+- **Well Fence direction** Controls whether to add extensions of the well cells in the I, J or K direction to the set of range filtered cells
+- **Well head** These options control the appearance and position of the well labels and and symbols of the top of the well
+- **Global Well Pipe Visibility** Controls if and when to show the pipe representation of the wells. The options are:
+ - *All On* will show the pipes from all wells disregarding the individual settings on the well.
+ - *All Off* will hide all simulation well pipes.
+ - *Individual* Will respect the individual settings for each well, and only show the well pipes from the wells with this option set on. See below.
+ - *Visible Cells Filtered* This option will only show the pipes of wells that are connected to visible cells. That means the combined result of **Range Filters**, **Property Filters** and any **Well Range Filters**.
+ *NOTE* : All Wells with **Well Range Filter** turned on will always be visible with this option selected.
+- **Pipe Radius Scale** Scaling the pipe radius by the average max cell size.
+- **Geometry based Branch detection** Applies only to ordinary wells (not MSW)
+ and will detect that parts of a well really is a branch. Those well parts will
+ be visualized as a branch starting at the well head instead of at the previous connected cell.
+
+## Well pipes of Multi Segment Wells
+
+### Geometry approximation
+The pipe geometry generated for MSW's are based on the topology of the well (branch/segment structure) and the position of the cells being connected. The segment lengths are used as hints to place the branch points at sensible places. Thus the pipe geometry itself is not geometrically correct, but makes the topology of the well easier to see.
+
+### Dummy branches
+Often MSW's are modeled using a long stem without connections and a multitude of small branches; one for each connection. ResInsight offsets the the pipe within the cell to clearly show how the topology of the well is defined.
+
+
+
+### Picking reveals Segment/Branch info
+
+Branch and segment info of a MSW-connected-Cell is shown in the **Result Info** window when picking a cell in the 3D View. This can be handy when relating the visualization to the input files.
+
+## Individual Simulation Well options
+
+Each of the wells can have some individual settings. These options works as specializations of the ones set on the global level (**Simulation Wells** See above) but will *only come into play when they are not ignored by the global settings*.
+
+This is particularly important to notice for the **Show Well Pipe** and **Range Filter** options. They will not have effect if the corresponding global settings in **Simulation Wells** allows them to.
+
+The properties of a single well are shown below.
+
+
+
+One option needs further explanation:
+
+- **Pipe Radius Scale** This option is a scale that is added to the "global" scale set in the **Simulation Wells** properties.
+
+
diff --git a/docs/UsersGuide.md b/docs/UsersGuide.md
deleted file mode 100644
index 5943029015..0000000000
--- a/docs/UsersGuide.md
+++ /dev/null
@@ -1,32 +0,0 @@
-#  ResInsight 1.1 Users Guide
-
-## Introduction
-
-ResInsight is an open source, cross-platform 3D visualization and post processing tool for reservoir models and simulations. The system also constitutes a framework for further development and support for new data sources and visualization methods, e.g. additional solvers, seismic data, CSEM, geomechanics, and more.
-
-The user interface is tailored for efficient interpretation of reservoir simulation data with specialized visualizations of properties, faults and wells. It enables easy handling of a large number of realizations and calculation of statistics. To be highly responsive, ResInsight exploits multi-core CPUs and GPUs. Integration with GNU Octave enables powerful and flexible result manipulation and computations. Derived results can be returned to ResInsight for further handling and visualization. Eventually, derived and computed properties can be directly exported to Eclipse input formats for further simulation cycles and parameter studies.
-
-The main input data is
-`*.GRID` and `*.EGRID` files along with their `*.INIT` and restart files `*.XNNN` and `*.UNRST`.
-ResInsight also supports selected parts of Eclipse input files and can read grid
-information and corresponding cell property data sets.
-
-ResInsight has been co-developed by Statoil ASA, Ceetron Solutions AS, and Ceetron AS with the aim to provide a versatile tool for professionals who need to visualize and process reservoir models.
-
-### Contents
-
-- [ Getting Started ](GettingStarted.md)
-- [ Working with 3D Views ](ReservoirViews.md)
-- [ Multiple realizations and statistics ](CaseGroupsAndStatistics.md)
-- [ Octave Interface](OctaveInterface.md)
-- [ Well Trajectories ](WellPaths.md)
-- [ Faults ](Faults.md)
-- [ Batch Commands ](BatchCommands.md)
-
-### Appendix
-
-- [ Octave Interface Reference](OctaveInterfaceReference.md)
-- [ Regression Test System ](RegressionTestSystem.md)
-- [ Command Line Arguments](CommandLineParameters.md)
-
-
diff --git a/docs/WellPaths.md b/docs/WellPaths.md
index 40639015b1..4613e6229c 100644
--- a/docs/WellPaths.md
+++ b/docs/WellPaths.md
@@ -1,8 +1,8 @@
---
layout: docs
-prev_section: octaveinterface
-next_section: faults
-title: Well trajectories
+prev_section: filters
+next_section: derivedresults
+title: Well Trajectories
permalink: /docs/wellpaths/
published: true
---
@@ -10,6 +10,8 @@ published: true
ResInsight can import Well trajectories from simple Ascii files.
In addition, a Statoil specific solution to retrieve Well Trajectories from their internal web service is implemented.
+
+
## Ascii Well Trajectories
The command **File -> Import -> Import Well Paths From File** will read the well paths in the selected file, and create one entry for each trajectory under the  **Wells** item in the **Project Tree**.
@@ -22,7 +24,7 @@ The supported ASCII format is quite flexible but the main requirements are:
2. If the line contains the case insensitive string "name " the rest of the line is used as a well name.
3. If a well name is found, a new well is created and the following data points ends up in it.
-###### Example 1:
+### Example 1:
WELLNAME: WELL1
4507.0 5638.5 0.0 0.0
@@ -35,7 +37,7 @@ The supported ASCII format is quite flexible but the main requirements are:
5297.4 4938.5 3632.4 1998.387
-999
-###### Example 2:
+### Example 2:
X Y TVD MD
Name Well_1
5507.0 4638.5 0.0 0.0
@@ -50,15 +52,24 @@ The supported ASCII format is quite flexible but the main requirements are:
The trajectory data is not copied into the ResInsight project as such. The project file only stores the file path, and the next time you open the project, ResInsight will try to read the well data from the file again.
-### Importing from SSI-Hub (Internal Statoil web-service)
+## Importing from SSI-Hub (Internal Statoil web-service)
+
+In order to import from SSI-Hub, a project file must be present and stored to file. All imported well paths from the web service will be stored relative to this project file location. If no project file exists, the menu item is disabled.
The command **File -> Import -> Import Well Paths From SSI-hub** launches a wizard to guide you through the process of selecting the well trajectories you need.
+
+
Access to web service
+The import of well paths is using a web service. If you are a Statoil employee, make sure you have access to "EDM Landmark" and "EDM Compass".
+
+
+
+
After completing the wizard, the wells imported are accessible as Items under the  **Wells** item in the **Project Tree**.
The trajectory data is not copied into the ResInsight project as such, but is stored in files in a directory called *ProjectFileName_wellpaths* in the same directory as your project file.
-### Well Trajectory visualization
+## Well Trajectory Visualization
All the imported well trajectories are available below the  **Wells** item in the **Project Tree**.
@@ -70,4 +81,5 @@ The visible wells are always shown in all the 3D Views in the complete project,
- **Global well path visibility** This option forces the well paths on or off, ignoring the individual settings unless it is set to Individual.
- **Clip Well Paths** This option hides the top of the Well Trajectories to avoid displaying the very long lines from the reservoir to the sea surface.
-- **Well Path clipping depth distance** This number is the distance from the top of the reservoir to the clipping depth.
\ No newline at end of file
+- **Well Path clipping depth distance** This number is the distance from the top of the reservoir to the clipping depth.
+
diff --git a/docs/about.md b/docs/about.md
index 6d00d179e5..58c5c74928 100644
--- a/docs/about.md
+++ b/docs/about.md
@@ -11,7 +11,7 @@ published: true
### Project organization
-The project was initiated by Statoil ASA in 2009. Ceetron AS developed the initial solution, and the development responsibility was handed over to Ceetron Solutions AS in 2013.
+The project was initiated by Statoil ASA in 2011. ResInsight was initially developed by Ceetron AS, and the development responsibility was handed over to Ceetron Solutions AS in 2013.
### Web site programming and design
The programming and design of this site is based on work by [Tom Preston-Werner](http://tom.preston-werner.com/). This is also the current theme of [Jekyll](http://jekyllrb.com/).
diff --git a/images/3DViewOverview.png b/images/3DViewOverview.png
index e913685e88..f42b76c5c6 100644
Binary files a/images/3DViewOverview.png and b/images/3DViewOverview.png differ
diff --git a/images/DerivedStaticResults.png b/images/DerivedStaticResults.png
new file mode 100644
index 0000000000..da01bb587b
Binary files /dev/null and b/images/DerivedStaticResults.png differ
diff --git a/images/FaultProperties.png b/images/FaultProperties.png
index 435c54ebc7..5d228618df 100644
Binary files a/images/FaultProperties.png and b/images/FaultProperties.png differ
diff --git a/images/FrontPageImage.png b/images/FrontPageImage.png
new file mode 100644
index 0000000000..fa3d058e0d
Binary files /dev/null and b/images/FrontPageImage.png differ
diff --git a/images/ResInsightCroppedIconPicture.png b/images/ResInsightCroppedIconPicture.png
new file mode 100644
index 0000000000..9a8ebf1844
Binary files /dev/null and b/images/ResInsightCroppedIconPicture.png differ
diff --git a/images/ResInsightUIFullSizeWindows.png b/images/ResInsightUIFullSizeWindows.png
index 6b14f74160..f5d437f25b 100644
Binary files a/images/ResInsightUIFullSizeWindows.png and b/images/ResInsightUIFullSizeWindows.png differ
diff --git a/images/ResInsight_NNCsWithNoCommonArea.png b/images/ResInsight_NNCsWithNoCommonArea.png
new file mode 100644
index 0000000000..506c30be0a
Binary files /dev/null and b/images/ResInsight_NNCsWithNoCommonArea.png differ
diff --git a/images/ResInsight_WellPathWithSimulationWell.png b/images/ResInsight_WellPathWithSimulationWell.png
new file mode 100644
index 0000000000..3a4cf0e65e
Binary files /dev/null and b/images/ResInsight_WellPathWithSimulationWell.png differ
diff --git a/index.html b/index.html
index 7d7f95387f..3284e9d0b4 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,9 @@ overview: true
3D viewer and post processing of reservoir models
+
+

+