Merge pull request #3521 from akva2/backport_PR_3520

Backport #3520 fixed: build pypi packages using static boost libs

CMakeLists.txt

@@ -9,7 +9,7 @@ option(ENABLE_ECL_INPUT "Enable eclipse input support?" ON)
 option(ENABLE_ECL_OUTPUT "Enable eclipse output support?" ON)
 option(ENABLE_MOCKSIM "Build the mock simulator for io testing" ON)
 option(OPM_ENABLE_PYTHON "Enable python bindings?" OFF)
-option(OPM_INSTALL_PYTHON "Enable python bindings?" OFF)
+option(OPM_INSTALL_PYTHON "Install python bindings?" ON)
 option(OPM_ENABLE_EMBEDDED_PYTHON "Enable embedded python?" OFF)
 
 # Output implies input
@@ -32,13 +32,13 @@ set(OPM_PROJECT_EXTRA_CODE_INSTALLED  "#ENABLE_ECL_INPUT is needed by opm-common
                                        set(ENABLE_ECL_INPUT ${ENABLE_ECL_INPUT})
                                        set(OPM_MACROS_ROOT ${CMAKE_INSTALL_PREFIX}/share/opm)
                                        list(APPEND CMAKE_MODULE_PATH \${OPM_MACROS_ROOT}/cmake/Modules)
-                                       include(OpmPackage) #Make macros availabe after find_package(opm-common)")
+                                       include(OpmPackage) #Make macros available after find_package(opm-common)")
 
 set(OPM_PROJECT_EXTRA_CODE_INTREE "#ENABLE_ECL_INPUT is needed by opm-common-prereq.cmake
                                    set(ENABLE_ECL_INPUT ${ENABLE_ECL_INPUT})
                                    set(OPM_MACROS_ROOT ${OPM_MACROS_ROOT})
                                    list(APPEND CMAKE_MODULE_PATH \${OPM_MACROS_ROOT}/cmake/Modules)
-                                   include(OpmPackage) #Make macros availabe after find_package(opm-common)")
+                                   include(OpmPackage) #Make macros available after find_package(opm-common)")
 if(ENABLE_ECL_OUTPUT)
   set(OPM_PROJECT_EXTRA_CODE_INSTALLED "${OPM_PROJECT_EXTRA_CODE_INSTALLED}
                                         set(COMPARE_ECL_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/compareECL)
@@ -66,18 +66,16 @@ include(Findopm-tests)
 # with the find module
 include (${project}-prereqs)
 
-if(ENABLE_ECL_INPUT)
-  # source_hook runs before config_hook and the former needs fmt, hence this
-  # needs to be here.
-  if(fmt_FOUND)
-    # OpmSatellites will not add the library, do it here.
-    list(APPEND opm-common_LIBRARIES fmt::fmt)
-  else()
-    add_definitions(-DFMT_HEADER_ONLY)
-    include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
-    # Not sure why this is needed.
-    list(APPEND EXTRA_INCLUDES ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
-  endif()
+# source_hook runs before config_hook and the former needs fmt, hence this
+# needs to be here.
+if(fmt_FOUND)
+  # OpmSatellites will not add the library, do it here.
+  list(APPEND opm-common_LIBRARIES fmt::fmt)
+else()
+  add_definitions(-DFMT_HEADER_ONLY)
+  include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
+  # Not sure why this is needed.
+  list(APPEND EXTRA_INCLUDES ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
 endif()
 
 if(OPM_ENABLE_EMBEDDED_PYTHON AND NOT OPM_ENABLE_PYTHON)
@@ -108,6 +106,7 @@ macro (config_hook)
                                          set(HAVE_ECL_INPUT 1)")
       set(OPM_PROJECT_EXTRA_CODE_INSTALLED "${OPM_PROJECT_EXTRA_CODE_INSTALLED}
                                             set(HAVE_ECL_INPUT 1)")
+      set(HAVE_ECL_INPUT 1)
     endif()
     if(ENABLE_ECL_OUTPUT)
       set(OPM_PROJECT_EXTRA_CODE_INTREE "${OPM_PROJECT_EXTRA_CODE_INTREE}
@@ -115,13 +114,19 @@ macro (config_hook)
       set(OPM_PROJECT_EXTRA_CODE_INSTALLED "${OPM_PROJECT_EXTRA_CODE_INSTALLED}
                                             set(HAVE_ECL_OUTPUT 1)")
     endif()
-
-    find_package(Boost COMPONENTS filesystem regex system unit_test_framework)
+    # We need to use the correct search mode. Otherwise not finding one
+    # boost component beloq will mark the previously found ones as not
+    # found again. (Code stolen from UseDynamicBoost.cmake
+    if(Boost_DIR)
+      set(_Boost_CONFIG_MODE CONFIG)
+    endif()
+    find_package(Boost COMPONENTS filesystem regex system unit_test_framework ${_Boost_CONFIG_MODE})
 
     if (HAVE_DYNAMIC_BOOST_TEST)
       set_target_properties(Boost::unit_test_framework PROPERTIES INTERFACE_COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK=1)
     endif()
   endif()
+
 endmacro (config_hook)
 
 macro (prereqs_hook)
@@ -136,6 +141,9 @@ macro (sources_hook)
     list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/ParserInit.cpp)
     foreach (name A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
         list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/ParserKeywords/${name}.cpp)
+        list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/ParserKeywords/ParserInit${name}.cpp)
+        list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/ParserKeywords/Builtin${name}.cpp)
+        list(INSERT opm-common_HEADERS 0 ${PROJECT_BINARY_DIR}/include/opm/input/eclipse/Parser/ParserKeywords/${name}.hpp)
     endforeach()
     if (OPM_ENABLE_EMBEDDED_PYTHON)
       list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/python/cxx/builtin_pybind11.cpp)
@@ -143,6 +151,15 @@ macro (sources_hook)
   endif()
   set_source_files_properties(src/opm/input/eclipse/Python/Python.cpp
                               PROPERTIES COMPILE_FLAGS -Wno-shadow)
+  if(QuadMath_FOUND)
+    get_target_property(qm_defs QuadMath::QuadMath INTERFACE_COMPILE_DEFINITIONS)
+    get_target_property(qm_options QuadMath::QuadMath INTERFACE_COMPILE_OPTIONS)
+    set_source_files_properties(src/opm/material/components/CO2.cpp
+                                src/opm/material/densead/Evaluation.cpp
+                                PROPERTIES COMPILE_DEFINITIONS "${qm_defs}"
+                                COMPILE_OPTIONS "${qm_options}")
+  endif()
+
 endmacro (sources_hook)
 
 macro (fortran_hook)
@@ -163,11 +180,19 @@ macro (install_hook)
           PATTERN *.hpp)
 endmacro (install_hook)
 
+# Used to append entries from one list to another.
+# The output list is suitable for use in setup.py subtitution
+macro(append_quoted OUT IN)
+  foreach(ENTRY ${${IN}})
+    list(APPEND ${OUT} "'${ARGN}${ENTRY}'")
+  endforeach()
+endmacro()
+
 # If opm-common is configured to embed the python interpreter we must make sure
 # that all downstream modules link libpython transitively. Due to the required
 # integration with Python+cmake machinery provided by pybind11 this is done by
 # manually adding to the opm-common_LIBRARIES variable here, and not in the
-# OpmnLibMain function. Here only the library dependency is implemented, the
+# OpmLibMain function. Here only the library dependency is implemented, the
 # bulk of the python configuration is further down in the file.
 if (OPM_ENABLE_PYTHON)
   # We need to be compatible with older CMake versions
@@ -184,36 +209,48 @@ if (OPM_ENABLE_PYTHON)
     endif()
     set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
     set(Python3_LIBRARIES ${PYTHON_LIBRARIES})
+    set(Python3_VERSION "${PYTHON_VERSION_STRING}")
+    set(Python3_VERSION_MINOR ${PYTHON_VERSION_MINOR})
   else()
     # Be backwards compatible.
     if(PYTHON_EXECUTABLE AND NOT Python3_EXECUTABLE)
       set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
     endif()
-    if (OPM_ENABLE_EMBEDDED_PYTHON)
-      find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+    # We always need to search for Development as we use
+    # pybind11_add_module even if don't embed Python
+    if (NOT OPM_ENABLE_EMBEDDED_PYTHON)
+      if(${CMAKE_VERSION} VERSION_LESS "3.18.0")
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+      else()
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
+      endif()
+    else()
+      if(${CMAKE_VERSION} VERSION_LESS "3.18.0")
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+      else()
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Embed Development.Module)
+      endif()
       get_target_property(_lib_path Python3::Python IMPORTED_LOCATION)
       set(PYTHON_LIBRARY ${_lib_path})
       set(PYTHON_LIBRARIES {PYTHON_LIBRARY})
       list(APPEND opm-common_LIBRARIES ${PYTHON_LIBRARY})
       set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
-    else()
-      find_package(Python3 REQUIRED COMPONENTS Interpreter)
     endif()
-    # Make sure we fail gracefully here without setuptool
-    execute_process(COMMAND ${Python3_EXECUTABLE} -c "import setuptools"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-      ERROR_VARIABLE SETUPTOOL_ERROR OUTPUT_VARIABLE SETUPTOOL_OUT
-      RESULT_VARIABLE SETUPTOOL_RESULT)
-    if(SETUPTOOL_RESULT GREATER 0)
-      message(WARNING "Trying to test setuptools resulted in error message: ${SETUPTOOL_ERROR}")
-      message(SEND_ERROR "To build the python bindings you need to install setuptool. "
-        "Either use \"apt-get install python3-setuptools\" (on Debian/Ubuntu) "
-        "or \"pip install setuptools\"")
+    if(Python3_VERSION_MINOR LESS 3)
+      # Python native namespace packages requires python >= 3.3
+      message(SEND_ERROR "OPM requires python >= 3.3 but only version ${Python3_VERSION} was found")
     endif()
 
     # Compatibility settings for PythonInterp and PythonLibs
     # used e.g. in FindCwrap, pybind11
     set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+    # Directory to install common (for opm modules) python scripts
+    include (GNUInstallDirs)
+    set(OPM_PYTHON_COMMON_DIR "${CMAKE_INSTALL_DATAROOTDIR}/opm/python")
+    set(OPM_PROJECT_EXTRA_CODE_INTREE "${OPM_PROJECT_EXTRA_CODE_INTREE}
+                                       set(opm-common_PYTHON_COMMON_DIR ${PROJECT_SOURCE_DIR}/python)")
+    set(OPM_PROJECT_EXTRA_CODE_INSTALLED "${OPM_PROJECT_EXTRA_CODE_INSTALLED}
+                                         set(opm-common_PYTHON_COMMON_DIR ${CMAKE_INSTALL_PREFIX}/${OPM_PYTHON_COMMON_DIR})")
   endif()
   # We always need the PYTHON_INCLUDE_DIR. Unfortunately
   # When we build pypi packages CMake will fail to determine
@@ -232,8 +269,10 @@ if (OPM_ENABLE_PYTHON)
   endif()
   find_package(pybind11 2.2 CONFIG)
   if (NOT pybind11_FOUND)
-    # Use full path for reuse with pypi
-    set(pybind11_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/python/pybind11/include ${PYTHON_INCLUDE_DIRS})
+      add_subdirectory(python/pybind11)
+      if (NOT pybind11_INCLUDE_DIRS)
+        set(pybind11_INCLUDE_DIRS ${PYBIND11_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS})
+      endif()
   endif()
 endif()
 
@@ -241,7 +280,7 @@ endif()
 # all setup common to the OPM library modules is done here
 include (OpmLibMain)
 
-if (ENABLE_MOCKSIM)
+if (ENABLE_MOCKSIM AND ENABLE_ECL_INPUT)
   add_library(mocksim
               msim/src/msim.cpp)
   target_link_libraries(mocksim opmcommon)
@@ -322,6 +361,26 @@ if(ENABLE_ECL_INPUT)
 
 endif()
 
+# Explicitly link tests needing dune-common.
+# To avoid pulling dune-common into the opm-common interface
+find_package(dune-common REQUIRED)
+opm_need_version_of ("dune-common")
+target_include_directories(dunecommon INTERFACE ${dune-common_INCLUDE_DIRS})
+string(REPLACE " " ";" dflags ${dune-common_CXX_FLAGS})
+target_compile_options(dunecommon INTERFACE ${dflags})
+target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_MAJOR=${DUNE_COMMON_VERSION_MAJOR})
+target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_MINOR=${DUNE_COMMON_VERSION_MINOR})
+target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_REVISION=${DUNE_COMMON_VERSION_REVISION})
+if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
+  foreach(src ${DUNE_TEST_SOURCE_FILES})
+    get_filename_component(tgt ${src} NAME_WE)
+    target_link_libraries(${tgt} dunecommon)
+  endforeach()
+endif()
+if(BUILD_EXAMPLES)
+  target_link_libraries(co2brinepvt dunecommon)
+endif()
+
 # Install build system files and documentation
 install(DIRECTORY cmake
   DESTINATION share/opm USE_SOURCE_PERMISSIONS
@@ -334,140 +393,53 @@ install(FILES cmake/OPM-CMake.md
 install(FILES etc/opm_bash_completion.sh.in DESTINATION share/opm/etc)
 
 if (OPM_ENABLE_PYTHON)
-  execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
-import site, sys
-try:
-    sys.stdout.write(site.getsitepackages()[-1])
-except e:
-    sys.stdout.write('')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_PATH)
-  # -------------------------------------------------------------------------
-  # 1: Wrap C++ functionality in Python
-  if (PYTHON_SITE_PACKAGES_PATH MATCHES ".*/dist-packages/?" AND
-      CMAKE_INSTALL_PREFIX MATCHES "^/usr.*")
-    # dist-packages is only used if we install below /usr and python's site packages
-    # path matches dist-packages
-    set(PYTHON_PACKAGE_PATH "dist-packages")
-  else()
-    set(PYTHON_PACKAGE_PATH "site-packages")
-  endif()
-  if(PYTHON_VERSION_MAJOR)
-    set(PY_MAJOR ${PYTHON_VERSION_MAJOR})
-  else()
-    set(PY_MAJOR ${Python3_VERSION_MAJOR})
-  endif()
-  if(PYTHON_VERSION_MINOR)
-    set(PY_MINOR ${PYTHON_VERSION_MINOR})
-  else()
-    set(PY_MINOR ${Python3_VERSION_MINOR})
-  endif()
-  set(PYTHON_INSTALL_PREFIX "lib/python${PY_MAJOR}.${PY_MINOR}/${PYTHON_PACKAGE_PATH}" CACHE STRING "Subdirectory to install Python modules in")
-
   make_directory(${PROJECT_BINARY_DIR}/python)
-  get_target_property(_opmcommon_include_dirs opmcommon INCLUDE_DIRECTORIES)
-  list(APPEND _opmcommon_include_dirs ${_ecl_include_dirs})
-  string(REPLACE ";" ":" _setup_include_dirs "${_opmcommon_include_dirs}")
-
-  get_target_property(_opmcommon_lib_dirs opmcommon LINK_DIRECTORIES)
-  if (CMAKE_PREFIX_PATH)
-    list(APPEND _opmcommon_lib_dirs ${PROJECT_BINARY_DIR}/lib ${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR})
-  else()
-    list(APPEND _opmcommon_lib_dirs ${PROJECT_BINARY_DIR}/lib)
-  endif()
-  string(REPLACE ";" ":" _setup_lib_dirs "${_opmcommon_lib_dirs}")
-
-  if (USE_RUNPATH)
-    set (_python_rpath_list)
-    if (CMAKE_PREFIX_PATH)
-      foreach(path ${CMAKE_PREFIX_PATH})
-        list(APPEND _python_rpath_list "${path}/${CMAKE_INSTALL_LIBDIR}")
-      endforeach()
-    endif()
-
-    if (BUILD_SHARED_LIBS)
-      if (OPM_INSTALL_PYTHON)
-        list(APPEND _python_rpath_list "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-        list(APPEND _python_rpath_list "${PROJECT_BINARY_DIR}/lib")
-      else()
-        list(APPEND _python_rpath_list "${PROJECT_BINARY_DIR}/lib")
-      endif()
-    endif()
-
-    if (_python_rpath_list)
-      string(REPLACE ";" ":" _rpath "${_python_rpath_list}")
-      set( _rpath_arg "--rpath=${_rpath}")
-    else()
-      set(_rpath_arg "")
-    endif()
-  else()
-    set( _rpath_arg "")
-  endif()
 
   set(opm-common_PYTHON_PACKAGE_VERSION ${OPM_PYTHON_PACKAGE_VERSION_TAG})
 
-  # Generate versioned setup.py
-  if (pybind11_INCLUDE_DIRS)
-    string(REGEX REPLACE ";" "', '"  _tmp "${pybind11_INCLUDE_DIRS}")
-    set(SETUP_PY_PYBIND_INCLUDE_DIR "'${_tmp}'")
-  endif()
-
-  if (TARGET fmt::fmt)
-     get_target_property(SETUP_PY_FMT_LIBS fmt::fmt LOCATION)
-     get_target_property(FMT_FLAGS fmt::fmt INTERFACE_COMPILE_DEFINITIONS)
-     foreach(flag ${FMT_FLAGS})
-       set(SETUP_PY_FMT_FLAGS "${SETUP_PY_FMT_FLAGS} '-D${flag}',")
-     endforeach()
-     list(APPEND opm-common_PYTHON_LINKAGE "'${SETUP_PY_FMT_LIBS}'")
-  else()
-    set(SETUP_PY_FMT_FLAGS "'-DFMT_HEADER_ONLY'")
-  endif()
-
-  if(cjson_FOUND)
-    list(APPEND opm-common_PYTHON_LINKAGE "'${cjson_LIBRARIES}'")
-  endif()
-
-  # opm-common_PYTHON_LINKAGE is used verbatim in a listin python.
-  # Hence items need to be comma separated.
-  if (opm-common_PYTHON_LINKAGE)
-    string(REPLACE ";" "," SETUP_PY_LINKAGE "${opm-common_PYTHON_LINKAGE}")
-  endif()
-
-  configure_file (${PROJECT_SOURCE_DIR}/python/setup.py.in ${PROJECT_BINARY_DIR}/python/setup.py)
-  file(COPY ${PROJECT_SOURCE_DIR}/python/README.md DESTINATION ${PROJECT_BINARY_DIR}/python)
-  execute_process(COMMAND ${Python3_EXECUTABLE} target_name.py
-                  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python
-                  OUTPUT_VARIABLE python_lib_target)
-
   add_custom_target(copy_python ALL
     COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/python/install.py ${PROJECT_SOURCE_DIR}/python ${PROJECT_BINARY_DIR} 0)
 
-  add_custom_command(OUTPUT python/opm/${python_lib_target}
-                     DEPENDS ${PYTHON_CXX_DEPENDS}
-                     DEPENDS copy_python
-                     COMMAND ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/python/setup.py
-                                                      build
-                                                      build_ext
-                                                      --build-lib=${PROJECT_BINARY_DIR}/python
-                                                      --library-dirs=${_setup_lib_dirs}
-                                                      ${_rpath_arg}
-                                                      --include-dirs=${_setup_include_dirs}
-                     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/python
-                     COMMENT "Building python bindings at python/opm/${python_lib_target}")
-  add_custom_target(opmcommon_python ALL DEPENDS python/opm/${python_lib_target})
-  add_dependencies(opmcommon_python opmcommon)
+  file(COPY ${PROJECT_SOURCE_DIR}/python/README.md DESTINATION ${PROJECT_BINARY_DIR}/python)
+
+  pybind11_add_module(opmcommon_python
+                      ${PYTHON_CXX_SOURCE_FILES}
+                      ${PROJECT_BINARY_DIR}/python/cxx/builtin_pybind11.cpp)
+  target_link_libraries(opmcommon_python PRIVATE
+                        opmcommon)
+  if(TARGET pybind11::pybind11)
+    target_link_libraries(opmcommon_python PRIVATE
+                          pybind11::pybind11)
+  else()
+    target_include_directories(opmcommon_python SYSTEM PRIVATE ${pybind11_INCLUDE_DIRS})
+  endif()
+  set_target_properties(opmcommon_python PROPERTIES
+                        LIBRARY_OUTPUT_DIRECTORY python/opm)
+  add_dependencies(opmcommon_python copy_python)
+
+  # Generate versioned setup.py
+  configure_file(${PROJECT_SOURCE_DIR}/python/setup.py.in
+                 ${PROJECT_BINARY_DIR}/python/setup.py.tmp)
+  file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/python/setup.py
+                INPUT ${PROJECT_BINARY_DIR}/python/setup.py.tmp)
 
-  # The install target is based on manually copying the python file tree to the
-  # installation area with a small installation script 'install.py'. Would have
-  # preferred to use standard setup.py install, but the setup.py based solution
-  # refuses to install to a location which the current python executable can not
-  # load from, and the use of eggs in the setup.py based installation makes
-  # debugging quite difficult.
-  #
   # Since the installation of Python code is nonstandard it is protected by an
   # extra cmake switch, OPM_INSTALL_PYTHON. If you prefer you can still invoke
   # setup.py install manually - optionally with the generated script
   # setup-install.sh - and completely bypass cmake in the installation phase.
   if (OPM_INSTALL_PYTHON)
-    install( CODE "execute_process(COMMAND ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/python/install.py ${PROJECT_BINARY_DIR}/python/opm ${DEST_PREFIX}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PREFIX} 1)")
+      include(PyInstallPrefix)
+      install(TARGETS opmcommon_python DESTINATION ${DEST_PREFIX}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PREFIX}/opm)
+      install(
+        CODE "execute_process(
+          COMMAND ${PYTHON_EXECUTABLE}
+                  python/install.py
+                  ${PROJECT_BINARY_DIR}/python/opm
+                  ${DEST_PREFIX}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PREFIX} 1)")
+
+      ## Need to install this Python script such that it can be used by opm-simulators when building against an installed
+      ##  opm-common
+      install( PROGRAMS "python/install.py" DESTINATION "${OPM_PYTHON_COMMON_DIR}" )
   endif()
 
   # Observe that if the opmcommon library has been built as a shared library the
@@ -475,7 +447,7 @@ except e:
   # testing.
   add_test(NAME python_tests
            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/python
-           COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib ${Python3_EXECUTABLE} setup.py build_ext --dry-run --build-lib ${PROJECT_BINARY_DIR}/python test
+           COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib ${Python3_EXECUTABLE} -m unittest discover
            )
 
   set_target_properties(opmcommon PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -489,11 +461,6 @@ except e:
         DESTINATION ${PROJECT_BINARY_DIR}
         FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE )
 
-  configure_file(python/setup-package.sh.in tmp/setup-package.sh)
-  file( COPY ${PROJECT_BINARY_DIR}/tmp/setup-package.sh
-        DESTINATION ${PROJECT_BINARY_DIR}
-        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE )
-
   configure_file(python/setup-test.sh.in tmp/setup-test.sh)
   file( COPY ${PROJECT_BINARY_DIR}/tmp/setup-test.sh
         DESTINATION ${PROJECT_BINARY_DIR}

CMakeLists_files.cmake

@@ -32,18 +32,58 @@ list (APPEND MAIN_SOURCE_FILES
       src/opm/common/OpmLog/StreamLog.cpp
       src/opm/common/OpmLog/TimerLog.cpp
       src/opm/common/utility/ActiveGridCells.cpp
+      src/opm/common/utility/Demangle.cpp
       src/opm/common/utility/FileSystem.cpp
+      src/opm/common/utility/MemPacker.cpp
       src/opm/common/utility/numeric/MonotCubicInterpolator.cpp
       src/opm/common/utility/OpmInputError.cpp
       src/opm/common/utility/parameters/Parameter.cpp
       src/opm/common/utility/parameters/ParameterGroup.cpp
+      src/opm/common/utility/parameters/ParameterRequirement.cpp
       src/opm/common/utility/parameters/ParameterTools.cpp
       src/opm/common/utility/numeric/calculateCellVol.cpp
+      src/opm/common/utility/numeric/RootFinders.cpp
       src/opm/common/utility/shmatch.cpp
+      src/opm/common/utility/String.cpp
       src/opm/common/utility/TimeService.cpp
+      src/opm/material/common/Spline.cpp
+      src/opm/material/common/Tabulated1DFunction.cpp
+      src/opm/material/common/TridiagonalMatrix.cpp
+      src/opm/material/common/UniformXTabulated2DFunction.cpp
+      src/opm/material/components/CO2.cpp
+      src/opm/material/densead/Evaluation.cpp
+      src/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.cpp
+      src/opm/material/fluidsystems/BlackOilFluidSystem.cpp
+      src/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.cpp
+      src/opm/material/fluidsystems/blackoilpvt/DryGasPvt.cpp
+      src/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.cpp
+      src/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.cpp
+      src/opm/material/fluidsystems/blackoilpvt/SolventPvt.cpp
+      src/opm/material/fluidsystems/blackoilpvt/WetGasPvt.cpp
+      src/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.cpp
 )
 if(ENABLE_ECL_INPUT)
   list(APPEND MAIN_SOURCE_FILES
+    external/resinsight/LibCore/cvfAssert.cpp
+    external/resinsight/LibCore/cvfAtomicCounter.cpp
+    external/resinsight/LibCore/cvfCharArray.cpp
+    external/resinsight/LibCore/cvfMath.cpp
+    external/resinsight/LibCore/cvfObject.cpp
+    external/resinsight/LibCore/cvfPlane.cpp
+    external/resinsight/LibCore/cvfString.cpp
+    external/resinsight/LibCore/cvfSystem.cpp
+    external/resinsight/LibCore/cvfTrace.cpp
+    external/resinsight/LibCore/cvfVector3.cpp
+    external/resinsight/LibGeometry/cvfBoundingBox.cpp
+    external/resinsight/LibGeometry/cvfBoundingBoxTree.cpp
+    external/resinsight/LibGeometry/cvfRay.cpp
+    external/resinsight/ReservoirDataModel/cvfGeometryTools.cpp
+    external/resinsight/ReservoirDataModel/RigHexIntersectionTools.cpp
+    external/resinsight/ReservoirDataModel/RigWellLogExtractor.cpp
+    external/resinsight/ReservoirDataModel/RigWellPath.cpp
+    external/resinsight/CommonCode/cvfStructGrid.cpp
+    external/resinsight/cafPdmCore/cafSignal.cpp
+    external/resinsight/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
     src/opm/io/eclipse/SummaryNode.cpp
     src/opm/json/JsonObject.cpp
     src/opm/input/eclipse/Deck/Deck.cpp
@@ -61,6 +101,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Python/Python.cpp
     src/opm/input/eclipse/Schedule/Action/PyAction.cpp
     src/opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.cpp
+    src/opm/input/eclipse/EclipseState/Aquifer/AquiferFlux.cpp
     src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp
     src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp
     src/opm/input/eclipse/EclipseState/Aquifer/Aquancon.cpp
@@ -73,21 +114,25 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/EclipseState/EclipseConfig.cpp
     src/opm/input/eclipse/EclipseState/EclipseState.cpp
     src/opm/input/eclipse/EclipseState/EndpointScaling.cpp
-    src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp
-    src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp
     src/opm/input/eclipse/EclipseState/Grid/Box.cpp
     src/opm/input/eclipse/EclipseState/Grid/BoxManager.cpp
+    src/opm/input/eclipse/EclipseState/Grid/Carfin.cpp
+    src/opm/input/eclipse/EclipseState/Grid/CarfinManager.cpp
     src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
+    src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp
+    src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp
     src/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp
     src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp
     src/opm/input/eclipse/EclipseState/Grid/Fault.cpp
     src/opm/input/eclipse/EclipseState/Grid/FaultFace.cpp
     src/opm/input/eclipse/EclipseState/Grid/GridDims.cpp
     src/opm/input/eclipse/EclipseState/Grid/MapAxes.cpp
+    src/opm/input/eclipse/EclipseState/Grid/MinpvMode.cpp
     src/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
     src/opm/input/eclipse/EclipseState/Grid/NNC.cpp
     src/opm/input/eclipse/EclipseState/Grid/Operate.cpp
     src/opm/input/eclipse/EclipseState/Grid/PinchMode.cpp
+    src/opm/input/eclipse/EclipseState/Grid/readKeywordCarfin.cpp
     src/opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp
     src/opm/input/eclipse/EclipseState/Grid/setKeywordBox.cpp
     src/opm/input/eclipse/EclipseState/Grid/TranCalculator.cpp
@@ -97,6 +142,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/EclipseState/InitConfig/InitConfig.cpp
     src/opm/input/eclipse/EclipseState/IOConfig/IOConfig.cpp
     src/opm/input/eclipse/EclipseState/Runspec.cpp
+    src/opm/input/eclipse/EclipseState/Phase.cpp
     src/opm/input/eclipse/EclipseState/TracerConfig.cpp
     src/opm/input/eclipse/EclipseState/MICPpara.cpp
     src/opm/input/eclipse/Schedule/Action/ActionAST.cpp
@@ -130,6 +176,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Schedule/MSW/icd.cpp
     src/opm/input/eclipse/Schedule/MSW/Compsegs.cpp
     src/opm/input/eclipse/Schedule/MSW/Segment.cpp
+    src/opm/input/eclipse/Schedule/MSW/SegmentMatcher.cpp
     src/opm/input/eclipse/Schedule/MSW/WellSegments.cpp
     src/opm/input/eclipse/Schedule/MSW/AICD.cpp
     src/opm/input/eclipse/Schedule/MSW/SICD.cpp
@@ -152,26 +199,29 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Schedule/WriteRestartFileEvents.cpp
     src/opm/input/eclipse/Schedule/Well/Connection.cpp
     src/opm/input/eclipse/Schedule/Well/injection.cpp
+    src/opm/input/eclipse/Schedule/Well/NameOrder.cpp
     src/opm/input/eclipse/Schedule/Well/PAvg.cpp
     src/opm/input/eclipse/Schedule/Well/PAvgCalculator.cpp
     src/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.cpp
     src/opm/input/eclipse/Schedule/Well/Well.cpp
     src/opm/input/eclipse/Schedule/Well/WellConnections.cpp
-    src/opm/input/eclipse/Schedule/Well/NameOrder.cpp
     src/opm/input/eclipse/Schedule/Well/WellMatcher.cpp
-    src/opm/input/eclipse/Schedule/Well/WList.cpp
-    src/opm/input/eclipse/Schedule/Well/WListManager.cpp
+    src/opm/input/eclipse/Schedule/Well/WellEnums.cpp
+    src/opm/input/eclipse/Schedule/Well/WellBrineProperties.cpp
     src/opm/input/eclipse/Schedule/Well/WellEconProductionLimits.cpp
     src/opm/input/eclipse/Schedule/Well/WellFoamProperties.cpp
     src/opm/input/eclipse/Schedule/Well/WellInjectionProperties.cpp
     src/opm/input/eclipse/Schedule/Well/WellMICPProperties.cpp
     src/opm/input/eclipse/Schedule/Well/WellPolymerProperties.cpp
-    src/opm/input/eclipse/Schedule/Well/WellBrineProperties.cpp
-    src/opm/input/eclipse/Schedule/Well/WellTracerProperties.cpp
-    src/opm/input/eclipse/Schedule/Well/WVFPEXP.cpp
     src/opm/input/eclipse/Schedule/Well/WellProductionProperties.cpp
     src/opm/input/eclipse/Schedule/Well/WellTestConfig.cpp
     src/opm/input/eclipse/Schedule/Well/WellTestState.cpp
+    src/opm/input/eclipse/Schedule/WellTraj/RigEclipseWellLogExtractor.cpp
+    src/opm/input/eclipse/Schedule/Well/WellTracerProperties.cpp
+    src/opm/input/eclipse/Schedule/Well/WList.cpp
+    src/opm/input/eclipse/Schedule/Well/WListManager.cpp
+    src/opm/input/eclipse/Schedule/Well/WVFPEXP.cpp
+    src/opm/input/eclipse/Schedule/WellTraj/RigEclipseWellLogExtractor.cpp
     src/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.cpp
     src/opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.cpp
     src/opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp
@@ -180,6 +230,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/EclipseState/Tables/Aqudims.cpp
     src/opm/input/eclipse/EclipseState/Tables/ColumnSchema.cpp
     src/opm/input/eclipse/EclipseState/Tables/DenT.cpp
+    src/opm/input/eclipse/EclipseState/Tables/JouleThomson.cpp
     src/opm/input/eclipse/EclipseState/Tables/Eqldims.cpp
     src/opm/input/eclipse/EclipseState/Tables/JFunc.cpp
     src/opm/input/eclipse/EclipseState/Tables/PvtxTable.cpp
@@ -198,7 +249,6 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.cpp
     src/opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.cpp
     src/opm/input/eclipse/EclipseState/Tables/BrineDensityTable.cpp
-    src/opm/input/eclipse/EclipseState/Tables/RwgsaltTable.cpp
     src/opm/input/eclipse/EclipseState/Tables/SolventDensityTable.cpp
     src/opm/input/eclipse/EclipseState/Tables/Tabdims.cpp
     src/opm/input/eclipse/Schedule/UDQ/UDQASTNode.cpp
@@ -219,6 +269,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Schedule/VFPInjTable.cpp
     src/opm/input/eclipse/Schedule/VFPProdTable.cpp
     src/opm/input/eclipse/Parser/ErrorGuard.cpp
+    src/opm/input/eclipse/Parser/InputErrorAction.cpp
     src/opm/input/eclipse/Parser/ParseContext.cpp
     src/opm/input/eclipse/Parser/Parser.cpp
     src/opm/input/eclipse/Parser/ParserEnums.cpp
@@ -231,13 +282,27 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Units/Dimension.cpp
     src/opm/input/eclipse/Units/UnitSystem.cpp
     src/opm/input/eclipse/Utility/Functional.cpp
+    src/opm/material/fluidmatrixinteractions/EclEpsConfig.cpp
+    src/opm/material/fluidmatrixinteractions/EclEpsGridProperties.cpp
+    src/opm/material/fluidmatrixinteractions/EclHysteresisConfig.cpp
+    src/opm/material/fluidmatrixinteractions/EclMaterialLawManager.cpp
+    src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerReadEffectiveParams.cpp
+    src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerInitParams.cpp
+    src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerHystParams.cpp
+    src/opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.cpp
+    src/opm/material/fluidsystems/blackoilpvt/Co2GasPvt.cpp
+    src/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.cpp
+    src/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.cpp
+    src/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.cpp
+    src/opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.cpp
+    src/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.cpp
+    src/opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.cpp
+    src/opm/material/fluidsystems/blackoilpvt/OilPvtThermal.cpp
+    src/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.cpp
+    src/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.cpp
+    src/opm/material/thermal/EclThermalLawManager.cpp
   )
 
-
-# This list is only used to register a CMake dependency between the the python
-# extension and the corresponding C++ wrapper files. The cpp files actually
-# listed here are repeated in the actual definition of the extension in the
-# setup.py file.
   list( APPEND PYTHON_CXX_SOURCE_FILES
           python/cxx/connection.cpp
           python/cxx/converters.cpp
@@ -301,6 +366,7 @@ if(ENABLE_ECL_OUTPUT)
           src/opm/io/eclipse/rst/connection.cpp
           src/opm/io/eclipse/rst/group.cpp
           src/opm/io/eclipse/rst/header.cpp
+          src/opm/io/eclipse/rst/netbalan.cpp
           src/opm/io/eclipse/rst/network.cpp
           src/opm/io/eclipse/rst/udq.cpp
           src/opm/io/eclipse/rst/segment.cpp
@@ -347,22 +413,44 @@ if(ENABLE_ECL_OUTPUT)
 endif()
 
 list (APPEND TEST_SOURCE_FILES
-      tests/test_ActiveGridCells.cpp
       tests/test_calculateCellVol.cpp
       tests/test_cmp.cpp
+      tests/test_ConditionalStorage.cpp
       tests/test_cubic.cpp
+      tests/test_EvaluationFormat.cpp
+      tests/test_densead.cpp
       tests/test_messagelimiter.cpp
       tests/test_nonuniformtablelinear.cpp
       tests/test_OpmInputError_format.cpp
       tests/test_OpmLog.cpp
       tests/test_param.cpp
       tests/test_RootFinders.cpp
+      tests/test_SegmentMatcher.cpp
       tests/test_sparsevector.cpp
       tests/test_uniformtablelinear.cpp
+      tests/material/test_2dtables.cpp
+      tests/material/test_blackoilfluidstate.cpp
+      tests/material/test_components.cpp
+      tests/material/test_fluidmatrixinteractions.cpp
+      tests/material/test_fluidsystems.cpp
+      tests/material/test_spline.cpp
+      tests/material/test_tabulation.cpp
 )
+
+# tests that need to be linked to dune-common
+list(APPEND DUNE_TEST_SOURCE_FILES
+      tests/material/test_co2brine_ptflash.cpp
+      tests/material/test_immiscibleflash.cpp
+      tests/material/test_ncpflash.cpp
+      tests/material/test_pengrobinson.cpp
+      tests/material/test_threecomponents_ptflash.cpp
+)
+
 if(ENABLE_ECL_INPUT)
   list(APPEND TEST_SOURCE_FILES
     tests/rst_test.cpp
+    tests/test_ActiveGridCells.cpp
+    tests/test_CopyablePtr.cpp
     tests/test_ERsm.cpp
     tests/test_GuideRate.cpp
     tests/test_RestartFileView.cpp
@@ -373,10 +461,16 @@ if(ENABLE_ECL_INPUT)
     tests/test_ESmry.cpp
     tests/test_EInit.cpp
     tests/test_ExtESmry.cpp
+    tests/test_Serialization.cpp
+    tests/material/test_co2brinepvt.cpp
+    tests/material/test_eclblackoilfluidsystem.cpp
+    tests/material/test_eclblackoilpvt.cpp
+    tests/material/test_eclmateriallawmanager.cpp
     tests/parser/ACTIONX.cpp
     tests/parser/ADDREGTests.cpp
     tests/parser/AquiferTests.cpp
     tests/parser/BoxTests.cpp
+    tests/parser/CarfinTests.cpp
     tests/parser/ColumnSchemaTests.cpp
     tests/parser/ConnectionTests.cpp
     tests/parser/COMPSEGUnits.cpp
@@ -445,6 +539,7 @@ if(ENABLE_ECL_INPUT)
     tests/parser/WriteRestartFileEventsTests.cpp
     tests/parser/WTEST.cpp)
 endif()
+
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_SOURCE_FILES
           tests/test_ActiveIndexByColumns.cpp
@@ -473,8 +568,8 @@ if(ENABLE_ECL_OUTPUT)
           tests/test_Restart.cpp
           tests/test_RFT.cpp
           tests/test_rst.cpp
+          tests/test_rst_netbalan.cpp
           tests/test_Solution.cpp
-          tests/test_Serializer.cpp
           tests/test_Inplace.cpp
           tests/test_Summary.cpp
           tests/test_Summary_Group.cpp
@@ -485,6 +580,8 @@ if(ENABLE_ECL_OUTPUT)
       )
 endif()
 
+list(APPEND TEST_SOURCE_FILES ${DUNE_TEST_SOURCE_FILES})
+
 list (APPEND TEST_DATA_FILES
       tests/testdata.param
 )
@@ -508,6 +605,7 @@ if(ENABLE_ECL_OUTPUT)
           tests/SPE1CASE1.SMSPEC
           tests/SPE1CASE1A.SMSPEC
           tests/SPE1CASE1B.DATA
+          tests/SPE1CASE1_WELTRAJ.DATA
           tests/props_spe1case1b.inc
           tests/SPE9_CP_PACKED.DATA
           tests/SOFR_TEST.DATA
@@ -598,6 +696,7 @@ if(ENABLE_ECL_INPUT)
     examples/rst_deck.cpp
     examples/wellgraph.cpp
     examples/make_ext_smry.cpp
+    examples/co2brinepvt.cpp
   )
 endif()
 
@@ -612,12 +711,14 @@ if(ENABLE_ECL_INPUT)
     examples/opmhash.cpp
     examples/rst_deck.cpp
     examples/make_esmry.cpp
+    examples/co2brinepvt.cpp
   )
 endif()
 
 list( APPEND PUBLIC_HEADER_FILES
       opm/common/ErrorMacros.hpp
       opm/common/Exceptions.hpp
+      opm/common/TimingMacros.hpp
       opm/common/OpmLog/CounterLog.hpp
       opm/common/OpmLog/EclipsePRTLog.hpp
       opm/common/OpmLog/LogBackend.hpp
@@ -630,10 +731,12 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/common/OpmLog/OpmLog.hpp
       opm/common/OpmLog/StreamLog.hpp
       opm/common/OpmLog/TimerLog.hpp
-      opm/common/utility/Serializer.hpp
       opm/common/utility/ActiveGridCells.hpp
+      opm/common/utility/Demangle.hpp
       opm/common/utility/FileSystem.hpp
       opm/common/utility/OpmInputError.hpp
+      opm/common/utility/Serializer.hpp
+      opm/common/utility/MemPacker.hpp
       opm/common/utility/numeric/cmp.hpp
       opm/common/utility/platform_dependent/disable_warnings.h
       opm/common/utility/platform_dependent/reenable_warnings.h
@@ -656,9 +759,279 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/common/utility/shmatch.hpp
       opm/common/utility/String.hpp
       opm/common/utility/TimeService.hpp
+      opm/material/components/Lnapl.hpp
+      opm/material/components/N2.hpp
+      opm/material/components/H2.hpp
+      opm/material/components/Unit.hpp
+      opm/material/components/iapws/Common.hpp
+      opm/material/components/iapws/Region1.hpp
+      opm/material/components/iapws/Region4.hpp
+      opm/material/components/iapws/Region2.hpp
+      opm/material/components/Dnapl.hpp
+      opm/material/components/NullComponent.hpp
+      opm/material/components/H2O.hpp
+      opm/material/components/TabulatedComponent.hpp
+      opm/material/components/Xylene.hpp
+      opm/material/components/SimpleH2O.hpp
+      opm/material/components/CO2.hpp
+      opm/material/components/Mesitylene.hpp
+      opm/material/components/SimpleCO2.hpp
+      opm/material/components/C10.hpp
+      opm/material/components/SimpleHuDuanH2O.hpp
+      opm/material/components/Component.hpp
+      opm/material/components/Air.hpp
+      opm/material/components/C1.hpp
+      opm/material/components/Brine.hpp
+      opm/material/fluidstates/BlackOilFluidState.hpp
+      opm/material/fluidstates/NonEquilibriumFluidState.hpp
+      opm/material/fluidstates/FluidStateSaturationModules.hpp
+      opm/material/fluidstates/FluidStateCompositionModules.hpp
+      opm/material/fluidstates/PressureOverlayFluidState.hpp
+      opm/material/fluidstates/CompositionalFluidState.hpp
+      opm/material/fluidstates/FluidStateEnthalpyModules.hpp
+      opm/material/fluidstates/FluidStatePressureModules.hpp
+      opm/material/fluidstates/ModularFluidState.hpp
+      opm/material/fluidstates/FluidStateTemperatureModules.hpp
+      opm/material/fluidstates/SimpleModularFluidState.hpp
+      opm/material/fluidstates/FluidStateViscosityModules.hpp
+      opm/material/fluidstates/TemperatureOverlayFluidState.hpp
+      opm/material/fluidstates/ImmiscibleFluidState.hpp
+      opm/material/fluidstates/SaturationOverlayFluidState.hpp
+      opm/material/fluidstates/FluidStateFugacityModules.hpp
+      opm/material/fluidstates/FluidStateDensityModules.hpp
+      opm/material/constraintsolvers/ComputeFromReferencePhase.hpp
+      opm/material/constraintsolvers/PTFlash.hpp
+      opm/material/constraintsolvers/CompositionFromFugacities.hpp
+      opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
+      opm/material/constraintsolvers/NcpFlash.hpp
+      opm/material/constraintsolvers/ImmiscibleFlash.hpp
+      opm/material/IdealGas.hpp
+      opm/material/binarycoefficients/H2O_Mesitylene.hpp
+      opm/material/binarycoefficients/H2O_Air.hpp
+      opm/material/binarycoefficients/H2O_N2.hpp
+      opm/material/binarycoefficients/Air_Mesitylene.hpp
+      opm/material/binarycoefficients/FullerMethod.hpp
+      opm/material/binarycoefficients/H2O_Xylene.hpp
+      opm/material/binarycoefficients/H2O_CO2.hpp
+      opm/material/binarycoefficients/Air_Xylene.hpp
+      opm/material/binarycoefficients/Brine_CO2.hpp
+      opm/material/binarycoefficients/HenryIapws.hpp
+      opm/material/Constants.hpp
+      opm/material/fluidsystems/NullParameterCache.hpp
+      opm/material/fluidsystems/BaseFluidSystem.hpp
+      opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp
+      opm/material/fluidsystems/ParameterCacheBase.hpp
+      opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
+      opm/material/fluidsystems/BrineCO2FluidSystem.hpp
+      opm/material/fluidsystems/GasPhase.hpp
+      opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
+      opm/material/fluidsystems/BlackOilFluidSystem.hpp
+      opm/material/fluidsystems/LiquidPhase.hpp
+      opm/material/fluidsystems/PTFlashParameterCache.hpp
+      opm/material/fluidsystems/Spe5ParameterCache.hpp
+      opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
+      opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
+      opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
+      opm/material/fluidsystems/Spe5FluidSystem.hpp
+      opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp
+      opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp
+      opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.hpp
+      opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp
+      opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp
+      opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/OilPvtThermal.hpp
+      opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.hpp
+      opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp
+      opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
+      opm/material/fluidsystems/H2OAirFluidSystem.hpp
+      opm/material/fluidsystems/H2ON2FluidSystem.hpp
+      opm/material/fluidmatrixinteractions/EclTwoPhaseMaterial.hpp
+      opm/material/fluidmatrixinteractions/SatCurveMultiplexerParams.hpp
+      opm/material/fluidmatrixinteractions/EclTwoPhaseMaterialParams.hpp
+      opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLawParams.hpp
+      opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp
+      opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchtenParams.hpp
+      opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp
+      opm/material/fluidmatrixinteractions/MaterialTraits.hpp
+      opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp
+      opm/material/fluidmatrixinteractions/VanGenuchten.hpp
+      opm/material/fluidmatrixinteractions/LinearMaterial.hpp
+      opm/material/fluidmatrixinteractions/ParkerLenhard.hpp
+      opm/material/fluidmatrixinteractions/SatCurveMultiplexer.hpp
+      opm/material/fluidmatrixinteractions/EclEpsGridProperties.hpp
+      opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLaw.hpp
+      opm/material/fluidmatrixinteractions/EclHysteresisConfig.hpp
+      opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp
+      opm/material/fluidmatrixinteractions/EclMultiplexerMaterialParams.hpp
+      opm/material/fluidmatrixinteractions/NullMaterial.hpp
+      opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp
+      opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp
+      opm/material/fluidmatrixinteractions/TwoPhaseLETCurvesParams.hpp
+      opm/material/fluidmatrixinteractions/EclStone2Material.hpp
+      opm/material/fluidmatrixinteractions/NullMaterialParams.hpp
+      opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp
+      opm/material/fluidmatrixinteractions/EclStone1Material.hpp
+      opm/material/fluidmatrixinteractions/EclMultiplexerMaterial.hpp
+      opm/material/fluidmatrixinteractions/EclStone1MaterialParams.hpp
+      opm/material/fluidmatrixinteractions/EclEpsConfig.hpp
+      opm/material/fluidmatrixinteractions/EclStone2MaterialParams.hpp
+      opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp
+      opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp
+      opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterial.hpp
+      opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp
+      opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
+      opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp
+      opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterialParams.hpp
+      opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLaw.hpp
+      opm/material/fluidmatrixinteractions/TwoPhaseLETCurves.hpp
+      opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
+      opm/material/fluidmatrixinteractions/DirectionalMaterialLawParams.hpp
+      opm/material/fluidmatrixinteractions/DirectionalMaterialLawParams.hpp
+      opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp
+      opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
+      opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchten.hpp
+      opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp
+      opm/material/fluidmatrixinteractions/BrooksCorey.hpp
+      opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp
+      opm/material/checkFluidSystem.hpp
+      opm/material/viscositymodels/LBC.hpp
+      opm/material/viscositymodels/LBCco2rich.hpp
+      opm/material/common/Valgrind.hpp
+      opm/material/common/EnsureFinalized.hpp
+      opm/material/common/quad.hpp
+      opm/material/common/Spline.hpp
+      opm/material/common/PolynomialUtils.hpp
+      opm/material/common/UniformXTabulated2DFunction.hpp
+      opm/material/common/MathToolbox.hpp
+      opm/material/common/TridiagonalMatrix.hpp
+      opm/material/common/ResetLocale.hpp
+      opm/material/common/HasMemberGeneratorMacros.hpp
+      opm/material/common/UniformTabulated2DFunction.hpp
+      opm/material/common/FastSmallVector.hpp
+      opm/material/common/ConditionalStorage.hpp
+      opm/material/common/Means.hpp
+      opm/material/common/IntervalTabulated2DFunction.hpp
+      opm/material/common/Tabulated1DFunction.hpp
+      opm/material/densead/Evaluation9.hpp
+      opm/material/densead/Evaluation8.hpp
+      opm/material/densead/Evaluation7.hpp
+      opm/material/densead/Evaluation.hpp
+      opm/material/densead/Evaluation5.hpp
+      opm/material/densead/Evaluation3.hpp
+      opm/material/densead/Evaluation4.hpp
+      opm/material/densead/Evaluation11.hpp
+      opm/material/densead/DynamicEvaluation.hpp
+      opm/material/densead/Math.hpp
+      opm/material/densead/Evaluation1.hpp
+      opm/material/densead/Evaluation12.hpp
+      opm/material/densead/Evaluation2.hpp
+      opm/material/densead/EvaluationFormat.hpp
+      opm/material/densead/EvaluationSpecializations.hpp
+      opm/material/densead/Evaluation10.hpp
+      opm/material/densead/Evaluation6.hpp
+      opm/material/eos/PengRobinson.hpp
+      opm/material/eos/PengRobinsonParams.hpp
+      opm/material/eos/PengRobinsonParamsMixture.hpp
+      opm/material/eos/PengRobinsonMixture.hpp
+      opm/material/thermal/ConstantSolidHeatCapLawParams.hpp
+      opm/material/thermal/ConstantSolidHeatCapLaw.hpp
+      opm/material/thermal/EclHeatcrLaw.hpp
+      opm/material/thermal/SomertonThermalConductionLawParams.hpp
+      opm/material/thermal/EclThcLawParams.hpp
+      opm/material/thermal/EclSpecrockLawParams.hpp
+      opm/material/thermal/EclThconrLaw.hpp
+      opm/material/thermal/EclThconrLawParams.hpp
+      opm/material/thermal/FluidThermalConductionLaw.hpp
+      opm/material/thermal/EclThcLaw.hpp
+      opm/material/thermal/FluidThermalConductionLawParams.hpp
+      opm/material/thermal/EclHeatcrLawParams.hpp
+      opm/material/thermal/NullThermalConductionLaw.hpp
+      opm/material/thermal/EclSolidEnergyLawMultiplexer.hpp
+      opm/material/thermal/EclThermalConductionLawMultiplexerParams.hpp
+      opm/material/thermal/EclThermalConductionLawMultiplexer.hpp
+      opm/material/thermal/EclSolidEnergyLawMultiplexerParams.hpp
+      opm/material/thermal/EclThermalLawManager.hpp
+      opm/material/thermal/SomertonThermalConductionLaw.hpp
+      opm/material/thermal/EclSpecrockLaw.hpp
+      opm/material/thermal/NullSolidEnergyLaw.hpp
 )
+
 if(ENABLE_ECL_INPUT)
   list(APPEND PUBLIC_HEADER_FILES
+       external/resinsight/CommonCode/cvfStructGrid.h
+       external/resinsight/LibCore/cvfArray.h
+       external/resinsight/LibCore/cvfArrayWrapperConst.h
+       external/resinsight/LibCore/cvfAssert.h
+       external/resinsight/LibCore/cvfAtomicCounter.h
+       external/resinsight/LibCore/cvfBase.h
+       external/resinsight/LibCore/cvfBase64.h
+       external/resinsight/LibCore/cvfCharArray.h
+       external/resinsight/LibCore/cvfCodeLocation.h
+       external/resinsight/LibCore/cvfCollection.h
+       external/resinsight/LibCore/cvfColor3.h
+       external/resinsight/LibCore/cvfColor4.h
+       external/resinsight/LibCore/cvfConfigCore.h
+       external/resinsight/LibCore/cvfDebugTimer.h
+       external/resinsight/LibCore/cvfFlags.h
+       external/resinsight/LibCore/cvfFunctorRange.h
+       external/resinsight/LibCore/cvfLibCore.h
+       external/resinsight/LibCore/cvfLogDestination.h
+       external/resinsight/LibCore/cvfLogger.h
+       external/resinsight/LibCore/cvfMath.h
+       external/resinsight/LibCore/cvfMatrix3.h
+       external/resinsight/LibCore/cvfMatrix4.h
+       external/resinsight/LibCore/cvfObject.h
+       external/resinsight/LibCore/cvfPlane.h
+       external/resinsight/LibCore/cvfPropertySet.h
+       external/resinsight/LibCore/cvfQuat.h
+       external/resinsight/LibCore/cvfRect.h
+       external/resinsight/LibCore/cvfString.h
+       external/resinsight/LibCore/cvfSystem.h
+       external/resinsight/LibCore/cvfTBBControl.h
+       external/resinsight/LibCore/cvfTimer.h
+       external/resinsight/LibCore/cvfTrace.h
+       external/resinsight/LibCore/cvfValueArray.h
+       external/resinsight/LibCore/cvfVector2.h
+       external/resinsight/LibCore/cvfVector3.h
+       external/resinsight/LibCore/cvfVector4.h
+       external/resinsight/LibCore/cvfVersion.h
+       external/resinsight/LibGeometry/cvfBoundingBox.h
+       external/resinsight/LibGeometry/cvfBoundingBoxTree.h
+       external/resinsight/LibGeometry/cvfRay.h
+       external/resinsight/ReservoirDataModel/RigCellGeometryTools.h
+       #external/resinsight/ReservoirDataModel/RigEclipseCaseData.h
+       external/resinsight/ReservoirDataModel/RigHexIntersectionTools.h
+       #external/resinsight/ReservoirDataModel/RigMainGrid.h
+       external/resinsight/ReservoirDataModel/RigWellLogExtractionTools.h
+       external/resinsight/ReservoirDataModel/RigWellLogExtractor.h
+       external/resinsight/ReservoirDataModel/RigWellPath.h
+       #external/resinsight/ReservoirDataModel/RigWellPathIntersectionTools.h
+       external/resinsight/ReservoirDataModel/cvfGeometryTools.h
+       external/resinsight/cafHexGridIntersectionTools/cafHexGridIntersectionTools.h
+       external/resinsight/cafPdmCore/cafAppEnum.h
+       external/resinsight/cafPdmCore/cafAssert.h
+       external/resinsight/cafPdmCore/cafSignal.h
+       external/resinsight/LibCore/cvfArray.inl
+       external/resinsight/LibCore/cvfCollection.inl
+       external/resinsight/LibCore/cvfFlags.inl
+       external/resinsight/LibCore/cvfMath.inl
+       external/resinsight/LibCore/cvfMatrix3.inl
+       external/resinsight/LibCore/cvfMatrix4.inl
+       external/resinsight/LibCore/cvfObject.inl
+       external/resinsight/LibCore/cvfQuat.inl
+       external/resinsight/LibCore/cvfRect.inl
+       external/resinsight/LibCore/cvfVector2.inl
+       external/resinsight/LibCore/cvfVector3.inl
+       external/resinsight/LibCore/cvfVector4.inl
+       external/resinsight/ReservoirDataModel/cvfGeometryTools.inl
        opm/io/eclipse/SummaryNode.hpp
        opm/json/JsonObject.hpp
        opm/input/eclipse/Utility/Functional.hpp
@@ -694,11 +1067,14 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp
        opm/input/eclipse/EclipseState/Grid/Fault.hpp
        opm/input/eclipse/EclipseState/Grid/Box.hpp
+       opm/input/eclipse/EclipseState/Grid/Carfin.hpp
+       opm/input/eclipse/EclipseState/Grid/FieldProps.hpp
        opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp
        opm/input/eclipse/EclipseState/Grid/FaultFace.hpp
        opm/input/eclipse/EclipseState/Grid/NNC.hpp
        opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp
        opm/input/eclipse/EclipseState/Grid/BoxManager.hpp
+       opm/input/eclipse/EclipseState/Grid/CarfinManager.hpp
        opm/input/eclipse/EclipseState/Grid/FaceDir.hpp
        opm/input/eclipse/EclipseState/Grid/MapAxes.hpp
        opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp
@@ -706,6 +1082,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/TracerConfig.hpp
        opm/input/eclipse/EclipseState/MICPpara.hpp
        opm/input/eclipse/EclipseState/Tables/DenT.hpp
+       opm/input/eclipse/EclipseState/Tables/JouleThomson.hpp
        opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp
        opm/input/eclipse/EclipseState/Tables/StandardCond.hpp
        opm/input/eclipse/EclipseState/Tables/PolyInjTable.hpp
@@ -755,6 +1132,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/Tables/WatvisctTable.hpp
        opm/input/eclipse/EclipseState/Tables/TableEnums.hpp
        opm/input/eclipse/EclipseState/Tables/RvvdTable.hpp
+       opm/input/eclipse/EclipseState/Tables/RvwvdTable.hpp
        opm/input/eclipse/EclipseState/Tables/TableContainer.hpp
        opm/input/eclipse/EclipseState/Tables/AqutabTable.hpp
        opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp
@@ -769,6 +1147,8 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/Tables/PvdoTable.hpp
        opm/input/eclipse/EclipseState/Tables/OilvisctTable.hpp
        opm/input/eclipse/EclipseState/Tables/SgfnTable.hpp
+       opm/input/eclipse/EclipseState/Tables/WsfTable.hpp
+       opm/input/eclipse/EclipseState/Tables/GsfTable.hpp
        opm/input/eclipse/EclipseState/Tables/MiscTable.hpp
        opm/input/eclipse/EclipseState/Tables/SgwfnTable.hpp
        opm/input/eclipse/EclipseState/Tables/PvdsTable.hpp
@@ -791,6 +1171,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/EclipseConfig.hpp
        opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp
        opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.hpp
+       opm/input/eclipse/EclipseState/Aquifer/AquiferFlux.hpp
        opm/input/eclipse/EclipseState/Aquifer/AquiferCT.hpp
        opm/input/eclipse/EclipseState/Aquifer/Aquifetp.hpp
        opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp
@@ -820,12 +1201,13 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/VFPInjTable.hpp
        opm/input/eclipse/Schedule/VFPProdTable.hpp
        opm/input/eclipse/Schedule/Well/Connection.hpp
-       opm/input/eclipse/Schedule/Well/ProductionControls.hpp
-       opm/input/eclipse/Schedule/Well/InjectionControls.hpp
        opm/input/eclipse/Schedule/Well/PAvg.hpp
        opm/input/eclipse/Schedule/Well/PAvgCalculator.hpp
        opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.hpp
        opm/input/eclipse/Schedule/Well/Well.hpp
+       opm/input/eclipse/Schedule/Well/WellEnums.hpp
+       opm/input/eclipse/Schedule/Well/WellInjectionControls.hpp
+       opm/input/eclipse/Schedule/Well/WellProductionControls.hpp
        opm/input/eclipse/Schedule/Well/WList.hpp
        opm/input/eclipse/Schedule/Well/NameOrder.hpp
        opm/input/eclipse/Schedule/Well/WellMatcher.hpp
@@ -833,15 +1215,14 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/Well/WellEconProductionLimits.hpp
        opm/input/eclipse/Schedule/Well/WellFoamProperties.hpp
        opm/input/eclipse/Schedule/Well/WellBrineProperties.hpp
-       opm/input/eclipse/Schedule/Well/WellInjectionProperties.hpp
        opm/input/eclipse/Schedule/Well/WellMICPProperties.hpp
        opm/input/eclipse/Schedule/Well/WellPolymerProperties.hpp
-       opm/input/eclipse/Schedule/Well/WellProductionProperties.hpp
        opm/input/eclipse/Schedule/Well/WellTracerProperties.hpp
        opm/input/eclipse/Schedule/Well/WVFPEXP.hpp
        opm/input/eclipse/Schedule/Well/WellTestConfig.hpp
        opm/input/eclipse/Schedule/Well/WellTestState.hpp
        opm/input/eclipse/Schedule/Well/WellConnections.hpp
+       opm/input/eclipse/Schedule/WellTraj/RigEclipseWellLogExtractor.hpp
        opm/input/eclipse/Schedule/SummaryState.hpp
        opm/input/eclipse/Schedule/RFTConfig.hpp
        opm/input/eclipse/Schedule/RPTConfig.hpp
@@ -867,7 +1248,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/OilVaporizationProperties.hpp
        opm/input/eclipse/Schedule/MSW/icd.hpp
        opm/input/eclipse/Schedule/MSW/Segment.hpp
-       opm/input/eclipse/Schedule/MSW/Segment.hpp
+       opm/input/eclipse/Schedule/MSW/SegmentMatcher.hpp
        opm/input/eclipse/Schedule/MSW/WellSegments.hpp
        opm/input/eclipse/Schedule/MSW/AICD.hpp
        opm/input/eclipse/Schedule/MSW/SICD.hpp
@@ -878,6 +1259,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/MSW/Valve.hpp
        opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp
        opm/input/eclipse/EclipseState/checkDeck.hpp
+       opm/input/eclipse/EclipseState/Phase.hpp
        opm/input/eclipse/EclipseState/Runspec.hpp
        opm/input/eclipse/Schedule/UDQ/UDQAssign.hpp
        opm/input/eclipse/Schedule/UDQ/UDQASTNode.hpp
@@ -931,6 +1313,7 @@ if(ENABLE_ECL_OUTPUT)
         opm/io/eclipse/rst/connection.hpp
         opm/io/eclipse/rst/group.hpp
         opm/io/eclipse/rst/header.hpp
+        opm/io/eclipse/rst/netbalan.hpp
         opm/io/eclipse/rst/network.hpp
         opm/io/eclipse/rst/segment.hpp
         opm/io/eclipse/rst/state.hpp
@@ -985,6 +1368,7 @@ if(ENABLE_ECL_OUTPUT)
         opm/output/eclipse/WriteRPT.hpp
         opm/output/eclipse/WriteRestartHelpers.hpp
         opm/output/OutputWriter.hpp
+        opm/utility/CopyablePtr.hpp
         opm/utility/EModel.hpp
         )
 endif()

CopyHeaders.cmake

@@ -31,4 +31,10 @@ foreach (name A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
                             ${BASE_DIR}/tmp_gen/ParserKeywords/${name}.cpp
                             ${BASE_DIR}/ParserKeywords/${name}.cpp)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                            ${BASE_DIR}/tmp_gen/ParserKeywords/ParserInit${name}.cpp
+                            ${BASE_DIR}/ParserKeywords/ParserInit${name}.cpp)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                            ${BASE_DIR}/tmp_gen/ParserKeywords/Builtin${name}.cpp
+                            ${BASE_DIR}/ParserKeywords/Builtin${name}.cpp)
 endforeach()

ExtraTests.cmake

@@ -42,6 +42,7 @@ opm_add_test(EclipseStateTests
 list(APPEND EXTRA_TESTS EclipseStateTests)
 
 foreach (test BoxTest
+              CarfinTest
               CheckDeckValidity
               EclipseGridCreateFromDeck
               IncludeTest
@@ -59,16 +60,6 @@ foreach (test BoxTest
   list(APPEND EXTRA_TESTS ${test})
 endforeach ()
 
-opm_add_test( rst_spe1
-              SOURCES tests/rst_test.cpp
-              LIBRARIES ${TEST_LIBS}
-              TEST_ARGS tests/SPE1CASE2.DATA tests/SPE1CASE2_RESTART.DATA )
-
-opm_add_test( rst_msw
-              SOURCES tests/rst_test.cpp
-              LIBRARIES ${TEST_LIBS}
-              TEST_ARGS tests/MSW.DATA tests/MSW_RESTART.DATA )
-
 add_test( NAME rst_deck_test
           COMMAND ${PROJECT_SOURCE_DIR}/tests/rst_test_driver.sh ${PROJECT_BINARY_DIR}/bin/rst_deck ${PROJECT_BINARY_DIR}/bin/opmhash
           ${PROJECT_SOURCE_DIR}/tests/SPE1CASE2_INCLUDE.DATA)
@@ -104,8 +95,6 @@ if(HAVE_OPM_TESTS)
                 ${OPM_TESTS_ROOT}/spe9/SPE9_CP_GROUP.DATA
                 ${OPM_TESTS_ROOT}/spe9/SPE9_CP_SHORT.DATA
                 ${OPM_TESTS_ROOT}/spe9/SPE9.DATA
-                ${OPM_TESTS_ROOT}/spe10model1/SPE10_MODEL1.DATA
-                ${OPM_TESTS_ROOT}/spe10model2/SPE10_MODEL2.DATA
                 ${OPM_TESTS_ROOT}/msw_2d_h/2D_H__.DATA
                 ${OPM_TESTS_ROOT}/model2/0_BASE_MODEL2.DATA
                 ${OPM_TESTS_ROOT}/model2/1_MULTREGT_MODEL2.DATA

GenerateKeywords.cmake

@@ -11,6 +11,7 @@ set(genkw_SOURCES src/opm/json/JsonObject.cpp
                   src/opm/input/eclipse/Deck/DeckOutput.cpp
                   src/opm/input/eclipse/Generator/KeywordGenerator.cpp
                   src/opm/input/eclipse/Generator/KeywordLoader.cpp
+                  src/opm/input/eclipse/Schedule/UDQ/UDQEnums.cpp
                   src/opm/input/eclipse/Parser/ErrorGuard.cpp
                   src/opm/input/eclipse/Parser/ParseContext.cpp
                   src/opm/input/eclipse/Parser/ParserEnums.cpp
@@ -24,6 +25,7 @@ set(genkw_SOURCES src/opm/json/JsonObject.cpp
                   src/opm/input/eclipse/Units/UnitSystem.cpp
                   src/opm/common/utility/OpmInputError.cpp
                   src/opm/common/utility/shmatch.cpp
+                  src/opm/common/utility/String.cpp
                   src/opm/common/OpmLog/OpmLog.cpp
                   src/opm/common/OpmLog/Logger.cpp
                   src/opm/common/OpmLog/StreamLog.cpp
@@ -51,76 +53,35 @@ set( genkw_argv keyword_list.argv
   opm/input/eclipse/Parser/ParserKeywords
   ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp)
 
-set( _tmp_output
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/A.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/B.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/C.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/D.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/E.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/F.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/G.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/H.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/I.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/J.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/K.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/L.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/M.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/N.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/O.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/P.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/Q.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/R.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/S.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/T.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/U.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/V.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/W.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/X.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/Y.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/Z.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserInit.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp)
+foreach (name A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
+  list(APPEND _tmp_output ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/${name}.cpp
+                          ${PROJECT_BINARY_DIR}/tmp_gen/include/opm/input/eclipse/Parser/ParserKeywords/${name}.hpp
+                          ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/ParserInit${name}.cpp
+                          ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/Builtin${name}.cpp
+                          ${PROJECT_BINARY_DIR}/tmp_gen/include/opm/input/eclipse/Parser/ParserKeywords/ParserInit${name}.hpp)
+  list(APPEND _target_output ${PROJECT_BINARY_DIR}/ParserKeywords/${name}.cpp
+                             ${PROJECT_BINARY_DIR}/include/opm/input/eclipse/Parser/ParserKeywords/${name}.hpp
+                             ${PROJECT_BINARY_DIR}/ParserKeywords/ParserInit${name}.cpp
+                             ${PROJECT_BINARY_DIR}/ParserKeywords/Builtin${name}.cpp
+                             ${PROJECT_BINARY_DIR}/include/opm/input/eclipse/Parser/ParserKeywords/ParserInit${name}.hpp)
+endforeach()
 
+foreach(name TestKeywords.cpp ParserInit.cpp)
+  list(APPEND _target_output ${PROJECT_BINARY_DIR}/${name})
+  list(APPEND _tmp_output ${PROJECT_BINARY_DIR}/tmp_gen/${name})
+endforeach()
 
-set( _target_output
-  ${PROJECT_BINARY_DIR}/ParserKeywords/A.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/B.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/C.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/D.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/E.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/F.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/G.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/H.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/I.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/J.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/K.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/L.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/M.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/N.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/O.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/P.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/Q.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/R.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/S.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/T.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/U.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/V.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/W.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/X.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/Y.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/Z.cpp
-  ${PROJECT_BINARY_DIR}/TestKeywords.cpp
-  ${PROJECT_BINARY_DIR}/ParserInit.cpp)
-
+list(APPEND _target_output ${PROJECT_BINARY_DIR}/include/opm/input/eclipse/Parser/ParserKeywords/Builtin.hpp)
+list(APPEND _tmp_output ${PROJECT_BINARY_DIR}/tmp_gen/include/opm/input/eclipse/Parser/ParserKeywords/Builtin.hpp)
 
+set(GEN_DEPS ${_tmp_output})
 if (OPM_ENABLE_PYTHON)
   list(APPEND genkw_argv ${PROJECT_BINARY_DIR}/tmp_gen/builtin_pybind11.cpp)
   list(APPEND _tmp_output ${PROJECT_BINARY_DIR}/tmp_gen/builtin_pybind11.cpp)
   list(APPEND _target_output ${PROJECT_BINARY_DIR}/python/cxx/builtin_pybind11.cpp)
+  list(APPEND GEN_DEPS copy_python)
 endif()
 
-
-
 add_custom_command( OUTPUT
   ${_tmp_output}
   COMMAND genkw ${genkw_argv}
@@ -129,5 +90,5 @@ add_custom_command( OUTPUT
 # To avoid some rebuilds
 add_custom_command(OUTPUT
   ${_target_output}
-  DEPENDS ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/A.cpp
+  DEPENDS ${GEN_DEPS}
   COMMAND ${CMAKE_COMMAND} -DBASE_DIR=${PROJECT_BINARY_DIR} -P ${PROJECT_SOURCE_DIR}/CopyHeaders.cmake)

cmake/Modules/FindMETIS.cmake

@@ -46,8 +46,8 @@ if (METIS_INCLUDE_DIRS OR METIS_LIBRARIES)
   file(READ "${METIS_INCLUDE_DIRS}/metis.h" metisheader)
   string(REGEX MATCH "#define METIS_VER_MAJOR[ ]+([0-9]+)" METIS_MAJOR_VERSION ${metisheader})
   if(NOT METIS_API_VERSION AND METIS_MAJOR_VERSION)
-#    string(REGEX REPLACE ".*#define METIS_VER_MAJOR[ ]+([0-9]+).*" "\\1"
-#    METIS_MAJOR_VERSION "${metisheader}")
+    string(REGEX REPLACE ".*#define METIS_VER_MAJOR[ ]+([0-9]+).*" "\\1"
+    METIS_MAJOR_VERSION "${metisheader}")
     if(METIS_MAJOR_VERSION GREATER_EQUAL 3 AND METIS_MAJOR_VERSION LESS 5)
       set(METIS_API_VERSION "3")
     else()
@@ -55,11 +55,13 @@ if (METIS_INCLUDE_DIRS OR METIS_LIBRARIES)
     endif()
   endif()
 
-  add_library(METIS::METIS UNKNOWN IMPORTED)
-  set_target_properties(METIS::METIS PROPERTIES
-    IMPORTED_LOCATION ${METIS_LIBRARIES}
-    INTERFACE_INCLUDE_DIRECTORIES ${METIS_INCLUDE_DIRS}
-    INTERFACE_COMPILE_DEFINITIONS METIS_API_VERSION=${METIS_API_VERSION})
+  if (NOT TARGET METIS::METIS)
+    add_library(METIS::METIS UNKNOWN IMPORTED)
+    set_target_properties(METIS::METIS PROPERTIES
+      IMPORTED_LOCATION ${METIS_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${METIS_INCLUDE_DIRS}
+      INTERFACE_COMPILE_DEFINITIONS METIS_API_VERSION=${METIS_API_VERSION})
+  endif()
 endif()
 
 # print a message to indicate status of this package

cmake/Modules/FindQuadMath.cmake

@@ -0,0 +1,49 @@
+# Module that checks whether the compiler supports the
+# quadruple precision floating point math
+#
+# Adds target QuadMath::QuadMath if found
+#
+# perform tests
+include(CheckCXXSourceCompiles)
+include(CMakePushCheckState)
+cmake_push_check_state()
+set(CMAKE_REQUIRED_LIBRARIES quadmath)
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+  set(CMAKE_REQUIRED_FLAGS "-fext-numeric-literals")
+endif()
+check_cxx_source_compiles("
+#include <quadmath.h>
+
+int main ()
+{
+  __float128 r = 1.0q;
+  r = strtoflt128(\"1.2345678\", NULL);
+  return 0;
+}" QuadMath_COMPILES)
+cmake_pop_check_state()  # Reset CMAKE_REQUIRED_XXX variables
+
+if(QuadMath_COMPILES)
+  # Use additional variable for better report message
+  set(QuadMath_VAR "(Supported by compiler)")
+endif()
+
+# Report that package was found
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QuadMath
+  DEFAULT_MSG
+  QuadMath_VAR QuadMath_COMPILES
+)
+
+# add imported target for quadmath
+if(QuadMath_FOUND AND NOT TARGET QuadMath::QuadMath)
+  # Compiler supports QuadMath: Add appropriate linker flag
+  add_library(QuadMath::QuadMath INTERFACE IMPORTED)
+  target_link_libraries(QuadMath::QuadMath INTERFACE quadmath)
+
+  target_compile_definitions(QuadMath::QuadMath INTERFACE
+    _GLIBCXX_USE_FLOAT128 HAVE_QUAD=1
+  )
+  target_compile_options(QuadMath::QuadMath INTERFACE
+    $<$<CXX_COMPILER_ID:GNU>:-fext-numeric-literals>
+  )
+endif()

cmake/Modules/FindQuadmath.cmake

@@ -1,54 +0,0 @@
-# Module that checks whether the compiler supports the
-# quadruple precision floating point math
-#
-# Sets the following variables:
-# HAVE_QUAD
-# QUADMATH_LIBRARIES
-#
-# perform tests
-include(CheckCSourceCompiles)
-include(CheckCXXSourceCompiles)
-include(CMakePushCheckState)
-include(CheckCXXCompilerFlag)
-
-if(NOT DEFINED USE_QUADMATH OR USE_QUADMATH)
-  if(NOT DEFINED HAVE_EXTENDED_NUMERIC_LITERALS)
-    check_cxx_compiler_flag("-Werror -fext-numeric-literals" HAVE_EXTENDED_NUMERIC_LITERALS)
-  endif()
-
-  if (HAVE_EXTENDED_NUMERIC_LITERALS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
-  endif()
-
-  cmake_push_check_state(RESET)
-  list(APPEND CMAKE_REQUIRED_LIBRARIES "quadmath")
-  CHECK_CXX_SOURCE_COMPILES("
-#include <quadmath.h>
-
-int main(void){
-    __float128 foo = sqrtq(123.456);
-    foo = FLT128_MIN;
-}" QUADMATH_FOUND)
-  cmake_pop_check_state()
-
-  if (QUADMATH_FOUND)
-    set(QUADMATH_LIBRARIES "quadmath")
-    set(HAVE_QUAD "${QUADMATH_FOUND}")
-    add_library(QuadMath::QuadMath INTERFACE IMPORTED)
-    set_target_properties(QuadMath::QuadMath PROPERTIES
-      INTERFACE_LINK_LIBRARIES quadmath
-      INTERFACE_COMPILE_DEFINITIONS _GLIBCXX_USE_FLOAT128
-      INTERFACE_COMPILE_OPTIONS $<$<CXX_COMPILER_ID:GNU>:-fext-numeric-literals>)
-  endif()
-endif()
-
-if (USE_QUADMATH AND NOT QUADMATH_FOUND)
-  message(FATAL_ERROR "Quadruple precision math support was explicitly requested but is unavailable!")
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Quadmath
-  DEFAULT_MSG
-  QUADMATH_LIBRARIES
-  HAVE_QUAD
-  )

cmake/Modules/FindValgrind.cmake

@@ -3,13 +3,10 @@
 # This module defines:
 #  VALGRIND_INCLUDE_DIR, where to find valgrind/memcheck.h, etc.
 #  VALGRIND_PROGRAM, the valgrind executable.
-#  VALGRIND_FOUND, If false, do not try to use valgrind.
+#  Valgrind_FOUND, If false, do not try to use valgrind.
 #
 # If you have valgrind installed in a non-standard place, you can define
 # VALGRIND_ROOT to tell cmake where it is.
-if (VALGRIND_FOUND)
-  return()
-endif()
 
 find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h
   /usr/include /usr/local/include ${VALGRIND_ROOT}/include)
@@ -18,7 +15,7 @@ find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h
 # path, but this does not hurt...
 find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin)
 
-find_package_handle_standard_args(VALGRIND DEFAULT_MSG
+find_package_handle_standard_args(Valgrind DEFAULT_MSG
   VALGRIND_INCLUDE_DIR
   VALGRIND_PROGRAM)
 

cmake/Modules/FindZOLTAN.cmake

@@ -24,7 +24,7 @@ find_package(PTScotch)
 #find_package(ParMETIS)
 
 # search for files which implements this module
-find_path (ZOLTAN_INCLUDE_DIRS
+find_path (ZOLTAN_INCLUDE_DIR
   NAMES "zoltan.h"
   PATHS ${ZOLTAN_SEARCH_PATH}
   PATH_SUFFIXES include trilinos
@@ -35,7 +35,7 @@ if (CMAKE_SIZEOF_VOID_P)
   math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
 endif (CMAKE_SIZEOF_VOID_P)
 
-find_library(ZOLTAN_LIBRARIES
+find_library(ZOLTAN_LIBRARY
   NAMES zoltan trilinos_zoltan
   PATHS ${ZOLTAN_SEARCH_PATH}
   PATH_SUFFIXES "lib/.libs" "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
@@ -50,15 +50,20 @@ include (FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(ZOLTAN
   DEFAULT_MSG
-  ZOLTAN_LIBRARIES
-  ZOLTAN_INCLUDE_DIRS
+  ZOLTAN_LIBRARY
+  ZOLTAN_INCLUDE_DIR
   MPI_FOUND
   )
 
 if (ZOLTAN_FOUND)
   set(HAVE_ZOLTAN 1)
-  set(ZOLTAN_LIBRARIES ${ZOLTAN_LIBRARIES} ${PARMETIS_LIBRARIES} ${PTSCOTCH_LIBRARIES})
-  set(ZOLTAN_INCLUDE_DIRS ${ZOLTAN_INCLUDE_DIRS} ${PARMETIS_INCLUDE_DIRS}
+  set(ZOLTAN_LIBRARIES ${ZOLTAN_LIBRARY} ${PARMETIS_LIBRARIES} ${PTSCOTCH_LIBRARIES})
+  set(ZOLTAN_INCLUDE_DIRS ${ZOLTAN_INCLUDE_DIR} ${PARMETIS_INCLUDE_DIRS}
       ${PTSCOTCH_INCLUDE_DIRS})
+  # log result
+  file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+    "Determing location of ZOLTAN succeeded:\n"
+    "  Include directory: ${ZOLTAN_INCLUDE_DIRS}\n"
+    "  Library directory: ${ZOLTAN_LIBRARIES}\n\n")
 endif()
 

cmake/Modules/Finddune-fem.cmake

@@ -22,10 +22,11 @@ find_opm_package (
   "dune-common REQUIRED;
    dune-grid  REQUIRED;
    dune-alugrid;
+   dune-polygongrid;
    ZLIB;
    ZOLTAN;
    METIS;
-   Quadmath
+   QuadMath
   "
   # header to search for
   "dune/fem/space/shapefunctionset/legendre.hh"

cmake/Modules/Finddune-istl.cmake

@@ -19,7 +19,7 @@ find_opm_package (
   "dune-common REQUIRED;
   ParMETIS;
   SuperLU;
-  SuiteSparse COMPONENTS umfpack
+  SuiteSparse COMPONENTS umfpack REQUIRED
   "
   # header to search for
   "dune/istl/bcrsmatrix.hh"

cmake/Modules/Finddune-polygongrid.cmake

@@ -0,0 +1,47 @@
+# - Find DUNE Fem library
+#
+# Defines the following variables:
+#   dune-polygongrid_INCLUDE_DIRS    Directory of header files
+#   dune-polygongrid_LIBRARIES       Directory of shared object files
+#   dune-polygongrid_DEFINITIONS     Defines that must be set to compile
+#   dune-alugrid_CONFIG_VARS     List of defines that should be in config.h
+#   HAVE_DUNE_POLYGONGRID            Binary value to use in config.h
+
+# Copyright (C) 2015 IRIS AS
+# This code is licensed under The GNU General Public License v3.0
+
+include (OpmPackage)
+find_opm_package (
+  # module name
+  "dune-polygongrid"
+
+  # dependencies
+  # TODO: we should probe for all the HAVE_* values listed below;
+  # however, we don't actually use them in our implementation, so
+  # we just include them to forward here in case anyone else does
+  "dune-common REQUIRED;
+  "
+  # header to search for
+  "dune/polygongrid/mesh.hh"
+
+  # library to search for
+  "dunepolygongrid"
+
+  # defines to be added to compilations
+  ""
+
+  # test program
+"#include <dune/polygongrid/mesh.hh>
+int main (void) {
+   return 0;
+}
+"
+# config variables
+  "HAVE_DUNE_POLYGONGRID
+  ")
+
+#debug_find_vars ("dune-polygongrid")
+
+# make version number available in config.h
+include (UseDuneVer)
+find_dune_version ("dune" "polygongrid")

cmake/Modules/OpmCompile.cmake

@@ -38,7 +38,7 @@ macro (opm_compile opm)
   endif()
   set (${opm}_VERSION "${${opm}_VERSION_MAJOR}.${${opm}_VERSION_MINOR}")
   if (${opm}_SOURCES)
-        add_library (${${opm}_TARGET} ${${opm}_LIBRARY_TYPE} ${${opm}_SOURCES})
+        add_library (${${opm}_TARGET} ${${opm}_LIBRARY_TYPE} ${${opm}_SOURCES} ${${opm}_HEADERS})
         set_target_properties (${${opm}_TARGET} PROPERTIES
           SOVERSION ${${opm}_VERSION}
           VERSION ${${opm}_VERSION}

cmake/Modules/OpmFind.cmake

@@ -128,35 +128,41 @@ macro (find_and_append_package_to prefix name)
     # We even need to repeat the search for opm-common once as this is done
     # in the top most CMakeLists.txt without querying defines, setting dependencies
     # and the likes which is only done via opm_find_package
-    if ( (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND )
-         OR _search_components GREATER -1)
-      string(REGEX MATCH "(opm)-.*" _is_opm ${name})
-      if(NOT _is_opm)
-        # When using Boost >= 1.70 and e.g. CMake 3.18 we need to make sure that
-        # subsequent searches are using config mode too. Otherwise the library
-        # list will be completely messed up. We use a set Boost_Dir to detect that
-        # previous searches were done using config mode.
-        if("${name}" STREQUAL "Boost" AND Boost_DIR)
-          set(_CONFIG_MODE CONFIG)
-        else()
-          set(_CONFIG_MODE "")
-        endif()
-        find_package (${name} ${ARGN} ${_CONFIG_MODE})
+    string(REGEX MATCH "(opm)-.*" _is_opm ${name})
+    if(NOT _is_opm)
+      # When using Boost >= 1.70 and e.g. CMake 3.18 we need to make sure that
+      # subsequent searches are using config mode too. Otherwise the library
+      # list will be completely messed up. We use a set Boost_Dir to detect that
+      # previous searches were done using config mode.
+      if("${name}" STREQUAL "Boost" AND Boost_DIR)
+        set(_CONFIG_MODE CONFIG)
       else()
-        if(${name}_DIR)
-          find_package (${name} ${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR} ${ARGN} NO_MODULE PATHS ${${name}_DIR} NO_DEFAULT_PATH)
-        else()
-          find_package (${name} ${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR} ${ARGN} NO_MODULE)
-        endif()
-        include(FindPackageHandleStandardArgs)
-        if(${name}_FOUND AND ${name}_LIBRARY STREQUAL "")
-          find_package_handle_standard_args(${name}
-                                            REQUIRED_VARS ${name}_INCLUDE_DIRS)
-        else()
-          find_package_handle_standard_args(${name}
-                                            REQUIRED_VARS ${name}_LIBRARY)
-        endif()
-      endif ()
+        set(_CONFIG_MODE "")
+      endif()
+      find_package (${name} ${ARGN} ${_CONFIG_MODE})
+    else()
+      if(${name}_DIR)
+        find_package (${name} ${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR} ${ARGN} NO_MODULE PATHS ${${name}_DIR} NO_DEFAULT_PATH)
+      else()
+        find_package (${name} ${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR} ${ARGN} NO_MODULE)
+      endif()
+      include(FindPackageHandleStandardArgs)
+      if( CMAKE_VERSION VERSION_GREATER_EQUAL "3.17")
+	# For some reason we will e.g. call
+	# find_package_handle_standard_args(opm-common)
+	# in a find_package(opm-material) call and this will
+	# usuallly print an annoying warnig. Prevent this at least
+	# for cmake >=3.17
+	# \todo Check why/whether these calls are even needed.
+	set(_NAME_MISMATCHED "NAME_MISMATCHED")
+      endif()
+      if(${name}_FOUND AND ${name}_LIBRARY STREQUAL "")
+        find_package_handle_standard_args(${name}
+          REQUIRED_VARS ${name}_INCLUDE_DIRS ${_NAME_MISMATCHED})
+      else()
+        find_package_handle_standard_args(${name}
+          REQUIRED_VARS ${name}_LIBRARY ${_NAME_MISMATCHED})
+      endif()
     endif ()
     if (NOT DEFINED ${name}_FOUND)
       set (${name}_FOUND "${${NAME}_FOUND}")

cmake/Modules/OpmInit.cmake

@@ -130,7 +130,7 @@ endif ()
 
 # parallel computing must be explicitly enabled
 # This needs to be in OpmInit as prereqs is called before OpmLibMain is included.
-option (USE_MPI "Use Message Passing Interface for parallel computing" OFF)
+option (USE_MPI "Use Message Passing Interface for parallel computing" ON)
 if (NOT USE_MPI)
   set (CMAKE_DISABLE_FIND_PACKAGE_MPI TRUE)
 endif ()
@@ -142,9 +142,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-# quadmath must be explicitly enabled
-# This needs to be in OpmInit as prereqs is called before OpmLibMain is included.
-option (USE_QUADMATH "Use high precision floating point library (slow)" OFF)
-if (NOT USE_QUADMATH)
-  set (CMAKE_DISABLE_FIND_PACKAGE_QuadMath TRUE)
+option (USE_SUPERLU "Use SuperLU direct solvers for AMG (if umfpack is not found)" ON)
+if (NOT USE_SUPERLU)
+  set (CMAKE_DISABLE_FIND_PACKAGE_SuperLU TRUE)
 endif ()

cmake/Modules/OpmLibMain.cmake

@@ -63,9 +63,6 @@ find_openmp (${project})
 include (UseThreads)
 find_threads (${project})
 
-# SuperLU is optional
-option (USE_SUPERLU "Use SuperLU direct solvers" OFF)
-
 # PETSc is optional
 option (USE_PETSC "Use PETSc iterative solvers" OFF)
 

cmake/Modules/OpmPackage.cmake

@@ -124,7 +124,7 @@ macro (find_opm_package module deps header lib defs prog conf)
   # without config.h
   config_cmd_line (${module}_CMD_CONFIG ${module}_CONFIG_VARS)
 
-  if(prog)
+  if(prog) # always evaluates to false, but makes tests with DUNE 2.6-2.7 work
     # check that we can compile a small test-program
     include (CMakePushCheckState)
     cmake_push_check_state ()
@@ -138,13 +138,16 @@ macro (find_opm_package module deps header lib defs prog conf)
     list (APPEND CMAKE_REQUIRED_DEFINITIONS ${${module}_CMD_CONFIG})
     check_cxx_source_compiles ("${prog}" HAVE_${MODULE})
     cmake_pop_check_state ()
-  else(prog)
+  else()
     if(${module}_FOUND)
       # No test code provided, mark compilation as successful
-      # if module was founf
-      set(HAVE_${MODULE} 1)
+      # if module was found
+      # Has to be cached because of scope. Otherwise it is not accessible
+      # where it is used.
+      set(HAVE_${MODULE} 1 CACHE BOOL "${module} found")
+      mark_as_advanced(HAVE_${MODULE})
     endif(${module}_FOUND)
-  endif(prog)
+  endif()
 
   # write status message in the same manner as everyone else
   include (FindPackageHandleStandardArgs)

cmake/Modules/OpmProject.cmake

@@ -54,6 +54,12 @@ function (configure_cmake_file name variant version)
   foreach (suffix IN LISTS variable_suffices)
 	set (opm-project_${suffix} "${${name}_${suffix}}")
   endforeach (suffix)
+
+  if (BUILD_SHARED_LIBS)
+    # No need to list shared libraries as the linker information is alread
+    # in the shared lib
+    string(REGEX REPLACE ";?[^;]*.so" "" opm-project_LIBRARIES "${opm-project_LIBRARIES}")
+  endif()
   set (opm-project_NAME "${${name}_NAME}")
   set (opm-project_NAME_UC "${${name}_NAME}")
   string(TOUPPER "${opm-project_NAME}" opm-project_NAME_UC)

cmake/Modules/PyInstallPrefix.cmake

@@ -0,0 +1,28 @@
+# We make this a cmake module so it can be used from opm-simulators' CMakeLists.txt also
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+import site, sys
+try:
+    sys.stdout.write(site.getsitepackages()[-1])
+except e:
+    sys.stdout.write('')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_PATH)
+  # -------------------------------------------------------------------------
+  # 1: Wrap C++ functionality in Python
+if (PYTHON_SITE_PACKAGES_PATH MATCHES ".*/dist-packages/?" AND
+    CMAKE_INSTALL_PREFIX MATCHES "^/usr.*")
+  # dist-packages is only used if we install below /usr and python's site packages
+  # path matches dist-packages
+  set(PYTHON_PACKAGE_PATH "dist-packages")
+else()
+  set(PYTHON_PACKAGE_PATH "site-packages")
+endif()
+if(PYTHON_VERSION_MAJOR)
+  set(PY_MAJOR ${PYTHON_VERSION_MAJOR})
+else()
+  set(PY_MAJOR ${Python3_VERSION_MAJOR})
+endif()
+if(PYTHON_VERSION_MINOR)
+  set(PY_MINOR ${PYTHON_VERSION_MINOR})
+else()
+  set(PY_MINOR ${Python3_VERSION_MINOR})
+endif()
+set(PYTHON_INSTALL_PREFIX "lib/python${PY_MAJOR}.${PY_MINOR}/${PYTHON_PACKAGE_PATH}" CACHE STRING "Subdirectory to install Python modules in")

cmake/Modules/UseDamaris.cmake

@@ -0,0 +1,27 @@
+if(USE_DAMARIS_LIB AND MPI_FOUND)
+  if (Damaris_FOUND)
+    set(HAVE_DAMARIS 1)
+    message(STATUS "The Damaris library was found: ${Damaris_VERSION} ${Damaris_DIR}")
+    if (Damaris_HAS_HDF5)
+      message(STATUS "The Damaris library has HDF5 support: ${HDF5_VERSION}")
+    else()
+      message(STATUS "The Damaris library does NOT have HDF5 support")
+    endif()
+    if (Damaris_HAS_VISIT)
+      message(STATUS "The Damaris library has VisIt support: ${VisIt_VERSION}")
+    else()
+      message(STATUS "The Damaris library does NOT have VisIt support")
+    endif()
+    if (Damaris_HAS_CATALYST)
+      message(STATUS "The Damaris library has Catalyst support: ${Catalyst_VERSION}  ${Paraview_VERSION}")
+    else()
+      message(STATUS "The Damaris library does NOT have Catalyst support")
+    endif()
+  else()
+    message(STATUS "The Damaris library was requested but NOT found")
+  endif()
+else()  # User did not request Damaris support
+  unset(HAVE_DAMARIS)
+endif()
+
+mark_as_advanced(HAVE_DAMARIS)

cmake/Modules/UseOptimization.cmake

@@ -64,7 +64,14 @@ if (CXX_COMPAT_GCC)
   # use these options for release builds - full optimization
   add_options (ALL_LANGUAGES "${_prof_RELEASE}" ${_opt_rel} ${_opt_flags})
   option(WITH_NDEBUG "Disable asserts in release mode" OFF)
-  if(NOT WITH_NDEBUG)
+  if(WITH_NDEBUG)
+    foreach(type ${_prof_RELEASE})
+      string(TOUPPER ${type} type)
+      string(REPLACE -UNDEBUG "" CMAKE_CXX_FLAGS_${type} "${CMAKE_CXX_FLAGS_${type}}")
+      string(REPLACE -UNDEBUG "" CMAKE_C_FLAGS_${type} "${CMAKE_C_FLAGS_${type}}")
+      string(REPLACE -UNDEBUG "" CMAKE_Fortran_FLAGS_${type} "${CMAKE_Fortran_FLAGS_${type}}")
+    endforeach()
+  else()
     add_options (ALL_LANGUAGES "${_prof_RELEASE}" -UNDEBUG)
   endif()
 

cmake/Templates/opm-project-config.cmake.in

@@ -58,6 +58,7 @@ if(NOT @opm-project_NAME@_FOUND)
     string(REPLACE ${@opm-project_NAME@_PREFIX} ${DEST_PREFIX} @opm-project_NAME@_INCLUDE_DIRS "${@opm-project_NAME@_INCLUDE_DIRS}")
     string(REPLACE ${@opm-project_NAME@_PREFIX} ${DEST_PREFIX} @opm-project_NAME@_LIBRARY_DIRS "${@opm-project_NAME@_LIBRARY_DIRS}")
     string(REPLACE ${@opm-project_NAME@_PREFIX} ${DEST_PREFIX} @opm-project_NAME@_LIBRARY      "${@opm-project_NAME@_LIBRARY}")
+    string(REPLACE ${@opm-project_NAME@_PREFIX} ${DEST_PREFIX} @opm-project_NAME@_PYTHON_COMMON_DIR "${@opm-project_NAME@_PYTHON_COMMON_DIR}")
   endif()
 
 
@@ -107,7 +108,18 @@ if(NOT @opm-project_NAME@_FOUND)
   # The settings in this block do not mix well with the DEST_PREFIX
   # setting.
   if (NOT DEST_PREFIX)
-    # This is required to include OpmPackage
+    # if this file is not processed using the OPM CMake system but
+    # simply by a call to find_package(module) then the CMAKE_MODULE_PATH
+    # might not include the location of the OPM cmake module yet.
+    # Hence we search for opm-common using config mode to set it up.
+    # The check for opm-common_PREFIX is there to not do this in
+    # opm-common-config.cmake
+    if(NOT opm-common_PREFIX
+        AND NOT opm-common_FOUND)
+      # This needed to find the path to the CMake modules
+      find_package(opm-common CONFIG)
+    endif()
+    # This is required to include OpmPackage /opm-common-prereq.cmake
     set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" @PREREQ_LOCATION@)
 
     # extra code from variable OPM_PROJECT_EXTRA_CODE

cmake/Templates/style.css

@@ -1,4 +1,4 @@
-/* Userspesific CSS for doxygen */
+/* Userspecific CSS for doxygen */
 body, table, div, p, dl {
 	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
 	font-size: 16px;

docs/man1/arraylist.1

@@ -0,0 +1,11 @@
+.TH SUMMARY "1" "October 2022" "arraylist 2022.10" "User Commands"
+.SH NAME
+summary \- Printer for list of arrays in Eclipse summary files
+.SH DESCRIPTION
+List all arrays found in an EclFile specified on the command line.
+.PP
+.SH OPTIONS
+\fB\-h\fR Print help and exit.
+.TP
+\fB\-r\fR List array for a specific report time step number. Option only valid for a unified restart file.
+.PP

docs/man1/co2brinepvt.1

@@ -0,0 +1,29 @@
+.TH CO2BRINEPVT "1" "April 2022" "co2brinepvt" "User Commands"
+.SH NAME
+co2brinepvt \- compute and print pvt properties for co2 with brine
+.SH DESCRIPTION
+co2brinepvt computes PVT properties of a brine/co2 system
+for a given phase (oil or brine), pressure, temperature, salinity and rs.
+The properties support are: density, the inverse phase formation volume factor (invB), viscosity,
+saturated dissolution factor (rsSat)
+See CO2STORE in the OPM manual for more details.
+.PP
+.SH Synopsis
+co2brinepvt <prop> <phase> <p> <T> <salinity> <rs>
+.br
+where
+.br
+prop = {density, invB, B, viscosity, rsSat, diffusionCoefficient}
+.br
+phase = {CO2, brine}
+.br
+p: pressure in pascal
+.br
+T: temperature in kelvin
+.br
+salinity(optional): salt molality in mol/kg
+.nr
+rs(optional): amount of dissolved CO2 in Brine in SM3/SM3
+.PP
+.SH OPTIONS
+\fB\-\-h\fR/\-\-help Print help and exit.

docs/man1/compareECL.1

@@ -1,5 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH COMPAREECL "1" "April 2021" "compareECL 2020.04" "User Commands"
+.TH COMPAREECL "1" "October 2022" "compareECL 2022.10" "User Commands"
 .SH NAME
 compareECL \- Comparator for Eclipse files
 .SH DESCRIPTION
@@ -11,55 +10,57 @@ The program takes four arguments:
 3. Absolute tolerance
 4. Relative tolerance (between 0 and 1)
 .PP
+.SH OPTIONS
+.HP
 In addition, the program takes these options (which must be given before the arguments):
 .PP
 \fB\-a\fR Run a full analysis of errors.
+.TP
 \fB\-h\fR Print help and exit.
+.TP
 \fB\-d\fR Use report steps only when comparing results from summary files.
+.TP
 \fB\-i\fR Execute integration test (regression test is default).
 .IP
 The integration test compares SGAS, SWAT and PRESSURE in unified restart files, and WOPR, WGPR, WWPR and WBHP (all wells) in summary file.
 .PP
 \fB\-k\fR Specify specific keyword to compare (capitalized), for examples \fB\-k\fR PRESSURE or \fB\-k\fR WOPR:A\-1H
-\fB\-l\fR Only do comparison for the last Report Step. This option is only valid for restart files.
-\fB\-n\fR Do not throw on errors.
-\fB\-p\fR Print keywords in both cases and exit.
-\fB\-r\fR compare a spesific report time step number in a restart file.
-\fB\-t\fR Specify ECLIPSE filetype to compare, (default behaviour is that all files are compared if found). Different possible arguments are:
 .TP
+\fB\-l\fR Only do comparison for the last Report Step. This option is only valid for restart files.
+.TP
+\fB\-n\fR Do not throw on errors.
+.TP
+\fB\-p\fR Print keywords in both cases and exit.
+.TP
+\fB\-r\fR compare a specific report time step number in a restart file.
+.TP
+\fB\-t\fR Specify ECLIPSE filetype to compare, (default behaviour is that all files are compared if found). Different possible arguments are:
+.IP
 \fB\-t\fR UNRST
 Compare two unified restart files (.UNRST). This the default value, so it is the same as not passing option \fB\-t\fR.
-.TP
+.IP
 \fB\-t\fR EGRID
 Compare two EGrid files (.EGRID).
-.TP
+.IP
 \fB\-t\fR INIT
 Compare two initial files (.INIT).
-.TP
+.IP
 \fB\-t\fR RFT
 Compare two RFT files (.RFT).
-.TP
+.IP
 \fB\-t\fR SMRY
 Compare two cases consistent of (unified) summary files.
+.IP
+\fB\-t\fR RSM
+Compare RSM file against a summary file.
 .PP
 \fB\-x\fR Allow extra keywords in case number 2. These additional keywords (not found in case number1) will be ignored in the comparison.
 .PP
-Example usage of the program:
+.SH Example usage of the program:
 .PP
 compareECL \fB\-k\fR PRESSURE <path to first casefile> <path to second casefile> 1e\-3 1e\-5
 compareECL \fB\-t\fR INIT \fB\-k\fR PORO <path to first casefile> <path to second casefile> 1e\-3 1e\-5
 compareECL \fB\-i\fR <path to first casefile> <path to second casefile> 0.01 1e\-6
 .PP
 Exceptions are thrown (and hence program exits) when deviations are larger than the specified tolerances, or when the number of cells does not match \fB\-\-\fR either in the grid file or for a specific keyword. Information about the keyword, keyword occurrence (zero based) and cell coordinate is printed when an exception is thrown. For more information about how the cases are compared, see the documentation of the EclFilesComparator class.
-.SH "SEE ALSO"
-The full documentation for
-.B compareECL
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B compareECL
-programs are properly installed at your site, the command
-.IP
-.B info compareECL
-.PP
-should give you access to the complete manual.
+

docs/man1/convertECL.1

@@ -1,5 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH CONVERTECL "1" "April 2021" "convertECL 2020.04" "User Commands"
+.TH CONVERTECL "1" "October 2022" "convertECL 2022.10" "User Commands"
 .SH NAME
 convertECL \- Converter for Eclipse files (binary <-> formatted format)
 .SH DESCRIPTION
@@ -7,18 +6,13 @@ convertECL needs one argument which is the input file to be converted. If this i
 .PP
 In addition, the program takes these options (which must be given before the arguments):
 .PP
+.SH OPTIONS
+.HP
 \fB\-h\fR Print help and exit.
+.TP
 \fB\-l\fR list report step numbers in the selected restart file.
-\fB\-r\fR extract and convert a spesific report time step number from a unified restart file.
-.SH "SEE ALSO"
-The full documentation for
-.B convertECL
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B convertECL
-programs are properly installed at your site, the command
-.IP
-.B info convertECL
+.TP
+\fB\-i\fR Enforce IX standard on output file.
+.TP
+\fB\-r\fR extract and convert a specific report time step number from a unified restart file.
 .PP
-should give you access to the complete manual.

docs/man1/opmhash.1

@@ -1,5 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH OPMHASH "1" "April 2021" "opmhash 2020.04" "User Commands"
+.TH OPMHASH "1" "October 2022" "opmhash 2022.10" "User Commands"
 .SH NAME
 opmhash \- Hasher for summary keywords in Eclipse files
 .SH DESCRIPTION
@@ -40,15 +39,11 @@ depends on the keyword order.
 \fB\-l\fR : Add filename and linenumber information to each keyword.
 .HP
 \fB\-s\fR : Short form \- only print the hash of the complete deck.
-.SH "SEE ALSO"
-The full documentation for
-.B opmhash
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B opmhash
-programs are properly installed at your site, the command
-.IP
-.B info opmhash
+.HP
+\fB\-S\fR : Silent form \- will not print any deck output.
 .PP
-should give you access to the complete manual.
+It is possible to add multiple deck arguments, they are then scanned repeatedly,
+and the decks are compared. In the case of multiple deck arguments the exit
+status of the program will be zero if all are equal and nonzero in case of
+differences.
+

docs/man1/opmpack.1

@@ -1,10 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH OPMPACK "1" "April 2021" "opmpack 2020.04" "User Commands"
+.TH OPMPACK "1" "October 2022" "opmpack 2022.10" "User Commands"
 .SH NAME
 opmpack \- Validator and printer of deck in Eclipse files without comments
 .SH DESCRIPTION
-opmpack: invalid option \fB\-\-\fR 'h'
-.PP
 The opmpack program will load a deck, resolve all include
 files and then print it out again on stdout. All comments
 will be stripped and the value types will be validated.
@@ -28,15 +25,4 @@ opmpack \fB\-o\fR NEW_CASE.DATA path/to/MY_CASE.DATA
 As an alternative to the \fB\-o\fR option you can use \fB\-c\fR; that is equivalent to \fB\-o\fR \-
 but restart and import files referred to in the deck are also copied. The \fB\-o\fR and
 \fB\-c\fR options are mutually exclusive.
-.SH "SEE ALSO"
-The full documentation for
-.B opmpack
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B opmpack
-programs are properly installed at your site, the command
-.IP
-.B info opmpack
-.PP
-should give you access to the complete manual.
+

docs/man1/rst_deck.1

@@ -1,7 +1,88 @@
-.TH RST_DECK
+.TH RST_DECK: "1" "October 2022" "rst_deck 2022.10" "User Commands"
 .SH NAME
-rst_deck \- Create a version of deck ready for restart
-
-
-
-
+rst_deck \- Convert simulation deck to a deck ready for restart
+.SH DESCRIPTION
+The rst_deck program will load a simulation deck and parameters for a restart
+and reformat the deck to become a restart deck. Before the updated deck is
+output the program will update the SOLUTION and SCHEDULE sections. All keywords
+from the SOLUTION section will be cleared out(1) and a RESTART keyword will be
+inserted. In the SCHEDULE section the program can either remove all keywords up
+until the restart date, or alternatively insert SKIPREST immediately following
+the SCHEDULE keyword.
+.PP
+When creating the updated restart deck the program can either link to unmodified
+include files with INCLUDE statements, create a copy of deck structure in an
+alternative location or create one large file with all keywords in the same
+file. Apart from the alterations to support restart the output deck will be
+equivalent to the input deck, but formatting is not retained and comments have
+been stripped away.
+.PP
+Arguments:
+.PP
+1. The data file we are starting with.
+.PP
+2. The restart source; this can either be a basename with an optional path
+.IP
+prefix and a :N to restart from step N; alternatively you can point to an
+existing restart file. If you point to an existing restart file the input
+will be validated in several ways:
+.IP
+a) Unified/multiple files will be checked against the UNIFIN setting of
+.IP
+the deck.
+.IP
+b) Formatted/unformatted will be checked against the FMTIn setting of the
+.IP
+deck.
+.IP
+c) If a single file like \fI\,/path/to/case/HISTORY.X0067\/\fP is given as argument the
+.IP
+:N notation to denote report step should not be used.
+.IP
+If the restart argument is given as the path to an existing file the content
+of the RESTART keyword will be updated to contain the correct path from the
+location of the restart deck to the location of the restart file. This path
+awareness will be fooled if the restart deck is redirected from stdout to a
+path different from cwd. If the restart argument is given as an absolute
+filename the RESTART keyword will have an absolute path, if the restart
+argument is a relative path the RESTART keyword will get a relative path \-
+although an absolute path will be used if the restart file and the output
+deck have different roots. If the restart argument is given as a string not
+pointing to an existing file it will be inserted verbatim in the restart
+deck.
+.IP
+A restart step value of 0 is interpreted as a dry run \- a deck which has not
+been set up for restart will be written out.
+.PP
+3. Basename of the restart deck we create, can optionally contain a path prefix;
+.IP
+the path will be created if it does not already exist. This argument is
+optional, if it is not provided the program will dump a restart deck on
+stdout. If the argument corresponds to an existing directory the restart case
+will get the same name as the base case.
+.SH OPTIONS
+\fB\-s\fR: Manipulate the SCHEDULE section by inserting a SKIPREST keyword immediately
+.IP
+following the SCHEDULE keyword. If the \fB\-s\fR option is not used the SCHEDULE
+section will be modified by removing all keywords until we reach the restart
+date.
+.PP
+\fB\-m\fR: [share|inline|copy] The restart deck can reuse the unmodified include files
+.IP
+from the base case, this is mode 'share' and is the default. With mode
+\&'inline' the restart deck will be one long file and with mode 'copy' the
+file structure of the base case will be retained. The default if no \fB\-m\fR
+option is given is the 'share' mode.
+.IP
+In the case of 'share' and 'copy' the correct path to include files will be
+negotiated based on the path given to the output case in the third argument.
+If the restart deck is passed to stdout the include files will be resolved
+based on output in cwd.
+.PP
+Example:
+.IP
+rst_deck \fI\,/path/to/history/HISTORY.DATA\/\fP rst/HISTORY:30 \fI\,/path/to/rst/RESTART\/\fP \fB\-s\fR
+.PP
+1: The program has a compiled list of keywords which will be retained in the
+.IP
+SOLUTION section. The current value of that list is: RPTRST

docs/man1/summary.1

@@ -1,5 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH SUMMARY "1" "April 2021" "summary 2020.04" "User Commands"
+.TH SUMMARY "1" "October 2022" "summary 2022.10" "User Commands"
 .SH NAME
 summary \- Printer for summary keys in Eclipse summary files
 .SH DESCRIPTION
@@ -7,18 +6,10 @@ summary needs a minimum of two arguments. First is smspec filename and then list
 .PP
 In addition, the program takes these options (which must be given before the arguments):
 .PP
+.SH OPTIONS
 \fB\-h\fR Print help and exit.
+.TP
 \fB\-l\fR list all summary vectors.
+.TP
 \fB\-r\fR extract data only for report steps.
-.SH "SEE ALSO"
-The full documentation for
-.B summary
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B summary
-programs are properly installed at your site, the command
-.IP
-.B info summary
 .PP
-should give you access to the complete manual.

dune.module

@@ -5,9 +5,9 @@
 
 Module: opm-common
 Description: Open Porous Media Initiative shared infrastructure
-Version: 2022.04-pre
-Label: 2022.04-pre
+Version: 2023.04
+Label: 2023.04
 Maintainer: opm@opm-project.org
 MaintainerName: OPM community
 Url: http://opm-project.org
-Depends: dune-common
+Depends: dune-common (>= 2.7)

examples/co2brinepvt.cpp

@@ -0,0 +1,194 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM 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 2 of the License, or
+  (at your option) any later version.
+
+  OPM 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ *
+ * \brief This is the unit test for the co2 brine PVT model
+ *
+ */
+#include "config.h"
+#include <opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp>
+#include <opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.hpp>
+
+#include <iostream>
+
+template <class Co2Pvt>
+double densityGas(const Co2Pvt& co2Pvt, const double p, const double T, const double Rv)
+{
+    return co2Pvt.inverseFormationVolumeFactor(/*regionIdx=*/0,
+                                                  T,
+                                                  p,
+                                                  Rv,
+                                                  /*Rvw=*/0.0) * co2Pvt.gasReferenceDensity(0);
+}
+
+template <class BrinePvt>
+double densityBrine(const BrinePvt& brinePvt, const double p, const double T, const double Rs)
+{
+    double bo = brinePvt.inverseFormationVolumeFactor(/*regionIdx=*/0,
+                                                  T,
+                                                  p,
+                                                  Rs);
+    return bo * (brinePvt.oilReferenceDensity(0) + Rs * brinePvt.gasReferenceDensity(0));
+}
+
+int main(int argc, char **argv)
+{
+
+    bool help = false;
+    for (int i = 1; i < argc; ++i) {
+        std::string tmp = argv[i];
+        help = help || (tmp  == "--h") || (tmp  == "--help");
+    }
+
+    if (argc < 5 || help) {
+        std::cout << "USAGE:" << std::endl;
+        std::cout << "co2brinepvt <prop> <phase> <p> <T> <salinity> <rs> "<< std::endl;
+        std::cout << "prop = {density, invB, B, viscosity, rsSat, internalEnergy, enthalpy, diffusionCoefficient}" << std::endl;
+        std::cout << "phase = {CO2, brine}" << std::endl;
+        std::cout << "p: pressure in pascal" << std::endl;
+        std::cout << "T: temperature in kelvin" << std::endl;
+        std::cout << "salinity(optional): salt molality in mol/kg" << std::endl;
+        std::cout << "rs(optional): amount of dissolved CO2 in Brine in SM3/SM3" << std::endl;
+        std::cout << "OPTIONS:" << std::endl;
+        std::cout << "--h/--help Print help and exit." << std::endl;
+        std::cout << "DESCRIPTION:" << std::endl;
+        std::cout << "co2brinepvt computes PVT properties of a brine/co2 system " << std::endl;
+        std::cout << "for a given phase (oil or brine), pressure, temperature, salinity and rs." << std::endl;
+        std::cout << "The properties support are: density, the inverse phase formation volume factor (invB), viscosity, " << std::endl;
+        std::cout << "saturated dissolution factor (rsSat) " << std::endl;
+        std::cout << "See CO2STORE in the OPM manual for more details." << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    std::string prop = argv[1];
+    std::string phase = argv[2];
+    double p = atof(argv[3]);
+    double T = atof(argv[4]);
+    double molality = 0.0;
+    double rs = 0.0;
+    double rv = 0.0; // only support 0.0 for now
+    if (argc > 5)
+        molality = atof(argv[5]);
+    if (argc > 6)
+        rs = atof(argv[6]);
+
+    const double MmNaCl = 58e-3; // molar mass of NaCl [kg/mol]
+    // convert to mass fraction
+    std::vector<double> salinity = {0.0};
+    if (molality > 0.0)
+        salinity[0] = 1 / ( 1 + 1 / (molality*MmNaCl));
+    Opm::BrineCo2Pvt<double> brineCo2Pvt(salinity);
+
+    Opm::Co2GasPvt<double> co2Pvt(salinity);
+
+    double value;
+    if (prop == "density") {
+        if (phase == "CO2") {
+            value = densityGas(co2Pvt, p, T, rv);
+        } else if (phase == "brine") {
+            value = densityBrine(brineCo2Pvt, p, T, rs);
+        } else {
+            throw std::runtime_error("phase " + phase + " not recognized. Use either CO2 or brine");
+        }
+    } else if (prop == "invB" || prop == "B") {
+        if (phase == "CO2") {
+            value = co2Pvt.inverseFormationVolumeFactor(/*regionIdx=*/0,
+                                                   T,
+                                                   p,
+                                                   rv,
+                                                   /*Rvw=*/0.0);
+        } else if (phase == "brine") {
+            value = brineCo2Pvt.inverseFormationVolumeFactor(/*regionIdx=*/0,
+                                                   T,
+                                                   p,
+                                                   rs);
+        } else {
+            throw std::runtime_error("phase " + phase + " not recognized. Use either CO2 or brine");
+        }
+        if (prop == "B")
+            value = 1 / value;
+
+    } else if (prop == "viscosity") {
+        if (phase == "CO2") {
+            value = co2Pvt.viscosity(/*regionIdx=*/0,
+                                                   T,
+                                                   p,
+                                                   rv,
+                                                   /*Rvw=*/0.0);
+        } else if (phase == "brine") {
+            value = brineCo2Pvt.viscosity(/*regionIdx=*/0,
+                                                   T,
+                                                   p,
+                                                   rs);
+        } else {
+            throw std::runtime_error("phase " + phase + " not recognized. Use either CO2 or brine");
+        }
+    } else if (prop == "rsSat") {
+        if (phase == "CO2") {
+            value = co2Pvt.saturatedWaterVaporizationFactor(/*regionIdx=*/0,
+                                                   T,
+                                                   p);
+        } else if (phase == "brine") {
+            value = brineCo2Pvt.saturatedGasDissolutionFactor(/*regionIdx=*/0,
+                                                   T,
+                                                   p);
+        } else {
+            throw std::runtime_error("phase " + phase + " not recognized. Use either CO2 or brine");
+        }
+
+
+    } else if (prop == "diffusionCoefficient") {
+        size_t comp_idx = 0; // not used
+        if (phase == "CO2") {
+            value = co2Pvt.diffusionCoefficient(T,p, comp_idx);
+        } else if (phase == "brine") {
+            value = brineCo2Pvt.diffusionCoefficient(T,p, comp_idx);
+        } else {
+            throw std::runtime_error("phase " + phase + " not recognized. Use either CO2 or brine");
+        }
+    } else if (prop == "internalEnergy") {
+        if (phase == "CO2") {
+            value = co2Pvt.internalEnergy(/*regionIdx=*/0 ,T,p, rv, 0.0);
+        } else if (phase == "brine") {
+            value = brineCo2Pvt.internalEnergy(/*regionIdx=*/0 ,T,p, rs);
+        } else {
+            throw std::runtime_error("phase " + phase + " not recognized. Use either CO2 or brine");
+        }
+    } else if (prop == "enthalpy") {
+        if (phase == "CO2") {
+            value = p / densityGas(co2Pvt, p, T, rv) + co2Pvt.internalEnergy(/*regionIdx=*/0 ,T,p, rv, 0.0);
+        } else if (phase == "brine") {
+            value = p / densityBrine(brineCo2Pvt, p, T, rs) + brineCo2Pvt.internalEnergy(/*regionIdx=*/0 ,T,p, rs);
+        } else {
+            throw std::runtime_error("phase " + phase + " not recognized. Use either CO2 or brine");
+        }
+    } else {
+        throw std::runtime_error("prop " + prop + " not recognized. "
+        + "Use either density, visosity, invB, B, internalEnergy, enthalpy or diffusionCoefficient");
+    }
+
+    std::cout << value << std::endl;
+
+    return 0;
+}

examples/make_ext_smry.cpp

@@ -91,9 +91,12 @@ int main(int argc, char **argv) {
 
     auto lap0 = std::chrono::system_clock::now();
 
+    int num_esmry = argc-argOffset;
+    std::vector<bool> status(num_esmry, false);
+
     #pragma omp parallel for
-    for (int f = argOffset; f < argc; f ++){
-        std::filesystem::path inputFileName = argv[f];
+    for (int f = 0; f < num_esmry; f ++){
+        std::filesystem::path inputFileName = argv[f + argOffset];
 
         std::filesystem::path esmryFileName = inputFileName.parent_path() / inputFileName.stem();
         esmryFileName = esmryFileName += ".ESMRY";
@@ -101,15 +104,23 @@ int main(int argc, char **argv) {
         if (Opm::EclIO::fileExists(esmryFileName) && (force))
             remove (esmryFileName);
 
-        Opm::EclIO::ESmry smryFile(argv[f]);
-        if (!smryFile.make_esmry_file()){
-            std::cout << "\n! Warning, smspec already have one lod file, existing kept use option -f to replace this" << std::endl;
+        try {
+            Opm::EclIO::ESmry smry{ argv[f + argOffset] };
+            status[f] = smry.make_esmry_file();
+            if (! status[f]) {
+                std::cerr << "\n! Warning, smspec already have one esmry file, existing kept use option -f to replace this\n";
+            }
+
+        } catch (...) {
+            std::cerr << "\n! Warning, could not open summary file " << argv[f + argOffset] << '\n';
         }
     }
 
+    const auto n_converted = std::count(status.begin(), status.end(), true);
+
     auto lap1 = std::chrono::system_clock::now();
     std::chrono::duration<double> elapsed_seconds1 = lap1-lap0;
-    std::cout << "\nruntime for creating " << (argc-argOffset) << " ESMRY files: " << elapsed_seconds1.count() << " seconds\n" << std::endl;
+    std::cout << "\nruntime for creating " << n_converted << " ESMRY files: " << elapsed_seconds1.count() << " seconds\n" << std::endl;
 
     return 0;
 }

examples/msim.cpp

@@ -19,6 +19,8 @@
 
 #include <opm/output/eclipse/EclipseIO.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
+
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/Parser/ParseContext.hpp>
 #include <opm/input/eclipse/Parser/ErrorGuard.hpp>

examples/opmhash.cpp

@@ -27,11 +27,8 @@
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/Parser/ParseContext.hpp>
 #include <opm/input/eclipse/Parser/ErrorGuard.hpp>
+#include <opm/input/eclipse/Parser/InputErrorAction.hpp>
 #include <opm/input/eclipse/Deck/Deck.hpp>
-#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
-#include <opm/input/eclipse/Schedule/Schedule.hpp>
 
 
 struct keyword {
@@ -58,10 +55,10 @@ std::vector<keyword> load_deck(const std::string& deck_file) {
     std::vector<keyword> keywords;
 
     /* Use the same default ParseContext as flow. */
-    parseContext.update(Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputError::IGNORE);
-    parseContext.update(Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputError::WARN);
-    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN);
-    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN);
+    parseContext.update(Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputErrorAction::IGNORE);
+    parseContext.update(Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputErrorAction::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputErrorAction::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputErrorAction::WARN);
 
     auto deck = parser.parseFile(deck_file, parseContext, errors);
     for (const auto& kw : deck) {

examples/opmpack.cpp

@@ -22,6 +22,9 @@
 #include <iostream>
 #include <getopt.h>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
+#include <opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp>
+#include <opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/I.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/P.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/G.hpp>
@@ -29,12 +32,11 @@
 #include <opm/input/eclipse/Parser/ErrorGuard.hpp>
 #include <opm/input/eclipse/Parser/ParseContext.hpp>
 #include <opm/input/eclipse/Parser/InputErrorAction.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
 
 namespace fs = std::filesystem;
 
 Opm::Deck pack_deck( const char * deck_file, std::ostream& os) {
-    Opm::ParseContext parseContext(Opm::InputError::WARN);
+    Opm::ParseContext parseContext(Opm::InputErrorAction::WARN);
     Opm::ErrorGuard errors;
     Opm::Parser parser;
 

examples/rst_deck.cpp

@@ -163,15 +163,15 @@ struct Options {
 
 
 Opm::Deck load_deck(const Options& opt) {
-    Opm::ParseContext parseContext(Opm::InputError::WARN);
+    Opm::ParseContext parseContext(Opm::InputErrorAction::WARN);
     Opm::ErrorGuard errors;
     Opm::Parser parser;
 
     /* Use the same default ParseContext as flow. */
-    parseContext.update(Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputError::IGNORE);
-    parseContext.update(Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputError::WARN);
-    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN);
-    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN);
+    parseContext.update(Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputErrorAction::IGNORE);
+    parseContext.update(Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputErrorAction::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputErrorAction::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputErrorAction::WARN);
     return parser.parseFile(opt.input_deck, parseContext, errors);
 }
 

examples/wellgraph.cpp

@@ -20,18 +20,24 @@
 #include <filesystem>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
 #include <chrono>
 #include <sstream>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
+
+#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
+
+#include <opm/input/eclipse/Parser/ErrorGuard.hpp>
+#include <opm/input/eclipse/Parser/InputErrorAction.hpp>
 #include <opm/input/eclipse/Parser/Parser.hpp>
 #include <opm/input/eclipse/Parser/ParseContext.hpp>
-#include <opm/input/eclipse/Parser/ErrorGuard.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
-#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/input/eclipse/Schedule/Schedule.hpp>
+
 #include <opm/input/eclipse/Python/Python.hpp>
 
+#include <opm/input/eclipse/Schedule/Schedule.hpp>
+#include <opm/input/eclipse/Schedule/Well/Well.hpp>
+
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/StreamLog.hpp>
 #include <opm/common/OpmLog/LogUtil.hpp>
@@ -91,10 +97,10 @@ inline void createDot(const Opm::Schedule& schedule, const std::string& casename
 
 inline Opm::Schedule loadSchedule(const std::string& deck_file)
 {
-    Opm::ParseContext parseContext({{Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputError::IGNORE},
-                                    {Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputError::WARN},
-                                    {Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN},
-                                    {Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN}});
+    Opm::ParseContext parseContext({{Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputErrorAction::IGNORE},
+                                    {Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputErrorAction::WARN},
+                                    {Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputErrorAction::WARN},
+                                    {Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputErrorAction::WARN}});
     Opm::ErrorGuard errors;
     Opm::Parser parser;
     auto python = std::make_shared<Opm::Python>();

external/resinsight/CommonCode/cvfStructGrid.cpp

@@ -0,0 +1,401 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "../CommonCode/cvfStructGrid.h"
+#include "../LibCore/cvfBase.h"
+
+// namespace caf
+// {
+// template <>
+// void cvf::StructGridInterface::FaceEnum::setUp()
+// {
+//     addItem( cvf::StructGridInterface::POS_I, "POS I", "" );
+//     addItem( cvf::StructGridInterface::NEG_I, "NEG I", "" );
+//     addItem( cvf::StructGridInterface::POS_J, "POS J", "" );
+//     addItem( cvf::StructGridInterface::NEG_J, "NEG J", "" );
+//     addItem( cvf::StructGridInterface::POS_K, "POS K", "" );
+//     addItem( cvf::StructGridInterface::NEG_K, "NEG K", "" );
+//     addItem( cvf::StructGridInterface::NO_FACE, "UnDef", "" );
+// }
+// } // namespace caf
+
+namespace external 
+{
+namespace cvf
+{
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+StructGridInterface::StructGridInterface()
+{
+    m_characteristicCellSizeI = cvf::UNDEFINED_DOUBLE;
+    m_characteristicCellSizeJ = cvf::UNDEFINED_DOUBLE;
+    m_characteristicCellSizeK = cvf::UNDEFINED_DOUBLE;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+size_t StructGridInterface::cellCountI() const
+{
+    if ( gridPointCountI() == 0 ) return 0;
+
+    return gridPointCountI() - 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+size_t StructGridInterface::cellCountJ() const
+{
+    if ( gridPointCountJ() == 0 ) return 0;
+
+    return gridPointCountJ() - 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+size_t StructGridInterface::cellCountK() const
+{
+    if ( gridPointCountK() == 0 ) return 0;
+
+    return gridPointCountK() - 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void StructGridInterface::cellFaceVertexIndices( FaceType face, cvf::ubyte vertexIndices[4] )
+{
+    //
+    //     7---------6
+    //    /|        /|     |k
+    //   / |       / |     | /j
+    //  4---------5  |     |/
+    //  |  3------|--2     *---i
+    //  | /       | /
+    //  |/        |/
+    //  0---------1
+
+    if ( face == NEG_K )
+    {
+        vertexIndices[0] = 0;
+        vertexIndices[1] = 3;
+        vertexIndices[2] = 2;
+        vertexIndices[3] = 1;
+    }
+    else if ( face == POS_K )
+    {
+        vertexIndices[0] = 4;
+        vertexIndices[1] = 5;
+        vertexIndices[2] = 6;
+        vertexIndices[3] = 7;
+    }
+    else if ( face == NEG_J )
+    {
+        vertexIndices[0] = 0;
+        vertexIndices[1] = 1;
+        vertexIndices[2] = 5;
+        vertexIndices[3] = 4;
+    }
+    else if ( face == POS_I )
+    {
+        vertexIndices[0] = 1;
+        vertexIndices[1] = 2;
+        vertexIndices[2] = 6;
+        vertexIndices[3] = 5;
+    }
+    else if ( face == POS_J )
+    {
+        vertexIndices[0] = 3;
+        vertexIndices[1] = 7;
+        vertexIndices[2] = 6;
+        vertexIndices[3] = 2;
+    }
+    else if ( face == NEG_I )
+    {
+        vertexIndices[0] = 0;
+        vertexIndices[1] = 4;
+        vertexIndices[2] = 7;
+        vertexIndices[3] = 3;
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+std::pair<ubyte, ubyte> StructGridInterface::edgeVertexIndices( FaceType face1, FaceType face2 )
+{
+    // Return the two shared vertex indices between two faces
+    // The ordering is identical to the ordering in StructGridInterface::cellFaceVertexIndices
+
+    // Ensure face1 has the largest enum value
+    if ( face2 > face1 ) std::swap( face1, face2 );
+
+    if ( face1 == NEG_K )
+    {
+        if ( face2 == NEG_I ) return { 0, 3 };
+        if ( face2 == POS_I ) return { 2, 1 };
+        if ( face2 == NEG_J ) return { 1, 0 };
+        if ( face2 == POS_J ) return { 3, 2 };
+    }
+
+    if ( face1 == POS_K )
+    {
+        if ( face2 == NEG_I ) return { 7, 4 };
+        if ( face2 == POS_I ) return { 5, 6 };
+        if ( face2 == NEG_J ) return { 4, 5 };
+        if ( face2 == POS_J ) return { 6, 7 };
+    }
+
+    if ( face1 == NEG_J )
+    {
+        if ( face2 == NEG_I ) return { 4, 0 };
+        if ( face2 == POS_I ) return { 1, 5 };
+    }
+
+    if ( face1 == POS_J )
+    {
+        if ( face2 == NEG_I ) return { 3, 7 };
+        if ( face2 == POS_I ) return { 6, 2 };
+    }
+
+    return {};
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+StructGridInterface::FaceType StructGridInterface::oppositeFace( FaceType face )
+{
+    FaceType opposite;
+
+    switch ( face )
+    {
+        case NEG_I:
+            opposite = POS_I;
+            break;
+        case POS_I:
+            opposite = NEG_I;
+            break;
+        case NEG_J:
+            opposite = POS_J;
+            break;
+        case POS_J:
+            opposite = NEG_J;
+            break;
+        case NEG_K:
+            opposite = POS_K;
+            break;
+        case POS_K:
+            opposite = NEG_K;
+            break;
+        default:
+            opposite = POS_I;
+            CVF_ASSERT( false );
+    }
+
+    return opposite;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Return values are set to cvf::UNDEFINED_SIZE_T if the neighbor is in the negative area
+//--------------------------------------------------------------------------------------------------
+void StructGridInterface::neighborIJKAtCellFace( size_t i, size_t j, size_t k, FaceType face, size_t* ni, size_t* nj, size_t* nk )
+{
+    *ni = i;
+    *nj = j;
+    *nk = k;
+
+    switch ( face )
+    {
+        case POS_I:
+            ( *ni )++;
+            break;
+        case NEG_I:
+            if ( i > 0 )
+                ( *ni )--;
+            else
+                ( *ni ) = cvf::UNDEFINED_SIZE_T;
+            break;
+        case POS_J:
+            ( *nj )++;
+            break;
+        case NEG_J:
+            if ( j > 0 )
+                ( *nj )--;
+            else
+                ( *nj ) = cvf::UNDEFINED_SIZE_T;
+            break;
+        case POS_K:
+            ( *nk )++;
+            break;
+        case NEG_K:
+            if ( k > 0 )
+                ( *nk )--;
+            else
+                ( *nk ) = cvf::UNDEFINED_SIZE_T;
+            break;
+        default:
+            break;
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+StructGridInterface::GridAxisType StructGridInterface::gridAxisFromFace( FaceType face )
+{
+    GridAxisType axis = GridAxisType::NO_AXIS;
+
+    if ( face == cvf::StructGridInterface::POS_I || face == cvf::StructGridInterface::NEG_I )
+    {
+        axis = GridAxisType::AXIS_I;
+    }
+    else if ( face == cvf::StructGridInterface::POS_J || face == cvf::StructGridInterface::NEG_J )
+    {
+        axis = GridAxisType::AXIS_J;
+    }
+    else if ( face == cvf::StructGridInterface::POS_K || face == cvf::StructGridInterface::NEG_K )
+    {
+        axis = GridAxisType::AXIS_K;
+    }
+
+    return axis;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Models with large absolute values for coordinate scalars will often end up with z-fighting due
+/// to numerical limits in float used by OpenGL. displayModelOffset() is intended
+//  to be subtracted from a domain model coordinate when building geometry
+//
+//  Used in StructGridGeometryGenerator::computeArrays()
+//
+//  Vec3d domainModelCoord = ...
+//  Vec3d vizCoord = domainModelCoord - displayModelOffset();
+//--------------------------------------------------------------------------------------------------
+cvf::Vec3d StructGridInterface::displayModelOffset() const
+{
+    return cvf::Vec3d::ZERO;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void StructGridInterface::characteristicCellSizes( double* iSize, double* jSize, double* kSize ) const
+{
+    CVF_ASSERT( iSize && jSize && kSize );
+
+    if ( m_characteristicCellSizeI == cvf::UNDEFINED_DOUBLE || m_characteristicCellSizeJ == cvf::UNDEFINED_DOUBLE ||
+         m_characteristicCellSizeK == cvf::UNDEFINED_DOUBLE )
+    {
+        ubyte faceConnPosI[4];
+        cellFaceVertexIndices( StructGridInterface::POS_I, faceConnPosI );
+
+        ubyte faceConnNegI[4];
+        cellFaceVertexIndices( StructGridInterface::NEG_I, faceConnNegI );
+
+        ubyte faceConnPosJ[4];
+        cellFaceVertexIndices( StructGridInterface::POS_J, faceConnPosJ );
+
+        ubyte faceConnNegJ[4];
+        cellFaceVertexIndices( StructGridInterface::NEG_J, faceConnNegJ );
+
+        ubyte faceConnPosK[4];
+        cellFaceVertexIndices( StructGridInterface::POS_K, faceConnPosK );
+
+        ubyte faceConnNegK[4];
+        cellFaceVertexIndices( StructGridInterface::NEG_K, faceConnNegK );
+
+        double iLengthAccumulated = 0.0;
+        double jLengthAccumulated = 0.0;
+        double kLengthAccumulated = 0.0;
+
+        cvf::Vec3d cornerVerts[8];
+        size_t     cellCount = 0;
+
+        size_t k;
+        for ( k = 0; k < cellCountK(); k++ )
+        {
+            size_t j;
+            for ( j = 0; j < cellCountJ(); j++ )
+            {
+                size_t i;
+                for ( i = 0; i < cellCountI(); i += 10 ) // NB! Evaluate every n-th cell
+                {
+                    if ( isCellValid( i, j, k ) )
+                    {
+                        size_t cellIndex = cellIndexFromIJK( i, j, k );
+                        cellCornerVertices( cellIndex, cornerVerts );
+
+                        iLengthAccumulated +=
+                            ( cornerVerts[faceConnPosI[0]] - cornerVerts[faceConnNegI[0]] ).lengthSquared();
+                        iLengthAccumulated +=
+                            ( cornerVerts[faceConnPosI[1]] - cornerVerts[faceConnNegI[3]] ).lengthSquared();
+                        iLengthAccumulated +=
+                            ( cornerVerts[faceConnPosI[2]] - cornerVerts[faceConnNegI[2]] ).lengthSquared();
+                        iLengthAccumulated +=
+                            ( cornerVerts[faceConnPosI[3]] - cornerVerts[faceConnNegI[1]] ).lengthSquared();
+
+                        jLengthAccumulated +=
+                            ( cornerVerts[faceConnPosJ[0]] - cornerVerts[faceConnNegJ[0]] ).lengthSquared();
+                        jLengthAccumulated +=
+                            ( cornerVerts[faceConnPosJ[1]] - cornerVerts[faceConnNegJ[3]] ).lengthSquared();
+                        jLengthAccumulated +=
+                            ( cornerVerts[faceConnPosJ[2]] - cornerVerts[faceConnNegJ[2]] ).lengthSquared();
+                        jLengthAccumulated +=
+                            ( cornerVerts[faceConnPosJ[3]] - cornerVerts[faceConnNegJ[1]] ).lengthSquared();
+
+                        kLengthAccumulated +=
+                            ( cornerVerts[faceConnPosK[0]] - cornerVerts[faceConnNegK[0]] ).lengthSquared();
+                        kLengthAccumulated +=
+                            ( cornerVerts[faceConnPosK[1]] - cornerVerts[faceConnNegK[3]] ).lengthSquared();
+                        kLengthAccumulated +=
+                            ( cornerVerts[faceConnPosK[2]] - cornerVerts[faceConnNegK[2]] ).lengthSquared();
+                        kLengthAccumulated +=
+                            ( cornerVerts[faceConnPosK[3]] - cornerVerts[faceConnNegK[1]] ).lengthSquared();
+
+                        cellCount++;
+                    }
+                }
+            }
+        }
+
+        double divisor = cellCount * 4.0;
+
+        if ( divisor > 0.0 )
+        {
+            m_characteristicCellSizeI = cvf::Math::sqrt( iLengthAccumulated / divisor );
+            m_characteristicCellSizeJ = cvf::Math::sqrt( jLengthAccumulated / divisor );
+            m_characteristicCellSizeK = cvf::Math::sqrt( kLengthAccumulated / divisor );
+        }
+    }
+
+    *iSize = m_characteristicCellSizeI;
+    *jSize = m_characteristicCellSizeJ;
+    *kSize = m_characteristicCellSizeK;
+}
+
+} // namespace cvf
+} //namespace external

external/resinsight/CommonCode/cvfStructGrid.h

@@ -0,0 +1,135 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+#pragma once
+
+#include "../LibCore/cvfObject.h"
+#include "../LibCore/cvfVector3.h"
+#include <cstddef>
+
+// #include "../cafPdmCore/cafAppEnum.h"
+
+namespace external 
+{
+namespace cvf
+{
+class CellFilterBase;
+
+// Navneforslag
+//    StructGridGeometryGeneratorInterface
+
+// Main purpose of this class is to define the interface to be used by geometry generators
+class StructGridInterface : public Object
+{
+public:
+    enum FaceType
+    {
+        POS_I,
+        NEG_I,
+        POS_J,
+        NEG_J,
+        POS_K,
+        NEG_K,
+        NO_FACE
+    };
+
+    // typedef caf::AppEnum<StructGridInterface::FaceType> FaceEnum;
+
+    enum class GridAxisType
+    {
+        AXIS_I,
+        AXIS_J,
+        AXIS_K,
+        NO_AXIS
+    };
+
+public:
+    StructGridInterface();
+
+    virtual size_t gridPointCountI() const = 0;
+    virtual size_t gridPointCountJ() const = 0;
+    virtual size_t gridPointCountK() const = 0;
+
+    size_t cellCountI() const;
+    size_t cellCountJ() const;
+    size_t cellCountK() const;
+
+    virtual bool isCellValid( size_t i, size_t j, size_t k ) const = 0;
+
+    virtual cvf::Vec3d minCoordinate() const = 0;
+    virtual cvf::Vec3d maxCoordinate() const = 0;
+    void               characteristicCellSizes( double* iSize, double* jSize, double* kSize ) const;
+
+    virtual cvf::Vec3d displayModelOffset() const;
+
+    virtual bool cellIJKNeighbor( size_t i, size_t j, size_t k, FaceType face, size_t* neighborCellIndex ) const = 0;
+
+    virtual size_t cellIndexFromIJK( size_t i, size_t j, size_t k ) const                      = 0;
+    virtual bool   ijkFromCellIndex( size_t cellIndex, size_t* i, size_t* j, size_t* k ) const = 0;
+
+    virtual bool cellIJKFromCoordinate( const cvf::Vec3d& coord, size_t* i, size_t* j, size_t* k ) const = 0;
+
+    virtual void       cellCornerVertices( size_t cellIndex, cvf::Vec3d vertices[8] ) const = 0;
+    virtual cvf::Vec3d cellCentroid( size_t cellIndex ) const                               = 0;
+    virtual void cellMinMaxCordinates( size_t cellIndex, cvf::Vec3d* minCoordinate, cvf::Vec3d* maxCoordinate ) const = 0;
+
+    virtual size_t     gridPointIndexFromIJK( size_t i, size_t j, size_t k ) const = 0;
+    virtual cvf::Vec3d gridPointCoordinate( size_t i, size_t j, size_t k ) const   = 0;
+
+public:
+    static void     cellFaceVertexIndices( FaceType face, cvf::ubyte vertexIndices[4] );
+    static FaceType oppositeFace( FaceType face );
+    static void     neighborIJKAtCellFace( size_t                        i,
+                                           size_t                        j,
+                                           size_t                        k,
+                                           StructGridInterface::FaceType face,
+                                           size_t*                       ni,
+                                           size_t*                       nj,
+                                           size_t*                       nk );
+
+    static GridAxisType gridAxisFromFace( FaceType face );
+
+    static std::pair<ubyte, ubyte> edgeVertexIndices( cvf::StructGridInterface::FaceType face1,
+                                                      cvf::StructGridInterface::FaceType face2 );
+
+private:
+    mutable double m_characteristicCellSizeI;
+    mutable double m_characteristicCellSizeJ;
+    mutable double m_characteristicCellSizeK;
+};
+
+} // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfArray.h

@@ -0,0 +1,153 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfObject.h"
+#include "cvfValueArray.h"
+
+#include <vector>
+
+namespace external 
+{
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Templated array designed for high performance and no overhead over C arrays.
+//
+//==================================================================================================
+template <typename T>
+class Array : public Object, public ValueArray<T>
+{
+public:
+    Array();
+    Array(const Array& other);
+    Array(const T* data, size_t size);
+    explicit Array(size_t size);
+    explicit Array(const ValueArray<T>& other);
+    explicit Array(const std::vector<T>& other);
+    ~Array();
+
+    inline const T& operator[](size_t index) const;
+    inline T&       operator[](size_t index);
+    Array&          operator=(Array rhs);
+
+    void                    assign(const T* data, size_t size);
+    void                    assign(const std::vector<T>& data);
+    void                    resize(size_t size);
+    void                    clear();
+    inline virtual size_t   size() const;
+
+    inline void             set(size_t index, const T& val);
+    inline void             setAll(const T& val);
+    inline void             setConsecutive(const T& startVal);
+    inline const T&         get(size_t index) const;
+    inline virtual T        val(size_t index) const;
+
+    inline const T* ptr() const;
+    inline T*       ptr();
+    inline const T* ptr(size_t index) const;
+    inline T*       ptr(size_t index);
+
+    void            setSharedPtr(T* data, size_t size);
+    void            setPtr(T* data, size_t size);   
+
+    void            copyData(const T* source, size_t numElementsToCopy, size_t destIndex);
+    void            copyData(const Array<T>& source, size_t numElementsToCopy, size_t destIndex, size_t sourceIndex);
+
+    template<typename U> 
+    void            copyConvertedData(const Array<U>& source, size_t numElementsToCopy, size_t destIndex, size_t sourceIndex);
+
+    template<typename U> 
+    ref<Array<T> >  extractElements(const Array<U>& elementIndices) const;
+
+    void            toStdVector(std::vector<T>* vec) const;
+
+    size_t          capacity() const;        
+    void            reserve(size_t capacity);
+    void            squeeze();
+    void            setSizeZero();
+    inline void     add(const T& val);
+
+    T               min(size_t* index = 0) const;
+    T               max(size_t* index = 0) const;
+
+    void            swap(Array& other);
+
+    // Basic iterator support to be able to utilize STL algorithms
+public:
+    typedef T*          iterator;
+    typedef const T*    const_iterator;
+
+    inline iterator begin()             { return m_data; }
+    inline iterator end()               { return m_data + m_size; }
+    inline const_iterator begin() const { return m_data; }
+    inline const_iterator end() const   { return m_data + m_size; }
+
+private:
+    void ground();
+
+private:
+    size_t  m_size;                 ///< Number of elements/items in array
+    size_t  m_capacity;             ///< Size of the allocated buffer
+    T*      m_data;                 ///< Array holding the actual data
+    bool    m_sharedData;           ///< True if the data member is shared with another object and cannot be changed                
+};
+
+
+// Only works for simple types that don't require copy operators.
+typedef Array<int>              IntArray;
+typedef Array<uint>				UIntArray;
+typedef Array<ushort>			UShortArray;
+typedef Array<ubyte>			UByteArray;
+typedef Array<float>            FloatArray;
+typedef Array<double>           DoubleArray;
+typedef Array<Vec2f>            Vec2fArray;
+typedef Array<Vec2d>            Vec2dArray;
+typedef Array<Vec3f>            Vec3fArray;
+typedef Array<Vec3d>            Vec3dArray;
+typedef Array<Vec4f>            Vec4fArray;
+typedef Array<Vec4d>            Vec4dArray;
+typedef Array<Color3ub>         Color3ubArray;
+typedef Array<Color3f>          Color3fArray;
+typedef Array<Color4ub>         Color4ubArray;
+
+}
+} //namespace external
+#include "cvfArray.inl"

external/resinsight/LibCore/cvfArray.inl

@@ -0,0 +1,785 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external 
+{
+namespace cvf {
+
+
+//==================================================================================================
+///
+/// \class cvf::Array
+/// \ingroup Core
+///
+/// Templated version of a simple array designed for high performance and no overhead over C arrays 
+/// in release (non-check builds).
+///
+/// Will only work on simple types and classes that do not rely on a constructor or 
+/// destructor (as they are not called).
+/// 
+//==================================================================================================
+
+
+//--------------------------------------------------------------------------------------------------
+/// Create an empty array
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>::Array()
+{
+    ground();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Create an array with the given number of elements
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>::Array(size_t size)
+{
+    CVF_ASSERT(size > 0);
+    ground();
+    resize(size);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Create the array and assign (copy) the given data
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>::Array(const T* data, size_t size)
+{
+    CVF_ASSERT(data);
+    CVF_ASSERT(size > 0);
+
+    ground();
+    assign(data, size);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Create the array and assign (copy) the given data
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>::Array(const Array& other)
+: Object(), ValueArray<T>()
+{
+    ground();
+
+    if (other.size() > 0)
+    {
+        assign(other.m_data, other.size());
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Explicit constructor to create the array and assign (copy) the passed value array
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>::Array(const ValueArray<T>& other)
+{
+    ground();
+
+    if (other.size() > 0)
+    {
+        resize(other.size());
+
+        size_t i;
+        for (i = 0; i < other.size(); i++)
+        {
+            set(i, other.val(i));
+        }
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Explicit constructor to create the array and assign (copy) the passed std::vector
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>::Array(const std::vector<T>& other)
+{
+    ground();
+
+    if (other.size() > 0)
+    {
+        assign(other);
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Init all members
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::ground()
+{
+    m_size = 0;
+    m_data = NULL;
+    m_capacity = 0;   
+    m_sharedData = false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Destructor. Deletes the data.
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>::~Array()
+{
+    clear();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns a const reference to the element at the given index.
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline const T& Array<T>::operator[] (size_t index) const
+{
+    CVF_TIGHT_ASSERT(m_data);
+    CVF_TIGHT_ASSERT(index < m_size);
+
+    return m_data[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns a modifiable reference to the element at the given index.
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline T& Array<T>::operator[] (size_t index)
+{
+    CVF_TIGHT_ASSERT(m_data);
+    CVF_TIGHT_ASSERT(index < m_size);
+
+    return m_data[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assign (copy) the data in the given array
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Array<T>& Array<T>::operator=(Array rhs)
+{
+    CVF_TIGHT_ASSERT(!m_sharedData);
+
+    rhs.swap(*this);
+
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Resize the array to the given size.
+/// The current contents (data) will be kept (as much as possible). Any new elements will be unassigned.
+/// Calling resize(0) is the same as clear().
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::resize(size_t size)
+{
+    CVF_ASSERT(!m_sharedData);
+
+    if (size > 0)
+    {
+        if (m_data)
+        {
+            // Copy old data
+            T* pTmp = m_data;
+            m_data = new T[size];
+            
+            size_t numToCopy = CVF_MIN(size, m_size);
+            cvf::System::memcpy(m_data, size*sizeof(T), pTmp, numToCopy*sizeof(T));
+
+            delete[] pTmp;
+        }
+        else
+        {
+            m_data = new T[size];
+        }
+
+        m_size = size;
+        m_capacity = size;
+    }
+    else
+    {
+        clear();
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Clear the array, freeing all memory (if not shared) and setting capacity and size to zero.
+/// If the array was in shared mode, it will not be in shared mode anymore.
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::clear()
+{
+    if (!m_sharedData) 
+    {
+        delete[] m_data;
+    }
+
+    ground();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the number of elements in the array
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline size_t Array<T>::size() const
+{
+    return m_size;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the element at the given index. Index must be < size()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline void Array<T>::set(size_t index, const T& val)
+{
+    CVF_TIGHT_ASSERT(index < m_size);
+
+    m_data[index] = val;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set all elements in the array to the given value
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline void Array<T>::setAll(const T& val)
+{
+    size_t i;
+    for (i = 0; i < m_size; i++)
+    {
+        set(i, val);
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assign consecutive values to the elements in the array
+/// 
+/// Example: setConsecutive(2) on an array with size=3 gives: {2,3,4}
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::setConsecutive(const T& startValue)
+{
+    T val = startValue;
+    size_t i;
+    for (i = 0; i < m_size; i++)
+    {
+        set(i, val++);
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns a const reference to the element at the given index
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+const T& cvf::Array<T>::get(size_t index) const
+{
+    CVF_TIGHT_ASSERT(index < m_size);
+    return m_data[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+T cvf::Array<T>::val(size_t index) const
+{
+    CVF_TIGHT_ASSERT(index < m_size);
+    return m_data[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns a const native pointer to the array storing the data
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline const T* Array<T>::ptr() const
+{
+    return m_data;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the native pointer to the array storing the data
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline T* Array<T>::ptr()
+{
+    return m_data;
+}
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns a const native pointer to the array storing the data
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline const T* Array<T>::ptr(size_t index) const
+{
+    CVF_TIGHT_ASSERT(index < m_size);
+
+    return &m_data[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the native pointer to the array storing the data
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline T* Array<T>::ptr(size_t index)
+{
+    CVF_TIGHT_ASSERT(index < m_size);
+
+    return &m_data[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Data shared with another class. Will not delete on destruction. 
+///
+/// Any method that reallocates data (resize, assign & setPtr) is not allowed and will assert
+/// The only way to break the shared 'connection' is via clear()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::setSharedPtr(T* data, size_t size)
+{
+    CVF_ASSERT((data && size > 0) || (!data && size == 0));
+
+    clear();
+
+    m_data = data;
+    m_size = size;
+    m_sharedData = true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the data in the array to use the passed array. 
+/// 
+/// This class takes ownership of the passed data.
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::setPtr(T* data, size_t size)
+{
+    CVF_ASSERT((data && size > 0) || (!data && size == 0));
+
+    // Not allowed
+    // The only way to break the shared 'connection' is via clear()
+    CVF_ASSERT(!m_sharedData);
+    
+    clear();
+
+    m_data = data;
+    m_size = size;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Delete any current data and set from the given data pointer
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::assign(const T* data, size_t size)
+{
+    CVF_ASSERT(data);
+    CVF_ASSERT(size > 0);
+    CVF_ASSERT(!m_sharedData);
+
+    clear();
+    resize(size);
+    
+    // copy
+    cvf::System::memcpy(m_data, m_size*sizeof(T), data, size*sizeof(T));
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Delete any current data and set from the given data
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::assign(const std::vector<T>& data)
+{
+    CVF_ASSERT(!m_sharedData);
+
+    clear();
+
+    size_t newSize = data.size();
+    if (newSize > 0)
+    {
+        resize(newSize);
+
+        cvf::System::memcpy(m_data, m_size*sizeof(T), &data[0], newSize*sizeof(T));
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy data into the array
+/// 
+/// \warning Must have enough room for the new data, meaning the array must be resize()'ed before use
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::copyData(const T* pSource, size_t numElementsToCopy, size_t destIndex)
+{
+    CVF_ASSERT(pSource);
+    CVF_ASSERT(numElementsToCopy > 0);
+    CVF_ASSERT(destIndex < m_size);
+    CVF_ASSERT(destIndex + numElementsToCopy <= m_size);
+
+    cvf::System::memcpy(m_data + destIndex, (m_size - destIndex)*sizeof(T), pSource, numElementsToCopy*sizeof(T));
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy data into the array
+/// 
+/// \warning Must have enough room for the new data, meaning the array must be resize()'ed before use
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::copyData(const Array<T>& source, size_t numElementsToCopy, size_t destIndex, size_t sourceIndex)
+{
+    CVF_ASSERT(numElementsToCopy > 0);
+    CVF_ASSERT(destIndex < m_size);
+    CVF_ASSERT(numElementsToCopy + destIndex <= m_size);
+
+    cvf::System::memcpy(m_data + destIndex, (m_size - destIndex)*sizeof(T), source.ptr() + sourceIndex, numElementsToCopy*sizeof(T));    
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy data into this array with conversion. 
+/// Data in source array will be converted using static_cast
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+template <typename U>
+void Array<T>::copyConvertedData(const Array<U>& source, size_t numElementsToCopy, size_t destIndex, size_t sourceIndex)
+{
+    CVF_ASSERT(numElementsToCopy > 0);
+    CVF_ASSERT(destIndex < m_size);
+    CVF_ASSERT(numElementsToCopy + destIndex <= m_size);
+
+    size_t dst = destIndex;
+
+    size_t i;
+    for (i = sourceIndex; i < sourceIndex + numElementsToCopy; i++)
+    {
+        m_data[dst++] = static_cast<T>(source[i]);
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns an array containing the specified elements
+/// 
+/// Example:
+/// <PRE>
+///   this           = {2.0, 5.5, 100.0}
+///   elementIndices = {  0,     2,   1,   0,     2}
+///   -> output      = {2.0, 100.0, 5.5, 2.0, 100.0}
+/// </PRE>
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+template <typename U>
+ref<Array<T> > Array<T>::extractElements(const Array<U>& elementIndices) const
+{
+    ref<Array<T> > arr = new Array<T>;
+    size_t numItems = elementIndices.size();
+    
+    if (numItems > 0)
+    {
+        arr->resize(numItems);
+        
+        size_t i;
+        for (i = 0; i < numItems; i++)
+        {
+            U idx = elementIndices[i];
+            arr->set(i, get(idx));
+        }
+    }
+
+    return arr;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy the contents of the array to the given std::vector
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::toStdVector(std::vector<T>* vec) const
+{
+    CVF_ASSERT(vec);
+
+    size_t numItems = size();
+    vec->resize(numItems);
+
+    size_t i;
+    for (i = 0; i < numItems; i++)
+    {
+        (*vec)[i] = (*this)[i];
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the current capacity of the array (the size of the buffer). This will return a number >= size(), 
+/// depending on if reserve() has been used or not.
+/// If capacity() > size(), then add() is allowed on the array.
+///
+/// \sa
+///  - reserve()
+///  - add()
+///  - squeeze()
+///  - setSizeZero()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+size_t Array<T>::capacity() const
+{
+    return m_capacity;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Reserve (allocate) at least the given number of items.
+/// If capacity is less than the current buffer, nothing is done.
+/// size() of the array is not changed.
+///
+/// \sa
+///  - capacity()
+///  - add()
+///  - squeeze()
+///  - setSizeZero()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::reserve(size_t capacity)
+{
+    CVF_ASSERT(!m_sharedData);
+
+    if ((capacity <= m_size) || (capacity <= m_capacity))
+    {
+        // Required capacity is less than current capacity, done!
+        return;
+    }
+
+    CVF_ASSERT(capacity > 0);
+    CVF_ASSERT(capacity > m_size);
+
+    if (m_data)
+    {
+        // Copy old data
+        T* pTmp = m_data;
+        m_data = new T[capacity];
+        m_capacity = capacity;
+
+        cvf::System::memcpy(m_data, capacity*sizeof(T), pTmp, m_size*sizeof(T));
+
+        delete[] pTmp;
+    }
+    else
+    {
+        // alloc
+        m_data = new T[capacity];
+        m_capacity = capacity;
+    }
+
+    CVF_ASSERT(m_size <= m_capacity);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Realloc the array to the current size(). Removing any reserved memory created by reserve().
+///
+/// \sa
+///  - reserve()
+///  - capacity()
+///  - add()
+///  - setSizeZero()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::squeeze()
+{
+    CVF_ASSERT(!m_sharedData);
+
+    if (m_data && (m_size < m_capacity))
+    {
+        if (m_size > 0)
+        {
+            // Copy old data
+            T* pTmp = m_data;
+            m_data = new T[m_size];
+
+            cvf::System::memcpy(m_data, m_capacity*sizeof(T), pTmp, m_size*sizeof(T));
+
+            delete[] pTmp;
+
+            m_capacity = m_size;
+        }
+        else
+        {
+            clear();
+        }
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the size (number of items) in the array to zero, but keep the buffer. Items in the buffer 
+/// are not modified.
+///
+/// \sa
+///  - reserve()
+///  - capacity()
+///  - add()
+///  - squeeze()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::setSizeZero()
+{
+    CVF_TIGHT_ASSERT(!m_sharedData);
+
+    m_size = 0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Add an item to the array. 
+///
+/// Note that this will not grow the array, so the array needs to be pre-allocated with reserve() 
+/// before calling this method. The method will assert if not enough space.
+///
+/// \sa
+///  - reserve()
+///  - capacity()
+///  - squeeze()
+///  - setSizeZero()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+inline void Array<T>::add(const T& val)
+{
+    CVF_TIGHT_ASSERT(!m_sharedData);
+    CVF_TIGHT_ASSERT(m_size < m_capacity);
+    
+    m_data[m_size] = val;
+    m_size++;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the min value and optionally the index of the (first) min value
+/// Works only on arrays with types that implement comparison operators
+/// Empty arrays will return std::numeric_limits<T>::max() and not modify index
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+T Array<T>::min(size_t* index) const
+{
+    T minVal = std::numeric_limits<T>::max();
+
+    size_t i;
+    for (i = 0; i < m_size; i++)
+    {
+        if (m_data[i] < minVal)
+        {
+            minVal = m_data[i];
+            
+            if (index) 
+            {
+                *index = i;
+            }
+        }
+    }
+
+    return minVal;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the min value and optionally the index of the (first) min value
+/// Works only on arrays with types that implement comparison operators
+/// Empty arrays will return std::numeric_limits<T>::max() and not modify index
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+T Array<T>::max(size_t* index) const
+{
+    T maxVal = std::numeric_limits<T>::min();
+
+    size_t i;
+    for (i = 0; i < m_size; i++)
+    {
+        if (m_data[i] > maxVal)
+        {
+            maxVal = m_data[i];
+            
+            if (index) 
+            {
+                *index = i;
+            }
+        }
+    }
+
+    return maxVal;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Exchanges the contents of the two arrays.
+/// 
+/// \param other  Modifiable reference to the array that should have its contents swapped.
+/// 
+/// \warning Note that signature differs from normal practice. This is done to be 
+///          consistent with the signature of std::swap()
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Array<T>::swap(Array& other)
+{
+    using std::swap;
+
+    swap(m_size, other.m_size);    
+    swap(m_capacity, other.m_capacity);    
+    swap(m_data, other.m_data);    
+    swap(m_sharedData, other.m_sharedData);    
+}
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfArrayWrapperConst.h

@@ -0,0 +1,156 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) Ceetron Solutions AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+#pragma once
+
+namespace external {
+namespace cvf {
+
+//--------------------------------------------------------------------------------------------------
+/// 
+/// \class cvf::ArrayWrapperConst
+/// \ingroup Core
+///
+/// A wrapper class for const access to make it possible to use different array types with 
+/// different element types in the same algorithms. 
+///
+/// The implementation has a specialization for bare pointer arrays.
+/// The reason for the bare pointer specialization is the [] access implementation 
+/// which is different. (*array)[] vs array[]
+///
+/// The convenience functions wrapArrayConst() are available to simplify wrapping of your data making it 
+/// possible to do: 
+///    myFunction (wrapArrayConst(myNodeArray), wrapArrayConst(myIndexArray), ...); 
+/// when calling a template function using ArrayWrapperConst's as input.
+/// 
+//--------------------------------------------------------------------------------------------------
+
+template < typename ArrayType, typename ElmType >
+class ArrayWrapperConst
+{
+public:
+    ArrayWrapperConst(const ArrayType* array, size_t size) : m_array(array), m_size(size) { }
+
+    inline size_t size() const { return m_size; } 
+    inline const ElmType& operator[] (const size_t index) const { return (*m_array)[index]; }
+
+private:
+    const ArrayType * m_array;
+    size_t m_size;
+};
+
+//--------------------------------------------------------------------------------------------------
+/// Const bare-pointer array wrapper specialization
+//--------------------------------------------------------------------------------------------------
+template < typename ElmType >
+class ArrayWrapperConst <const ElmType*, ElmType>
+{
+public:
+    ArrayWrapperConst(const ElmType* array, size_t size) : m_array(array), m_size(size) { }
+
+    inline size_t size() const { return m_size; } 
+
+    inline const ElmType&  operator[](const size_t index) const { return m_array[index]; }
+
+private:
+    const ElmType * m_array;
+    size_t m_size;
+};
+
+
+
+#include "cvfArray.h"
+#include <vector>
+
+//--------------------------------------------------------------------------------------------------
+/// const cvf::Array specialization
+//--------------------------------------------------------------------------------------------------
+template <typename ElmType>
+inline const ArrayWrapperConst< const cvf::Array<ElmType>, ElmType > wrapArrayConst(const cvf::Array<ElmType>* array )
+{
+    const ArrayWrapperConst<const cvf::Array<ElmType>, ElmType> warr(array, array->size());
+    return warr;
+}
+
+template <typename ElmType>
+inline const ArrayWrapperConst< const cvf::Array<ElmType>, ElmType > wrapArrayConst( cvf::Array<ElmType>* array )
+{
+    const ArrayWrapperConst<const cvf::Array<ElmType>, ElmType> warr(array, array->size());
+    return warr;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// const std::vector specialization
+//--------------------------------------------------------------------------------------------------
+
+template <typename ElmType>
+inline const ArrayWrapperConst<  const std::vector<ElmType>, ElmType > wrapArrayConst( const std::vector<ElmType>* array )
+{
+    const ArrayWrapperConst< const std::vector<ElmType>, ElmType> warr(array, array->size());
+    return warr;
+}
+
+
+template <typename ElmType>
+inline const ArrayWrapperConst<  const std::vector<ElmType>, ElmType > wrapArrayConst( std::vector<ElmType>* array )
+{
+    const ArrayWrapperConst< const std::vector<ElmType>, ElmType> warr(array, array->size());
+    return warr;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// const Bare-pointer specialization
+//--------------------------------------------------------------------------------------------------
+
+template <typename ElmType>
+inline const ArrayWrapperConst< const  ElmType*, ElmType > wrapArrayConst( const ElmType* array, size_t size )
+{
+    const ArrayWrapperConst<const ElmType*, ElmType> warr(array, size);
+    return warr;
+}
+
+
+template <typename ElmType>
+inline const ArrayWrapperConst< const  ElmType*, ElmType > wrapArrayConst( ElmType* array, size_t size )
+{
+    const ArrayWrapperConst<const ElmType*, ElmType> warr(array, size);
+    return warr;
+}
+
+}
+
+} //namespace external

external/resinsight/LibCore/cvfAssert.cpp

@@ -0,0 +1,478 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfAssert.h"
+#include "cvfSystem.h"
+
+#include <cstdlib>
+#include <iostream>
+#include <string>
+
+#ifdef WIN32
+#pragma warning (push)
+#pragma warning (disable: 4668)
+#include <windows.h>
+#pragma warning (pop)
+#include <io.h>
+#include <signal.h>
+#include <fcntl.h>
+#endif
+
+namespace external {
+namespace cvf {
+
+
+// User actions (interactive responses)
+static const int USERACTION_CONTINUE    = 0;
+static const int USERACTION_DEBUGBREAK  = 1;
+static const int USERACTION_ABORT       = 2;
+
+
+
+//==================================================================================================
+///
+/// \class cvf::AssertHandler
+/// \ingroup Core
+///
+/// Base class for assert handlers
+///
+//==================================================================================================
+class AssertHandler
+{
+public:
+    virtual ~AssertHandler() {}
+    virtual Assert::FailAction  handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg) = 0;
+};
+
+
+
+//==================================================================================================
+///
+/// \class cvf::AssertHandlerConsole
+/// \ingroup Core
+///
+/// Assert handler for basic assert output to console
+///
+//==================================================================================================
+class AssertHandlerConsole : public AssertHandler
+{
+public:
+    virtual Assert::FailAction  handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg);
+
+private:
+    static void reportToConsole(const char* fileName, int lineNumber, const char* expr, const char* msg);
+    static int  askForUserActionUsingConsole();
+#ifdef WIN32
+    static void winCreateConsoleAndRedirectIO(bool redirectInput);
+#endif
+};
+
+
+//--------------------------------------------------------------------------------------------------
+/// Show report of a failed assert in console and abort execution
+/// 
+/// On Windows, a console will be created if one doesn't exist (GUI applications)
+//--------------------------------------------------------------------------------------------------
+Assert::FailAction AssertHandlerConsole::handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg)
+{
+    // Just shows assert message in console.
+    // Does the job on both Windows and Linux (creates a console on Windows if one doesn't exist)
+    reportToConsole(fileName, lineNumber, expr, msg);
+
+#ifdef _MSC_VER
+#if (_MSC_VER >= 1600)
+    if (::IsDebuggerPresent()) 
+#endif
+	{
+        __debugbreak();
+    }
+#endif
+
+    abort();
+
+    // Shouldn't really matter since we always abort
+    return Assert::CONTINUE;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void AssertHandlerConsole::reportToConsole(const char* fileName, int lineNumber, const char* expr, const char* msg)
+{
+#ifdef WIN32
+    // Make sure we have a console (applicable to Windows GUI applications)
+    winCreateConsoleAndRedirectIO(false);
+#endif
+
+    std::cerr << "Assertion failed:";
+
+    if (expr)
+    {
+        std::cerr << " (" << expr << ")";
+    }
+
+    if (msg)
+    {
+        std::cerr << " '" << msg << "'";
+    }
+
+    if (expr || msg)
+    {
+        std::cerr << ",";
+    }
+
+    std::cerr <<  " file " << fileName << ", line " << lineNumber << std::endl;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Ask for user action using console input
+/// 
+/// \return  One of the USERACTION_ constants
+//--------------------------------------------------------------------------------------------------
+int AssertHandlerConsole::askForUserActionUsingConsole()
+{
+#ifdef WIN32
+    // Make sure we have a console (applicable to Windows GUI applications)
+    // Also ensures that input is redirected
+    winCreateConsoleAndRedirectIO(true);
+#endif
+
+    // Let abort be the default choice
+#ifdef WIN32
+    std::cerr << "Choose action: [A]bort, [R]etry (debug) or [I]gnore: default [A]\n";
+#else
+    std::cerr << "Choose action: [A]bort or [I]gnore: default [A]\n";
+#endif
+
+    // Reset failstate, just in case.
+    std::cin.clear();
+
+    std::string line;
+    while (std::getline(std::cin, line))
+    {
+        int ch = 0;
+        if (!std::cin.fail() && line.length() == 1)
+        {
+            ch = tolower(line[0]);
+        }
+
+        if (ch == 'i')
+        {
+            return USERACTION_CONTINUE;
+        }
+#ifdef WIN32
+        else if (ch == 'r')
+        {
+            return USERACTION_DEBUGBREAK;
+        }
+#endif
+        else if (ch == 'a' || line.length() == 0)
+        {
+            return USERACTION_ABORT;
+        }
+    }
+
+    return USERACTION_ABORT;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Creates a console and redirects I/O from/to it (Windows only)
+/// 
+/// \param redirectInput  If true, input will also be redirected.
+/// 
+/// Function is useful for Windows GUI applications. Allocates a console if it doesn't exist and 
+/// then redirects output to the console. Also redirects input if \a redirectInput is true
+//--------------------------------------------------------------------------------------------------
+#ifdef WIN32
+void AssertHandlerConsole::winCreateConsoleAndRedirectIO(bool redirectInput)
+{
+    // Allocate a new console for this app
+    // Only one console can be associated with an app, so should fail if a console is already present.
+    AllocConsole();
+
+
+    bool redirStdOut = true;
+    bool redirStdErr = true;
+    bool redirStdIn = redirectInput;
+
+    if (redirStdOut)
+    {
+        HANDLE stdHandle = GetStdHandle(STD_OUTPUT_HANDLE);
+        int fileDescriptor = _open_osfhandle((intptr_t)stdHandle, _O_TEXT);
+        FILE* fp = _fdopen(fileDescriptor, "w");
+
+        *stdout = *fp;
+        setvbuf(stdout, NULL, _IONBF, 0);
+    }
+
+    if (redirStdErr)
+    {
+        HANDLE stdHandle = GetStdHandle(STD_ERROR_HANDLE);
+        int fileDescriptor = _open_osfhandle((intptr_t)stdHandle, _O_TEXT);
+        FILE* fp = _fdopen(fileDescriptor, "w");
+
+        *stderr = *fp;
+        setvbuf(stderr, NULL, _IONBF, 0);
+    }
+
+    if (redirStdIn)
+    {
+        HANDLE stdHandle = GetStdHandle(STD_INPUT_HANDLE);
+        int fileDescriptor = _open_osfhandle((intptr_t)stdHandle, _O_TEXT);
+        FILE* fp = _fdopen(fileDescriptor, "r");
+
+        *stdin = *fp;
+        setvbuf(stdin, NULL, _IONBF, 0);
+    }
+
+
+    // Make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog point to console as well
+    std::ios::sync_with_stdio();
+}
+#endif
+
+
+
+//==================================================================================================
+///
+/// \class cvf::AssertHandlerWinDialog
+/// \ingroup Core
+///
+/// Assert handler for Windows, using a dialog with interaction
+///
+//==================================================================================================
+#ifdef WIN32
+class AssertHandlerWinDialog : public AssertHandler
+{
+public:
+    virtual Assert::FailAction  handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg);
+
+private:
+    static int  handleUsingDialog(const char* fileName, int lineNumber, const char* expr, const char* msg);
+#ifdef _DEBUG
+    static int  handleUsingCrtDbgReport(const char* fileName, int lineNumber, const char* expr, const char* msg);
+#endif
+};
+#endif
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+#ifdef WIN32
+Assert::FailAction AssertHandlerWinDialog::handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg)
+{
+    //int retVal = handleUsingCrtDbgReport(fileName, lineNumber, expr, msg);
+    int retVal = handleUsingDialog(fileName, lineNumber, expr, msg);
+
+    if (retVal == USERACTION_CONTINUE)
+    {
+        return Assert::CONTINUE;
+    }
+    else if (retVal == USERACTION_DEBUGBREAK)
+    {
+        return Assert::DEBUGBREAK;
+    }
+    else if (retVal == USERACTION_ABORT)
+    {
+        // From __crtMessageWindow() in response to user clicking abort button
+        // Note that it is better NOT to call abort() here, because the default implementation of abort() will call Watson
+        // raise abort signal
+        raise(SIGABRT);
+
+        // We usually won't get here, but it's possible that SIGABRT was ignored.  
+        // So exit the program anyway. 
+        _exit(3);
+    }
+
+    // Shouldn't be getting here
+    abort();
+    return Assert::CONTINUE;
+}
+#endif
+
+
+//--------------------------------------------------------------------------------------------------
+/// Shows message in interactive dialog and lets user choose how to proceed
+/// 
+/// \return Returns one of the USERACTION_ constants depending on which button the user chooses.
+/// 
+/// Compared to the handleUsingCrtDbgReport() function, this function will also work in release builds
+/// As opposed to the handleUsingCrtDbgReport(), this function will not call abort, but will return 
+/// USERACTION_ABORT instead.
+/// 
+/// \todo  Must add code to handle case where new assert is triggered while handling an assert
+//--------------------------------------------------------------------------------------------------
+#ifdef WIN32
+int AssertHandlerWinDialog::handleUsingDialog(const char* fileName, int lineNumber, const char* expr, const char* msg)
+{
+    char szMsgBuf[2048];
+
+    System::strcpy(szMsgBuf, sizeof(szMsgBuf), "Assertion failed\n");
+
+    System::strcat(szMsgBuf, sizeof(szMsgBuf), "\nFile: ");
+    if (fileName)
+    {
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), fileName);
+    }
+
+    System::strcat(szMsgBuf, sizeof(szMsgBuf), "\nLine: ");
+    if (lineNumber >= 0)
+    {
+        char szLinNumBuf[20];
+        System::sprintf(szLinNumBuf, sizeof(szLinNumBuf), "%d", lineNumber);
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), szLinNumBuf);
+    }
+
+
+    if (expr)
+    {
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), "\n\n");
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), "Expression: ");
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), expr);
+    }
+
+    if (msg)
+    {
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), "\n\n");
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), msg);
+    }
+
+    System::strcat(szMsgBuf, sizeof(szMsgBuf), "\n\n(Press Retry to debug application)");
+
+
+    int retVal = ::MessageBoxA(NULL, szMsgBuf, "Assertion Failed", MB_TASKMODAL|MB_ICONHAND|MB_ABORTRETRYIGNORE|MB_SETFOREGROUND);
+
+    if      (retVal == IDIGNORE)    return USERACTION_CONTINUE;
+    else if (retVal == IDRETRY)     return USERACTION_DEBUGBREAK;
+    else                            return USERACTION_ABORT;
+}
+#endif
+
+
+//--------------------------------------------------------------------------------------------------
+/// Wrapper function for the CRT _CrtDbgReport() function 
+/// 
+/// This function never returns if the user chooses 'Abort'
+/// Note that the underlying function is only available in debug builds
+//--------------------------------------------------------------------------------------------------
+#if defined WIN32 && defined _DEBUG
+int AssertHandlerWinDialog::handleUsingCrtDbgReport(const char* fileName, int lineNumber, const char* expr, const char* msg)
+{
+    // Create message combining expression and message
+    char szMsgBuf[2048];
+    szMsgBuf[0] = '\0';
+
+    if (expr)
+    {
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), expr);
+    }
+
+    if (msg)
+    {
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), "\n");
+        System::strcat(szMsgBuf, sizeof(szMsgBuf), msg);
+    }
+
+    int retVal = _CrtDbgReport(_CRT_ASSERT, fileName, lineNumber, NULL, szMsgBuf);
+
+    if      (retVal == 0)   return USERACTION_CONTINUE;
+    else if (retVal == 1)   return USERACTION_DEBUGBREAK;
+    else                    return USERACTION_ABORT;
+}
+#endif
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Assert
+/// \ingroup Core
+///
+/// Helper class to customize assert 
+/// 
+//==================================================================================================
+
+#ifdef WIN32
+AssertHandler* Assert::sm_handler = new AssertHandlerWinDialog;
+#else
+AssertHandler* Assert::sm_handler = new AssertHandlerConsole;
+#endif
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void Assert::setReportMode(ReportMode reportMode)
+{
+#ifndef WIN32
+    if (reportMode == INTERACTIVE_DIALOG) return;
+#endif
+
+    delete sm_handler;
+    sm_handler = NULL;
+
+    if (reportMode == CONSOLE)
+    {
+        sm_handler = new AssertHandlerConsole;
+    }
+#ifdef WIN32
+    else if (reportMode == INTERACTIVE_DIALOG)
+    {
+        sm_handler = new AssertHandlerWinDialog;
+    }
+#endif
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Show report of a failed assert
+/// 
+/// If assertions are configured to be interactive, a message box will be shown on Windows and
+/// the user may opt to ignore or trigger debugging. 
+/// On Linux, or if interactive asserts are disabled, the application will terminate.
+/// 
+/// \todo  Add handling of cases where we get another assert while processing the first one AND
+///        asserts from multiple threads.
+//--------------------------------------------------------------------------------------------------
+Assert::FailAction Assert::reportFailedAssert(const char* fileName, int lineNumber, const char* expr, const char* msg)
+{
+    if (sm_handler)
+    {
+        return sm_handler->handleAssert(fileName, lineNumber, expr, msg);
+    }
+    else
+    {
+        abort();
+        return CONTINUE;
+    }
+}
+
+
+} // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfAssert.h

@@ -0,0 +1,107 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+namespace external {
+namespace cvf {
+
+// Forward of base class for assert handlers
+class AssertHandler;
+
+
+//==================================================================================================
+//
+// Helper class to customize assert behavior 
+//
+//==================================================================================================
+class Assert
+{
+public:
+    enum ReportMode
+    {
+        CONSOLE,                // Report asserts to console only and then abort. (default mode for Linux)
+        INTERACTIVE_DIALOG      // Show message in dialog and ask for user action (Windows only, default mode on Windows)
+    };
+
+    enum FailAction
+    {
+        CONTINUE,   // Continue execution
+        DEBUGBREAK  // Execution should be stopped and debugger should be triggered (currently windows only)
+    };
+
+public:
+    static void         setReportMode(ReportMode reportMode);
+    static FailAction   reportFailedAssert(const char* fileName, int lineNumber, const char* expr, const char* msg);
+
+private:
+    static AssertHandler*   sm_handler;
+};
+
+} // cvf
+
+
+
+// Define to trigger debug trap for use with assert macros
+// Currently only useful and in action on windows
+#ifdef WIN32
+#define CVF_DEBUGTRAP()  __debugbreak()
+#else
+#define CVF_DEBUGTRAP()  ((void)0)
+#endif
+
+
+// Define our assert macros
+#if CVF_ENABLE_ASSERTS == 1
+#   define CVF_ASSERT(expr)           (void)( (!!(expr)) || (cvf::Assert::CONTINUE == cvf::Assert::reportFailedAssert(__FILE__, __LINE__, #expr, NULL))  || (CVF_DEBUGTRAP(), 0) )
+#   define CVF_ASSERT_MSG(expr, msg)  (void)( (!!(expr)) || (cvf::Assert::CONTINUE == cvf::Assert::reportFailedAssert(__FILE__, __LINE__, #expr, (msg))) || (CVF_DEBUGTRAP(), 0) )
+#   define CVF_FAIL_MSG(msg)          (void)( (cvf::Assert::CONTINUE == cvf::Assert::reportFailedAssert(__FILE__, __LINE__, NULL, (msg))) || (CVF_DEBUGTRAP(), 0) )
+#else 
+#   define CVF_ASSERT(expr)           ((void)0)
+#   define CVF_ASSERT_MSG(expr, msg)  ((void)0)
+#   define CVF_FAIL_MSG(msg)          ((void)0)
+#endif
+
+#if CVF_ENABLE_TIGHT_ASSERTS == 1 && CVF_ENABLE_ASSERTS == 1
+#   define CVF_TIGHT_ASSERT(expr)           CVF_ASSERT(expr)
+#   define CVF_TIGHT_ASSERT_MSG(expr, msg)  CVF_ASSERT_MSG(expr, msg)
+#else 
+#   define CVF_TIGHT_ASSERT(expr)           ((void)0)
+#   define CVF_TIGHT_ASSERT_MSG(expr, msg)  ((void)0)
+#endif
+
+} //namespace external

external/resinsight/LibCore/cvfAtomicCounter.cpp

@@ -0,0 +1,175 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2014 Ceetron Solutions AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfAtomicCounter.h"
+
+namespace external {
+// Some older GCC version do not support atomics, we have seen this for RHEL5
+#if defined(CVF_ATOMIC_COUNTER_CLASS_EXISTS)
+namespace cvf {
+
+#ifdef WIN32
+#pragma warning (push)
+#pragma warning (disable: 4668)
+#include <windows.h>
+#pragma warning (pop)
+
+
+AtomicCounter::AtomicCounter(int initialValue)
+    : m_counter(initialValue)
+{
+}
+
+
+AtomicCounter::~AtomicCounter()
+{
+}
+
+
+AtomicCounter::operator int () const
+{
+    return m_counter;
+}
+
+int AtomicCounter::operator ++ () // prefix
+{
+    return InterlockedIncrement(&m_counter);
+}
+
+
+int AtomicCounter::operator ++ (int) // postfix
+{
+    int result = InterlockedIncrement(&m_counter);
+    return --result;
+}
+
+
+int AtomicCounter::operator -- () // prefix
+{
+    return InterlockedDecrement(&m_counter);
+}
+
+
+int AtomicCounter::operator -- (int) // postfix
+{
+    int result = InterlockedDecrement(&m_counter);
+    return ++result;
+}
+
+
+#elif defined(CVF_IOS) || defined(CVF_OSX)
+
+AtomicCounter::AtomicCounter(int initialValue)
+    : m_counter(initialValue)
+{
+}
+
+
+AtomicCounter::~AtomicCounter()
+{
+}
+
+AtomicCounter::operator int () const
+{
+    return m_counter;
+}
+
+
+int AtomicCounter::operator ++ () // prefix
+{
+    return OSAtomicIncrement32(&m_counter);
+}
+
+
+int AtomicCounter::operator ++ (int) // postfix
+{
+    int result = OSAtomicIncrement32(&m_counter);
+    return --result;
+}
+
+
+int AtomicCounter::operator -- () // prefix
+{
+    return OSAtomicDecrement32(&m_counter);
+}
+
+
+int AtomicCounter::operator -- (int) // postfix
+{
+    int result = OSAtomicDecrement32(&m_counter);
+    return ++result;
+}
+
+
+#elif defined(CVF_GCC_DEFINED)
+
+
+AtomicCounter::AtomicCounter(int initialValue)
+    : m_counter(initialValue)
+{
+}
+
+AtomicCounter::~AtomicCounter()
+{
+}
+
+AtomicCounter::operator int () const
+{
+    return m_counter;
+}
+
+
+int AtomicCounter::operator ++ () // prefix
+{
+    return __sync_add_and_fetch(&m_counter, 1);
+}
+
+
+int AtomicCounter::operator ++ (int) // postfix
+{
+    return __sync_fetch_and_add(&m_counter, 1);
+}
+
+
+int AtomicCounter::operator -- () // prefix
+{
+    return __sync_sub_and_fetch(&m_counter, 1);
+}
+
+
+int AtomicCounter::operator -- (int) // postfix
+{
+    return __sync_fetch_and_sub(&m_counter, 1);
+}
+
+
+#endif
+
+
+} // namespace cvf
+
+
+
+#endif // CVF_ATOMICS_COMPILED
+} //namespace external

external/resinsight/LibCore/cvfAtomicCounter.h

@@ -0,0 +1,94 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2014 Ceetron Solutions AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfBase.h"
+
+namespace external {
+
+#ifdef WIN32
+  #define CVF_ATOMIC_COUNTER_CLASS_EXISTS
+#elif defined(CVF_IOS) || defined(CVF_OSX)
+  #include <libkern/OSAtomic.h>
+  #define CVF_ATOMIC_COUNTER_CLASS_EXISTS
+#elif defined __GNUC__
+    #define CVF_GCC_DEFINED
+    #define CVF_ATOMIC_COUNTER_CLASS_EXISTS
+#endif
+
+#if defined(CVF_ATOMIC_COUNTER_CLASS_EXISTS)
+
+namespace cvf {
+
+// Inspired by Poco
+
+
+class AtomicCounter
+{
+public:
+    explicit AtomicCounter(int initialValue);
+    ~AtomicCounter();
+
+    operator int () const;
+
+    int operator ++ ();     // prefix
+    int operator ++ (int);  // postfix
+
+    int operator -- ();     // prefix
+    int operator -- (int);  // postfix
+
+private:
+    
+    CVF_DISABLE_COPY_AND_ASSIGN(AtomicCounter);
+
+#ifdef WIN32
+    typedef volatile long ImplType;
+#elif defined(CVF_IOS) || defined(CVF_OSX)
+    typedef int32_t ImplType;
+#else
+    typedef int ImplType;
+#endif
+
+    ImplType m_counter;
+};
+
+
+} // namespace cvf
+
+#endif
+} //namespace external

external/resinsight/LibCore/cvfBase.h

@@ -0,0 +1,133 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+// #if !defined(WIN32) && !defined(CVF_LINUX) && !defined(CVF_IOS) && !defined(CVF_OSX) && !defined(CVF_ANDROID)
+// #error No platform defined
+// #endif
+
+//  Global include file with definitions useful for all library files
+
+// Disable some annoying warnings so we can compile with warning level Wall
+#ifdef _MSC_VER
+// 4512  'class' : assignment operator could not be generated : Due to problems with classes with reference member variables (e.g. VertexCompactor)
+// 4514  unreferenced inline/local function has been removed
+// 4625  copy constructor could not be generated because a base class copy constructor is inaccessible
+// 4626  assignment operator could not be generated because a base class assignment operator is inaccessible
+// 4640  'staticInstance' : construction of local static object is not thread-safe -> used by singletons. To be revisited.
+// 4710  function 'func_name' not inlined
+// 4711  function 'func_name' selected for automatic inline expansion
+// 4738  storing 32-bit float result in memory, possible loss of performance
+// 4820  'bytes' bytes padding added after construct 'member_name'
+#pragma warning (disable: 4512 4514 4625 4626 4640 4710 4711 4738 4820)
+
+#if (_MSC_VER >= 1600)
+// VS2010 and newer
+// 4986  'operator new[]': exception specification does not match previous declaration
+#pragma warning (disable: 4986)
+#endif
+
+#endif
+
+
+// Makes it easier to check on the current GCC version
+#ifdef __GNUC__
+// 40302 means version 4.3.2.
+# define CVF_GCC_VER  (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+#endif  
+
+// Helper macro to disable (ignore) compiler warnings on GCC
+// The needed pragma is only available in GCC for versions 4.2.x and above
+#if defined(__GNUC__) && (CVF_GCC_VER >= 40200)
+#define CVF_DO_PRAGMA(x) _Pragma(#x)
+#define CVF_GCC_DIAGNOSTIC_IGNORE(OPTION_STRING) CVF_DO_PRAGMA(GCC diagnostic ignored OPTION_STRING)
+#else
+#define CVF_GCC_DIAGNOSTIC_IGNORE(OPTION_STRING) 
+#endif
+
+
+#if defined(CVF_LINUX) || defined(CVF_IOS) || defined(CVF_OSX) || defined(CVF_ANDROID)
+// Used by int64_t on *nix below
+#include <stdint.h>     
+#endif
+
+// Brings in size_t and definition of NULL
+#include <cstddef>
+
+namespace external {
+// Added due to conflict between std::min/max and define in Windows.h
+#define CVF_MIN(X, Y) ((X) < (Y) ? (X) : (Y))
+#define CVF_MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+
+// Macro for avoiding "unused parameter" warnings
+// The bottom one is the best alternative, but unfortunately doesn't work on VS2010
+#ifdef WIN32
+#define CVF_UNUSED(EXPR) (void)(EXPR);
+#else
+#define CVF_UNUSED(EXPR) (void)sizeof(EXPR); 
+#endif
+
+
+// Macro to disable the copy constructor and assignment operator
+// Should be used in the private section of a class
+#define CVF_DISABLE_COPY_AND_ASSIGN(CLASS_NAME) \
+    CLASS_NAME(const CLASS_NAME&);              \
+    void operator=(const CLASS_NAME&)
+
+
+/// Ceetron Visualization Framework namespace
+namespace cvf {
+
+typedef unsigned char    ubyte;
+typedef unsigned short   ushort;
+typedef unsigned int     uint;
+
+// 64bit integer support via the int64 type
+#ifdef WIN32
+typedef __int64 int64;  
+#elif defined(CVF_LINUX) || defined(CVF_IOS) || defined(CVF_OSX) || defined(CVF_ANDROID)
+typedef int64_t int64;  
+#endif 
+
+}
+} //namespace external
+
+#include "cvfConfigCore.h"
+#include "cvfVersion.h"
+#include "cvfAssert.h"
+

external/resinsight/LibCore/cvfBase64.h

@@ -0,0 +1,59 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfString.h"
+#include "cvfArray.h"
+
+namespace external {
+namespace cvf {
+
+//==================================================================================================
+//
+// Base64 encoding and decoding for representing binary data in an ASCII string
+//
+//==================================================================================================
+class Base64
+{
+public:
+    static std::string                  encode(const cvf::UByteArray& data);
+    static cvf::ref<cvf::UByteArray>    decode(const std::string& encodedData);
+};
+
+}
+} //namespace external

external/resinsight/LibCore/cvfCharArray.cpp

@@ -0,0 +1,172 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfCharArray.h"
+#include "cvfSystem.h"
+
+#include <sstream>
+#include <iomanip>
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::CharArray
+/// \ingroup Core
+///
+/// 8 bit zero terminated char array.
+/// 
+/// Behind the scenes, the array always has a 0 termination sentinel.
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+CharArray::CharArray()
+{
+    m_data.push_back('\0');
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+CharArray::CharArray(size_t size, char c)
+{
+    resize(size);
+
+    size_t i;
+    for (i = 0; i < size; i++)
+    {
+        m_data[i] = c;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+CharArray::CharArray(const char* str)
+{
+    size_t numChars = System::strlen(str);
+    resize(numChars);
+
+    size_t i;
+    for (i = 0; i < numChars; i++)
+    {
+        m_data[i] = str[i];
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+char& CharArray::operator[](size_t i) 
+{
+    CVF_TIGHT_ASSERT(i < m_data.size() - 1);
+
+    return m_data[i];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const char& CharArray::operator[](size_t i) const
+{
+    CVF_TIGHT_ASSERT(i < m_data.size() - 1);
+
+    return m_data[i];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void CharArray::resize(size_t size)
+{
+    m_data.resize(size + 1, '\0');
+    m_data[size] = '\0';
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Add a character to the array. Array grows if necessary.
+//--------------------------------------------------------------------------------------------------
+void CharArray::push_back(char c)
+{
+    CVF_TIGHT_ASSERT(m_data.size() > 0);
+
+    m_data[m_data.size() - 1] = c;
+    m_data.push_back('\0');
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the size of the character array.
+/// 
+/// Note that this is not necessarily the length of the contained string. In order to get the string
+/// length, you must call System::strlen().
+//--------------------------------------------------------------------------------------------------
+size_t CharArray::size() const
+{ 
+    CVF_TIGHT_ASSERT(m_data.size() > 0);
+
+    return m_data.size() - 1;
+}   
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get a const char* pointer to the string
+//--------------------------------------------------------------------------------------------------
+const char* CharArray::ptr() const
+{ 
+    CVF_ASSERT(m_data.size() > 0);
+    CVF_ASSERT(m_data[m_data.size() - 1] == '\0');
+    
+    return &m_data[0]; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get a const char* pointer to the string
+//--------------------------------------------------------------------------------------------------
+char* CharArray::ptr()
+{ 
+    CVF_ASSERT(m_data.size() > 0);
+    CVF_ASSERT(m_data[m_data.size() - 1] == '\0');
+
+    return &m_data[0]; 
+}
+
+
+} // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfCharArray.h

@@ -0,0 +1,75 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfBase.h"
+
+#include <vector>
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// 8 bit zero terminated char array
+//
+//==================================================================================================
+class CharArray
+{
+public:
+    CharArray();
+    CharArray(size_t size, char c);
+    explicit CharArray(const char* str);
+    
+    char&       operator[](size_t i);
+    const char& operator[](size_t i) const;
+
+    void        resize(size_t size);
+    void        push_back(char c);
+    size_t      size() const;
+
+    const char* ptr() const;
+    char*       ptr();
+
+private:
+    std::vector<char> m_data;
+};
+
+}
+} //namespace external

external/resinsight/LibCore/cvfCodeLocation.h

@@ -0,0 +1,85 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// 
+//
+//==================================================================================================
+class CodeLocation
+{
+public:
+    CodeLocation();
+    CodeLocation(const char* fileName, const char* functionName, int lineNumber);
+    CodeLocation(const CodeLocation& other);
+
+    const CodeLocation& operator=(CodeLocation rhs);
+
+    const char*         fileName() const;
+    const char*         shortFileName() const;
+    const char*         functionName() const;
+    int                 lineNumber() const;
+    void                swap(CodeLocation& other);
+
+private:
+    const char*     m_fileName;
+    const char*     m_functionName;
+    int             m_lineNumber;
+};
+
+
+#if defined(_MSC_VER)
+#define CVF_CODELOC_FUNCNAME __FUNCSIG__
+#elif defined(__GNUC__)
+#define CVF_CODELOC_FUNCNAME __PRETTY_FUNCTION__
+#else
+#define CVF_CODELOC_FUNCNAME ""
+#endif
+
+#define CVF_CODE_LOCATION ::cvf::CodeLocation(__FILE__, CVF_CODELOC_FUNCNAME, __LINE__)
+
+
+} // cvf
+
+
+} //namespace external

external/resinsight/LibCore/cvfCollection.h

@@ -0,0 +1,102 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfObject.h"
+#include "cvfMath.h"
+#include <vector>
+#include <algorithm>
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// A collection class for reference counted objects (that derive from Object)
+//
+//==================================================================================================
+template<typename T>
+class Collection
+{
+public:
+    Collection();
+    Collection(const Collection& other);
+    explicit Collection(const std::vector< ref<T> >& vector);
+
+    Collection&     operator=(Collection rhs);
+    Collection&     operator=(const std::vector< ref<T> >& vector);
+    const ref<T>&   operator[](size_t index) const;
+    ref<T>&         operator[](size_t index);
+
+    void            push_back(T* data);
+    const T*        at(size_t index) const;
+    T*              at(size_t index);
+
+    void            resize(size_t size);
+    size_t          size() const;
+    void            reserve(size_t capacity);
+    size_t          capacity() const;
+    void            clear();
+
+    bool            empty() const;
+    bool            contains(const T* data) const;
+    size_t          indexOf(const T* data) const;
+
+    void            erase(const T* data);
+    void            eraseAt(size_t index);
+
+    void            swap(Collection& other);
+
+// Iterator support
+public:
+    typedef typename std::vector<ref<T> >::iterator       iterator;
+    typedef typename std::vector<ref<T> >::const_iterator const_iterator;
+
+    iterator        begin();
+    iterator        end();
+    const_iterator  begin() const;
+    const_iterator  end() const;
+
+private:
+    std::vector<ref<T> > m_vector;
+};
+
+}
+} //namespace external
+#include "cvfCollection.inl"

external/resinsight/LibCore/cvfCollection.inl

@@ -0,0 +1,334 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+namespace external {
+namespace cvf {
+
+
+    
+//==================================================================================================
+///
+/// \class cvf::Collection
+/// \ingroup Core
+/// 
+/// A collection class for reference counted objects (that derive from Object). 
+///    
+/// The class add a reference to all objects when added to the array, and releases them when removed 
+/// from the array.
+/// 
+/// The class exposes the same public interface as a std::vector, so see the STL documentation
+/// for documentation on most of the methods.
+///
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Default constructor. Create an empty collection
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+Collection<T>::Collection()
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy constructor
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+Collection<T>::Collection(const Collection& other)
+:   m_vector(other.m_vector)
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Create a collection and copy the contents from the passed collection
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+Collection<T>::Collection(const std::vector< ref<T> >& vector)
+:   m_vector(vector)
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+Collection<T>& Collection<T>::operator=(Collection rhs)
+{
+    rhs.swap(*this);
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the collection to contain the same elements as the passed collection
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+Collection<T>& Collection<T>::operator=(const std::vector< ref<T> >& vector)
+{
+    m_vector = vector;
+
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+const ref<T>& Collection<T>::operator[](size_t index) const    
+{ 
+    return m_vector[index]; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+ref<T>& Collection<T>::operator[](size_t index)                
+{ 
+    return m_vector[index]; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void Collection<T>::push_back(T* data)      	
+{ 
+    m_vector.push_back(data); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+const T* Collection<T>::at(size_t index) const	
+{ 
+    return m_vector[index].p(); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+T* Collection<T>::at(size_t index)				
+{ 
+    return m_vector[index].p(); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void Collection<T>::resize(size_t size)     	
+{ 
+    m_vector.resize(size); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+size_t Collection<T>::size() const             	
+{ 
+    return m_vector.size(); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void Collection<T>::reserve(size_t capacity)	
+{ 
+    m_vector.reserve(capacity); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+size_t Collection<T>::capacity() const      	
+{ 
+    return m_vector.capacity(); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void Collection<T>::clear()                 	
+{ 
+    m_vector.clear(); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+bool Collection<T>::empty() const           	
+{ 
+    return m_vector.empty(); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+bool Collection<T>::contains(const T* data) const
+{
+    if (std::find(m_vector.begin(), m_vector.end(), data) != m_vector.end())
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Find index of the first occurence of the specified element
+///
+/// Returns UNDEFINED_SIZE_T if element could not be found
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+size_t Collection<T>::indexOf(const T* data) const
+{
+    typename std::vector<ref<T> >::const_iterator it = std::find(m_vector.begin(), m_vector.end(), data);
+    if (it != m_vector.end())
+    {
+        return static_cast<size_t>(it - m_vector.begin());
+    }
+    else
+    {
+        return UNDEFINED_SIZE_T;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Erase the specified element
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void Collection<T>::erase(const T* data) 
+{
+    typename std::vector<ref<T> >::iterator it = std::find(m_vector.begin(), m_vector.end(), data);
+    if (it != m_vector.end())
+    {
+        m_vector.erase(it);
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Erase the element at the specified index
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void Collection<T>::eraseAt(size_t index) 
+{ 
+    CVF_ASSERT(index < m_vector.size());
+
+    // Cast may have to be to std::vector<T>::difference_type
+    m_vector.erase(m_vector.begin() + static_cast<ptrdiff_t>(index)); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void Collection<T>::swap(Collection& other)		
+{ 
+    m_vector.swap(other.m_vector); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return iterator to beginning
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+typename Collection<T>::iterator Collection<T>::begin()
+{
+    return m_vector.begin();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return iterator to end
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+typename Collection<T>::iterator Collection<T>::end()
+{
+    return m_vector.end();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return const iterator to beginning
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+typename Collection<T>::const_iterator Collection<T>::begin() const
+{
+    return m_vector.begin();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return const iterator to end
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+typename Collection<T>::const_iterator Collection<T>::end() const
+{
+    return m_vector.end();
+}
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfColor3.h

@@ -0,0 +1,186 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfBase.h"
+
+namespace external {
+namespace cvf {
+
+// Forward declarations
+class Color3ub;
+
+
+
+//==================================================================================================
+//
+// Abstract base class for RGB colors
+//
+//==================================================================================================
+class Color3
+{
+public:
+    enum ColorIdent
+    {
+        RED,			///< Pure red (255, 0, 0)
+        GREEN,			///< Pure greed (0, 255, 0)
+        BLUE,			///< Pure blue (0, 0, 255)
+        YELLOW,		    ///< Yellow (255, 255, 0)
+        CYAN,			///< Cyan (0, 255, 255)
+        MAGENTA,		///< Magenta (255, 0, 255)
+
+        WHITE,			///< White
+        BLACK,			///< Black
+        LIGHT_GRAY,		///< Light gray (192, 192, 192)
+        GRAY,			///< Gray (128, 128, 128)
+        DARK_GRAY,		///< Dark gray (64, 64, 64)
+
+        BROWN,			///< Brown (165, 42, 42)
+        CRIMSON,		///< Crimson (220, 20, 60)
+        DARK_BLUE,		///< Dark blue (0, 0, 139)
+        DARK_YELLOW,    ///< Dark yellow (139, 139, 0)
+        DARK_CYAN,		///< Dark cyan (0, 139, 139)
+        DARK_GREEN,		///< Dark green (0, 100, 0)
+        DARK_MAGENTA,	///< Dark magenta (139, 0, 139)
+        DARK_ORANGE,	///< Dark orange (255, 140, 0)
+        DARK_RED,		///< Dark red (139, 0, 0)
+        DARK_VIOLET,	///< Dark violet (148, 0, 211)
+        DEEP_PINK,		///< Deep pink (255, 20, 147)
+        FOREST_GREEN,	///< Forest green (34, 139, 34)
+        GOLD,			///< Gold (255, 215, 0)
+        GREEN_YELLOW,   ///< Green yellow (173, 255, 47)
+        INDIGO,		    ///< Indigo (75, 0, 130)
+        OLIVE,			///< Olive (128, 128, 0)
+        ORANGE,		    ///< Orange (255, 165, 0)
+        ORANGE_RED,		///< Orange red (255, 69, 0)
+        ORCHID,		    ///< Orchid (218, 112, 214)
+        PINK,			///< Pink (255, 192, 203)
+        PURPLE,		    ///< Purple (128, 0, 128)
+        SEA_GREEN,		///< Sea green (46, 139, 87)
+        SKY_BLUE,		///< Sky blue (135, 206, 235)
+        VIOLET,		    ///< Violet (238, 130, 238)
+        YELLOW_GREEN, 	///< Yellow green (154, 205, 50)
+
+        CEETRON         ///< Ceetron Color (81, 134, 148)
+    };
+};
+
+
+//==================================================================================================
+//
+// Floating point RGB colors
+//
+//==================================================================================================
+class Color3f : public Color3
+{
+public:
+    Color3f();
+    Color3f(float r, float g, float b);
+    Color3f(const Color3f& other);
+    Color3f(ColorIdent colorIdent);
+    explicit Color3f(const Color3ub& other);
+
+    Color3f&        operator=(const Color3f& rhs);
+    Color3f&        operator=(ColorIdent colorIdent);
+    bool            operator==(const Color3f& rhs) const;
+    bool            operator!=(const Color3f& rhs) const;
+
+    const float&    r() const           { return m_rgb[0]; }        ///< Returns the red color component
+    const float&    g() const           { return m_rgb[1]; }        ///< Returns the green color component
+    const float&    b() const           { return m_rgb[2]; }        ///< Returns the blue color component
+    float&          r()                 { return m_rgb[0]; }        ///< Get modifiable reference to the red color component, used for setting the component.
+    float&          g()                 { return m_rgb[1]; }        ///< Get modifiable reference to the green color component, used for setting the component
+    float&          b()                 { return m_rgb[2]; }        ///< Get modifiable reference to the blue color component, used for setting the component
+
+    void            set(float r, float g, float b);
+
+    bool            isValid() const;
+    const float*    ptr() const;
+
+    ubyte           rByte() const;
+    ubyte           gByte() const;
+    ubyte           bByte() const;
+
+    static Color3f  fromByteColor(ubyte r, ubyte g, ubyte b);
+
+    friend bool operator < (const Color3f& color1, const Color3f& color2);
+
+private:
+    float m_rgb[3];
+};
+
+bool operator < (const Color3f& color1, const Color3f& color2);
+
+
+//==================================================================================================
+//
+// Unsigned byte RGB colors
+//
+//==================================================================================================
+class Color3ub : public Color3
+{
+public:
+    Color3ub();
+    Color3ub(ubyte r, ubyte g, ubyte b);
+    Color3ub(const Color3ub& other);
+    Color3ub(ColorIdent colorIdent);
+    explicit Color3ub(const Color3f& other);
+
+    Color3ub&       operator=(const Color3ub& rhs);
+    Color3ub&       operator=(ColorIdent colorIdent);
+    bool            operator==(const Color3ub& rhs) const;
+    bool            operator!=(const Color3ub& rhs) const;
+
+    ubyte           r() const           { return m_rgb[0]; }        ///< Returns the red color component
+    ubyte           g() const           { return m_rgb[1]; }        ///< Returns the green color component
+    ubyte           b() const           { return m_rgb[2]; }        ///< Returns the blue color component
+    ubyte&          r()                 { return m_rgb[0]; }        ///< Get modifiable reference to the red color component.
+    ubyte&          g()                 { return m_rgb[1]; }        ///< Get modifiable reference to the green color component.
+    ubyte&          b()                 { return m_rgb[2]; }        ///< Get modifiable reference to the blue color component.
+
+    void            set(ubyte r, ubyte g, ubyte b);
+
+    const ubyte*    ptr() const;
+
+private:
+    ubyte m_rgb[3];
+};
+
+}
+
+} //namespace external

external/resinsight/LibCore/cvfColor4.h

@@ -0,0 +1,128 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfColor3.h"
+
+namespace external {
+namespace cvf {
+
+class Color4ub;
+
+//==================================================================================================
+//
+// Class for RGBA colors
+//
+//==================================================================================================
+class Color4f
+{
+public:
+    Color4f();
+    Color4f(float r, float g, float b, float alpha);
+    Color4f(const Color4f& other);
+    Color4f(const Color3f& rgbColor, float alpha);
+    explicit Color4f(const Color3f& rgbColor);
+    explicit Color4f(Color3::ColorIdent colorIdent);
+    explicit Color4f(const Color4ub& other);
+
+    Color4f&        operator=(const Color4f& rhs);
+    bool            operator==(const Color4f& rhs) const;
+    bool            operator!=(const Color4f& rhs) const;
+
+    const float&    r() const           { return m_rgba[0]; }       ///< Returns the red color component
+    const float&    g() const           { return m_rgba[1]; }       ///< Returns the green color component
+    const float&    b() const           { return m_rgba[2]; }       ///< Returns the blue color component
+    const float&    a() const           { return m_rgba[3]; }       ///< Returns the alpha component
+    float&          r()                 { return m_rgba[0]; }       ///< Get modifiable reference to the red color component, used for setting the component.
+    float&          g()                 { return m_rgba[1]; }       ///< Get modifiable reference to the green color component, used for setting the component
+    float&          b()                 { return m_rgba[2]; }       ///< Get modifiable reference to the blue color component, used for setting the component
+    float&          a()                 { return m_rgba[3]; }       ///< Get modifiable reference to the alpha component, used for setting the component
+
+    void            set(float r, float g, float b, float alpha);
+    void            set(const Color3f& rgbColor, float alpha);
+    void            set(const Color3f& rgbColor);
+
+    bool            isValid() const;
+    const float*    ptr() const;
+
+    Color3f         toColor3f() const;
+
+private:
+    float m_rgba[4];
+};
+
+
+//==================================================================================================
+//
+// Unsigned byte RGBA colors
+//
+//==================================================================================================
+class Color4ub 
+{
+public:
+    Color4ub();
+    Color4ub(ubyte r, ubyte g, ubyte b, ubyte a);
+    Color4ub(const Color4ub& other);
+    Color4ub(const Color3ub& rgbColor, ubyte a);
+    explicit Color4ub(const Color3ub& rgbColor);
+    explicit Color4ub(Color3::ColorIdent colorIdent);
+    explicit Color4ub(const Color4f& other);
+
+    Color4ub&       operator=(const Color4ub& rhs);
+    bool            operator==(const Color4ub& rhs) const;
+    bool            operator!=(const Color4ub& rhs) const;
+
+    ubyte           r() const           { return m_rgba[0]; }       ///< Returns the red color component
+    ubyte           g() const           { return m_rgba[1]; }       ///< Returns the green color component
+    ubyte           b() const           { return m_rgba[2]; }       ///< Returns the blue color component
+    ubyte           a() const           { return m_rgba[3]; }       ///< Returns the alpha component
+    ubyte&          r()                 { return m_rgba[0]; }       ///< Get modifiable reference to the red color component.
+    ubyte&          g()                 { return m_rgba[1]; }       ///< Get modifiable reference to the green color component.
+    ubyte&          b()                 { return m_rgba[2]; }       ///< Get modifiable reference to the blue color component.
+    ubyte&          a()                 { return m_rgba[3]; }       ///< Get modifiable reference to the alpha component.
+
+    void            set(ubyte r, ubyte g, ubyte b, ubyte a);
+
+    const ubyte*    ptr() const;
+
+private:
+    ubyte m_rgba[4];
+};
+
+}
+} //namespace external

external/resinsight/LibCore/cvfConfigCore.h

@@ -0,0 +1,78 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+namespace external {
+
+
+// Define this one to tell windows.h to not define min() and max() as macros
+#if defined WIN32 && !defined NOMINMAX
+#define NOMINMAX
+#endif
+
+
+// Used to keep track of all instances of classes derived from Object.
+// Can be used to detect memory leaks in combination with the static member 
+// functions: Object::activeObjectInstances() and Object::dumpActiveObjectInstances()
+//  0 - disable tracking of active object instances
+//  1 - track active instances in debug builds
+//  2 - track active instances in BOTH debug and release builds
+#ifndef CVF_TRACK_ACTIVE_OBJECT_INSTANCES
+#define CVF_TRACK_ACTIVE_OBJECT_INSTANCES  0
+#endif
+
+
+// Behavior of assert macros
+// In debug builds, all asserts are in action, including tight asserts
+// In release builds, tight asserts are disabled by default. Normal asserts are still in action (including CVF_FAIL_...)
+
+#ifndef CVF_ENABLE_ASSERTS
+#define CVF_ENABLE_ASSERTS 1
+#endif
+
+
+#ifndef CVF_ENABLE_TIGHT_ASSERTS
+#ifdef _DEBUG
+#define CVF_ENABLE_TIGHT_ASSERTS 1
+#else
+#define CVF_ENABLE_TIGHT_ASSERTS 0
+#endif
+#endif
+
+
+} //namespace external

external/resinsight/LibCore/cvfDebugTimer.h

@@ -0,0 +1,87 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfString.h"
+
+namespace external {
+namespace cvf {
+
+class Timer;
+
+
+//=================================================================================================
+// 
+// Timer class
+// 
+//=================================================================================================
+class DebugTimer
+{
+public:
+    enum OperationMode
+    {
+        NORMAL,     ///< Normal operation
+        DISABLED    ///< Disables all functionality in the class
+    };
+
+public:
+    DebugTimer(const char* prefix, OperationMode operationMode = NORMAL);
+    ~DebugTimer();
+
+    void    restart(const char* msg = NULL);
+
+    void    reportTime(const char* msg = NULL);
+    void    reportTimeMS(const char* msg = NULL);
+    void    reportLapTime(const char* msg = NULL);
+    void    reportLapTimeMS(const char* msg = NULL);
+
+    void    echoMessage(const char* format, ...);
+
+private:
+    String	makeMessageStartString(const char* msg);
+
+private:
+    Timer*      m_timer;            ///< The actual timer object to use
+    String*     m_prefix;           ///< String to prefix all output
+    int         m_messageCount;     ///< Counts number of messages returned
+
+    CVF_DISABLE_COPY_AND_ASSIGN(DebugTimer);
+};
+
+}
+} //namespace external

external/resinsight/LibCore/cvfFlags.h

@@ -0,0 +1,77 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+namespace external {
+namespace cvf {
+
+
+//=================================================================================================
+// 
+// Flags class
+// 
+//=================================================================================================
+template<typename FlagEnum>
+class Flags
+{
+public:
+    inline Flags(); 
+    inline Flags(const Flags& other);
+    inline Flags(FlagEnum flag);
+
+    inline Flags&  operator=(const Flags& rhs);
+    inline Flags&  operator=(FlagEnum flag);
+    
+    inline Flags&  operator|=(const Flags& rhs);
+    inline Flags   operator|(const Flags& rhs) const;
+    inline Flags&  operator&=(const Flags& rhs);
+    inline Flags   operator&(const Flags& rhs) const;
+
+    inline bool operator==(const Flags& rhs) const;
+    inline bool operator==(int rhs) const;
+    inline bool operator!=(const Flags& rhs) const;
+    inline bool operator!=(int rhs) const;
+    inline bool testFlag(FlagEnum flag) const;
+
+private:
+    int m_bitfield;
+};
+
+}
+} //namespace external
+#include "cvfFlags.inl"

external/resinsight/LibCore/cvfFlags.inl

@@ -0,0 +1,198 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+///
+/// \class cvf::Flags
+/// \ingroup Core
+///
+/// The Flags class provides a type-safe way of storing OR-combinations of enum values
+///
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Default constructor
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum>::Flags() 
+:   m_bitfield(0) 
+{ 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy constructor
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum>::Flags(const Flags& other) 
+:   m_bitfield(other.m_bitfield) 
+{ 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Constructor with initialization
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum>::Flags(FlagEnum flag) 
+:   m_bitfield(flag) 
+{ 
+}
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment operator
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum>& Flags<FlagEnum>::operator=(const Flags& rhs)
+{
+    m_bitfield = rhs.m_bitfield;
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment operator
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum>& Flags<FlagEnum>::operator=(FlagEnum flag)
+{
+    m_bitfield = flag;
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Performs a bitwise OR operation with rhs and stores the result in this Flags object.
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum>& Flags<FlagEnum>::operator|=(const Flags& rhs)
+{
+    m_bitfield |= rhs.m_bitfield;
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Performs a bitwise OR operation with rhs and returns new object
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum> Flags<FlagEnum>::operator|(const Flags& rhs) const
+{
+    Flags ret(*this);
+    return (ret |= rhs);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Performs a bitwise AND operation with rhs and stores the result in this Flags object.
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum>& Flags<FlagEnum>::operator&=(const Flags& rhs)
+{
+    m_bitfield &= rhs.m_bitfield;
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Performs a bitwise AND operation with rhs and returns new object
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline Flags<FlagEnum> Flags<FlagEnum>::operator&(const Flags& rhs) const
+{
+    Flags ret(*this);
+    return (ret &= rhs);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Comparison operator, equality
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline bool Flags<FlagEnum>::operator==(const Flags& rhs) const
+{
+    return m_bitfield == rhs.m_bitfield;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Comparison operator, equality
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline bool Flags<FlagEnum>::operator==(int rhs) const
+{
+    return m_bitfield == rhs;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Comparison operator, not equal
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline bool Flags<FlagEnum>::operator!=(const Flags& rhs) const
+{
+    return m_bitfield != rhs.m_bitfield;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Comparison operator, not equal
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline bool Flags<FlagEnum>::operator!=(int rhs) const
+{
+    return m_bitfield != rhs;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return true only if ALL bits in flag are set 
+//--------------------------------------------------------------------------------------------------
+template<typename FlagEnum>
+inline bool Flags<FlagEnum>::testFlag(FlagEnum flag) const
+{ 
+    return ((m_bitfield & flag) == flag); 
+}
+
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfFunctorRange.h

@@ -0,0 +1,73 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+///
+/// \class cvf::FunctorRange
+/// \ingroup Core
+///
+/// Implements an iteration range for use with our functors.
+/// The class is designed to be compatible with TBB's blocked_range class with regards to 
+/// the functor's requirements
+/// 
+//==================================================================================================
+template <typename T>
+class FunctorRange
+{
+public:
+    FunctorRange(T beginIndex, T endIndex) 
+        : m_beginIndex(beginIndex), m_endIndex(endIndex) {}
+
+    inline T begin() const { return m_beginIndex; }  ///< The first index included in the range
+    inline T end() const   { return m_endIndex; }    ///< Index one past last the last index to be included in the range
+
+private:
+    T m_beginIndex;    // The first index to be included in the iteration.
+    T m_endIndex;      // The index one past the last index to be included in the iteration
+};
+
+
+} // cvf
+
+
+} //namespace external

external/resinsight/LibCore/cvfLibCore.h

@@ -0,0 +1,74 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+// Doxygen module definition
+/// \ingroup VizFramework
+/// @{
+/// \defgroup Core Core module
+/// @}
+
+/// \defgroup VizFramework Framework Basis
+
+// Intentionally on top to be included first
+#include "cvfBase.h"
+
+#include "cvfArray.h"
+#include "cvfAssert.h"
+#include "cvfBase64.h"
+#include "cvfCharArray.h"
+#include "cvfCollection.h"
+#include "cvfColor3.h"
+#include "cvfColor4.h"
+#include "cvfDebugTimer.h"
+#include "cvfFlags.h"
+#include "cvfFunctorRange.h"
+#include "cvfLogger.h"
+#include "cvfMath.h"
+#include "cvfMatrix4.h"
+#include "cvfObject.h"
+#include "cvfPlane.h"
+#include "cvfRect.h"
+#include "cvfQuat.h"
+#include "cvfString.h"
+#include "cvfSystem.h"
+#include "cvfTBBControl.h"
+#include "cvfTimer.h"
+#include "cvfTrace.h"
+#include "cvfVector2.h"
+#include "cvfVector3.h"
+#include "cvfVector4.h"
+#include "cvfVersion.h"

external/resinsight/LibCore/cvfLogDestination.h

@@ -0,0 +1,64 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfObject.h"
+
+namespace external {
+namespace cvf {
+
+class LogEvent;
+
+
+//==================================================================================================
+//
+// Interface for log destinations
+//
+//==================================================================================================
+class LogDestination : public Object
+{
+public:
+    virtual void    log(const LogEvent& logEvent) = 0;
+};
+
+
+
+} // cvf
+
+
+} //namespace external

external/resinsight/LibCore/cvfLogger.h

@@ -0,0 +1,114 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfObject.h"
+#include "cvfString.h"
+#include "cvfCodeLocation.h"
+
+namespace external {
+namespace cvf {
+
+class LogEvent;
+class LogDestination;
+
+
+
+//==================================================================================================
+//
+// Logger class
+//
+//==================================================================================================
+class Logger : public Object
+{
+public:
+    enum Level
+    {
+        LL_ERROR = 1,  
+        LL_WARNING,
+        LL_INFO,
+        LL_DEBUG
+    };
+
+public:
+    Logger(const String& loggerName, int logLevel, LogDestination* logDestination);
+    ~Logger();
+
+    const String&   name() const;
+    int             level() const;
+    void            setLevel(int logLevel);
+    LogDestination* destination();
+    void            setDestination(LogDestination* logDestination);
+
+    void            error(const String& message);
+    void            error(const String& message, const CodeLocation& location);
+    void            warning(const String& message);
+    void            warning(const String& message, const CodeLocation& location);
+    void            info(const String& message);
+    void            info(const String& message, const CodeLocation& location);
+    void            debug(const String& message, const CodeLocation& location);
+
+    bool            isErrorEnabled() const      { return m_logLevel >= LL_ERROR; }
+    bool            isWarningEnabled() const    { return m_logLevel >= LL_WARNING; }
+    bool            isInfoEnabled() const       { return m_logLevel >= LL_INFO; }
+    bool            isDebugEnabled() const      { return m_logLevel >= LL_DEBUG; }
+
+private:
+    void            log(const String& message, Logger::Level messageLevel, const CodeLocation& location);
+
+private:
+    String              m_name;         // Logger name
+    int                 m_logLevel;     // Logging level, all messages with a level less than or equal to this level will be logged
+    ref<LogDestination> m_destination;
+
+    CVF_DISABLE_COPY_AND_ASSIGN(Logger);
+};
+
+
+// Helper macros for writing log messages to a logger
+#define CVF_LOG_ERROR(theLogger, theMessage)    if ((theLogger)->isErrorEnabled())    { (theLogger)->error((theMessage), CVF_CODE_LOCATION); }
+#define CVF_LOG_WARNING(theLogger, theMessage)  if ((theLogger)->isWarningEnabled())  { (theLogger)->warning((theMessage), CVF_CODE_LOCATION); }
+#define CVF_LOG_INFO(theLogger, theMessage)     if ((theLogger)->isInfoEnabled())     { (theLogger)->info((theMessage), CVF_CODE_LOCATION); }
+#define CVF_LOG_DEBUG(theLogger, theMessage)    if ((theLogger)->isDebugEnabled())    { (theLogger)->debug((theMessage), CVF_CODE_LOCATION); }
+
+
+
+} // cvf
+
+
+} //namespace external

external/resinsight/LibCore/cvfMath.cpp

@@ -0,0 +1,341 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfMath.h"
+
+#include <cmath>
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Math
+/// \ingroup Core
+///
+/// Static class providing basic math operations
+/// 
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+///  
+//--------------------------------------------------------------------------------------------------
+float Math::toRadians(float degrees)
+{
+    return degrees*PI_F/180.0f;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+///  
+//--------------------------------------------------------------------------------------------------
+double Math::toRadians(double degrees)
+{
+    return degrees*PI_D/180.0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+///  
+//--------------------------------------------------------------------------------------------------
+float Math::toDegrees(float radians)
+{
+    return radians*180.0f/PI_F;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+///  
+//--------------------------------------------------------------------------------------------------
+double Math::toDegrees(double radians)
+{
+    return radians*180.0/PI_D;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::cos(double val)
+{
+    return ::cos(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::cos(float val)
+{
+    return ::cosf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::acos(double val)
+{
+    return ::acos(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::acos(float val)
+{
+    return ::acosf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::sin(double val)
+{
+    return ::sin(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::sin(float val)
+{
+    return ::sinf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::asin(double val)
+{
+    return ::asin(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::asin(float val)
+{
+    return ::asinf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::tan(double val)
+{
+    return ::tan(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::tan(float val)
+{
+    return ::tanf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::atan(double val)
+{
+    return ::atan(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::atan(float val)
+{
+    return ::atanf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::sqrt(double val)
+{
+    return ::sqrt(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::sqrt(float val)
+{
+    return ::sqrtf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::floor(double val)
+{
+    return ::floor(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::floor(float val)
+{
+    return ::floorf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double Math::ceil(double val)
+{
+    return ::ceil(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+float Math::ceil(float val)
+{
+    return ::ceilf(val);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the floating-point remainder of x / y
+//--------------------------------------------------------------------------------------------------
+double Math::fmod(double x, double y)
+{
+    return ::fmod(x, y);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the floating-point remainder of x / y
+//--------------------------------------------------------------------------------------------------
+float Math::fmod(float x, float y)
+{
+    return ::fmodf(x, y);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns true if the number is a power of 2
+///
+/// The number 0 is not considered a power of 2.
+//--------------------------------------------------------------------------------------------------
+bool Math::isPow2(uint number)
+{
+    // From Bit Twiddling Hacks
+    // http://graphics.stanford.edu/~seander/bithacks.html
+
+    return (number && !(number & (number - 1)));
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Round up to the next highest power of 2
+///
+/// If the number is already a power of 2 this function will return the same value
+/// If number if out of range (greater than 2147483648) we cannot represent the next power of 2 and 0 is returned
+//--------------------------------------------------------------------------------------------------
+uint Math::roundUpPow2(uint number)
+{
+    // From Bit Twiddling Hacks
+    // http://graphics.stanford.edu/~seander/bithacks.html
+
+    if (number == 0)
+    {
+        // Handle edge case where number is 0, algo returns 0, which isn't a power of 2;
+        return 1;
+    }
+
+    if (number > 2147483648u)
+    {
+        // Input is too large, we cannot represent the next power of two
+        return 0;
+    }
+
+    number--;
+    number |= number >> 1;
+    number |= number >> 2;
+    number |= number >> 4;
+    number |= number >> 8;
+    number |= number >> 16;
+    number++;
+
+    return number;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool Math::isUndefined(double val)
+{
+    if (val < UNDEFINED_DOUBLE_THRESHOLD)
+    {
+        return false;
+    }
+    else
+    {
+        return true;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool Math::isUndefined(float val)
+{
+    if (val < UNDEFINED_FLOAT_THRESHOLD)
+    {
+        return false;
+    }
+    else
+    {
+        return true;
+    }
+}
+
+} // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfMath.h

@@ -0,0 +1,117 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfBase.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Static class providing basic math operations
+//
+//==================================================================================================
+class Math
+{
+public:
+    static float            toRadians(float degrees);
+    static double           toRadians(double degrees);
+    static float            toDegrees(float radians);
+    static double           toDegrees(double radians);
+
+    static double           cos(double val);
+    static float            cos(float val);
+    static double           acos(double val);
+    static float            acos(float val);
+    static double           sin(double val);
+    static float            sin(float val);
+    static double           asin(double val);
+    static float            asin(float val);
+    static double           tan(double val);
+    static float            tan(float val);
+    static double           atan(double val);
+    static float            atan(float val);
+
+    static double           sqrt(double val);
+    static float            sqrt(float val);
+
+    static double           floor(double val);
+    static float            floor(float val);
+    static double           ceil(double val);
+    static float            ceil(float val);
+    static double           fmod(double x, double y);
+    static float            fmod(float x, float y);
+    static bool             isPow2(uint number);
+    static uint             roundUpPow2(uint number);
+
+    static bool             isUndefined(double val);
+    static bool             isUndefined(float val);
+
+    template<typename T> static bool     valueInRange(T val, T min, T max);
+    template<typename T> static T        clamp(T val, T minVal, T maxVal);
+
+    template<typename T> static inline T abs(const T& val);
+    template<typename T> static int      sign(const T& val);
+};
+
+
+const float         PI_F                = 3.14159265f;
+const double        PI_D                = 3.14159265358979323846;
+const float         ONE_THIRD_F         = 1.0f/3.0f;
+const double        ONE_THIRD_D         = 1.0/3.0;
+const double        SQRT2_F             = 1.41421356f;              // sqrt(2)
+const double        SQRT2_D             = 1.41421356237309504880;   // sqrt(2)
+const double        SQRT1_2_F           = 0.70710678f;              // 1/sqrt(2)
+const double        SQRT1_2_D           = 0.70710678118654752440;   // 1/sqrt(2)
+
+const int		    UNDEFINED_INT	            = 2147483647;
+const uint			UNDEFINED_UINT	            = static_cast<uint>(-1);  // 4294967295u
+const size_t        UNDEFINED_SIZE_T            = static_cast<size_t>(-1);// 18446744073709551615u
+const double        UNDEFINED_DOUBLE            = 1.7976931348623158e+308;
+const double	    UNDEFINED_DOUBLE_THRESHOLD	= 1.00e+308;
+const float         UNDEFINED_FLOAT             = 3.402823466e+38f;
+const float	        UNDEFINED_FLOAT_THRESHOLD   = 2.99e+38f;
+
+
+
+} // namespace cvf
+} //namespace external
+
+#include "cvfMath.inl"

external/resinsight/LibCore/cvfMath.inl

@@ -0,0 +1,108 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external {
+namespace cvf {
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if a value is within the specified range, inclusive.
+/// 
+/// \return  Returns true if \a val >= \a min and \a val <= \a max.
+//--------------------------------------------------------------------------------------------------
+template<typename T> 
+bool Math::valueInRange(T val, T minVal, T maxVal)
+{
+    CVF_ASSERT(minVal <= maxVal);
+
+    if (val >= minVal && val <= maxVal)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Clamp a value within an inclusive range. 
+/// 
+/// \return The clamped value
+//--------------------------------------------------------------------------------------------------
+template<typename T> 
+T Math::clamp(T val, T minVal, T maxVal)
+{
+    CVF_ASSERT(minVal <= maxVal);
+
+    if (val >= minVal && val <= maxVal)
+    {
+        return val;
+    }
+    else if (val > maxVal)
+    {
+        return maxVal;
+    }
+    else
+    {
+        return minVal;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the absolute value of val
+//--------------------------------------------------------------------------------------------------
+template<typename T> 
+T Math::abs(const T& val)
+{ 
+    return val >= 0 ? val : -val; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the sign of val
+//--------------------------------------------------------------------------------------------------
+template<typename T> 
+int Math::sign(const T& val)
+{ 
+    return val < 0 ? -1 : 1; 
+}
+
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfMatrix3.h

@@ -0,0 +1,110 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfSystem.h"
+#include "cvfVector3.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Template matrix class for 3x3 matrices
+//
+//==================================================================================================
+template<typename S>
+class Matrix3
+{
+public:
+    Matrix3();
+    Matrix3(const Matrix3& other);
+    Matrix3(S m00, S m01, S m02, S m10, S m11, S m12, S m20, S m21, S m22);
+
+    template<typename T>
+    explicit Matrix3(const Matrix3<T>& other);
+
+    inline Matrix3&     operator=(const Matrix3& rhs);
+
+    bool                equals(const Matrix3& mat) const;
+    bool                operator==(const Matrix3& rhs) const;
+    bool                operator!=(const Matrix3& rhs) const;
+
+    void                multiply(const Matrix3& mat);
+    const Matrix3       operator*(const Matrix3& rhs) const;
+
+    void                setIdentity();
+    bool                isIdentity() const;
+    void                setZero();
+    bool                isZero() const;
+
+    inline void         setRowCol(int row, int col, S value);
+    inline S            rowCol(int row, int col) const;
+    inline S&           operator()(int row, int col);
+    inline S            operator()(int row, int col) const;
+
+    bool                invert();
+    const Matrix3       getInverted(bool* pInvertible = NULL) const;
+    S                   determinant() const;
+    void                transpose();
+
+    inline const S*     ptr() const;
+
+    static Matrix3      fromRotation(Vector3<S> axis, S angle);
+
+public:
+    static const Matrix3 IDENTITY;  ///< Identity matrix
+    static const Matrix3 ZERO;      ///< Matrix with all zeros
+
+private:
+    // Constants for accessing our internal array using standard matrix notation
+    static const int e00 = 0;   static const int e01 = 3;   static const int e02 = 6;
+    static const int e10 = 1;   static const int e11 = 4;   static const int e12 = 7;
+    static const int e20 = 2;   static const int e21 = 5;   static const int e22 = 8;
+
+private:
+    S   m_v[9];        
+};
+
+typedef Matrix3<float>  Mat3f;
+typedef Matrix3<double> Mat3d;
+
+}
+} //namespace external
+#include "cvfMatrix3.inl"

external/resinsight/LibCore/cvfMatrix3.inl

@@ -0,0 +1,487 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Matrix3
+/// \ingroup Core
+///
+/// Matrices are stored internally as a one dimensional array for performance reasons. 
+/// 
+/// The internal indices into the 1D array are as follows:
+/// 
+/// <PRE>
+///   | m00  m01  m02 |     | 0  3   6 | 
+///   | m10  m11  m12 |     | 1  4   7 | 
+///   | m20  m21  m22 |     | 2  5  18 | 
+/// </PRE>
+///
+/// See description of Matrix4 for more details on storage
+///
+//==================================================================================================
+
+template<typename S> Matrix3<S> const Matrix3<S>::IDENTITY;
+template<typename S> Matrix3<S> const Matrix3<S>::ZERO(0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+//----------------------------------------------------------------------------------------------------
+/// Default constructor. Initializes matrix to identity 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix3<S>::Matrix3()
+{
+    setIdentity();
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Copy constructor
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline Matrix3<S>::Matrix3(const Matrix3& other)
+{
+    System::memcpy(m_v, sizeof(m_v), other.m_v, sizeof(other.m_v));
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Constructor with explicit initialization of all matrix elements.
+/// 
+/// The value of the parameter \a mrc will be placed in row r and column c of the matrix, eg m12
+/// goes into row 1, column 2.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix3<S>::Matrix3(S m00, S m01, S m02, S m10, S m11, S m12, S m20, S m21, S m22)
+{
+    m_v[e00] = m00;
+    m_v[e10] = m10;
+    m_v[e20] = m20;
+    m_v[e01] = m01;
+    m_v[e11] = m11;
+    m_v[e21] = m21;
+    m_v[e02] = m02;
+    m_v[e12] = m12;
+    m_v[e22] = m22;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+Matrix3<S>::Matrix3(const Matrix3<T>& other)
+{
+    m_v[e00] = static_cast<S>(other.rowCol(0, 0));
+    m_v[e01] = static_cast<S>(other.rowCol(0, 1));
+    m_v[e02] = static_cast<S>(other.rowCol(0, 2));
+    m_v[e10] = static_cast<S>(other.rowCol(1, 0));
+    m_v[e11] = static_cast<S>(other.rowCol(1, 1));
+    m_v[e12] = static_cast<S>(other.rowCol(1, 2));
+    m_v[e20] = static_cast<S>(other.rowCol(2, 0));
+    m_v[e21] = static_cast<S>(other.rowCol(2, 1));
+    m_v[e22] = static_cast<S>(other.rowCol(2, 2));
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Assignment operator
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline Matrix3<S>& Matrix3<S>::operator=(const Matrix3& obj)
+{
+    System::memcpy(m_v, sizeof(m_v), obj.m_v, sizeof(obj.m_v));
+    return *this;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Check if matrices are equal using exact comparisons.
+//----------------------------------------------------------------------------------------------------
+template<typename S>
+bool Matrix3<S>::equals(const Matrix3& mat) const
+{
+    for (int i = 0; i < 9; i++)
+    {
+        if (m_v[i] != mat.m_v[i]) return false;
+    }
+
+    return true;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Comparison operator. Checks for equality using exact comparisons.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix3<S>::operator==(const Matrix3& rhs) const
+{
+    return this->equals(rhs);
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Comparison operator. Checks for not equal using exact comparisons.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix3<S>::operator!=(const Matrix3& rhs) const
+{
+    int i;
+    for (i = 0; i < 9; i++)
+    {
+        if (m_v[i] != rhs.m_v[i]) return true;
+    }
+
+    return false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Multiplies this matrix M with the matrix \a mat, M = M*mat
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Matrix3<S>::multiply(const Matrix3& mat)
+{
+    *this = (*this)*mat;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+const Matrix3<S> Matrix3<S>::operator*(const Matrix3& rhs) const
+{
+    Matrix3 m;
+    
+    int r;
+    for (r = 0; r < 3; r++)
+    {
+        int c;
+        for (c = 0; c < 3; c++)
+        {
+            S val = 0;
+
+            int a;
+            for (a = 0; a < 3; a++)
+            {
+                val += rowCol(r, a)*rhs.rowCol(a, c);
+            }
+
+            m.setRowCol(r, c, val);
+        }
+    }
+
+    return m;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Sets this matrix to identity
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix3<S>::setIdentity()
+{
+    m_v[0] = 1;
+    m_v[1] = 0;    
+    m_v[2] = 0;
+
+    m_v[3] = 0;
+    m_v[4] = 1;
+    m_v[5] = 0;
+
+    m_v[6] = 0;
+    m_v[7] = 0;
+    m_v[8] = 1;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Check if this matrix is identity using exact comparisons
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix3<S>::isIdentity() const
+{
+    if (m_v[0] != 1) return false;
+    if (m_v[1] != 0) return false;
+    if (m_v[2] != 0) return false;
+
+    if (m_v[3] != 0) return false;
+    if (m_v[4] != 1) return false;
+    if (m_v[5] != 0) return false;
+
+    if (m_v[6] != 0) return false;
+    if (m_v[7] != 0) return false;
+    if (m_v[8] != 1) return false;
+
+    return true;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Set all matrix elements to 0
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix3<S>::setZero()
+{
+    m_v[0]  = 0;
+    m_v[1]  = 0;    
+    m_v[2]  = 0;
+    m_v[3]  = 0;
+    m_v[4]  = 0;
+    m_v[5]  = 0;
+    m_v[6]  = 0;
+    m_v[7]  = 0;
+    m_v[8]  = 0;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Returns true if all elements of the matrix are 0. Uses exact comparison.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix3<S>::isZero() const
+{
+    if (m_v[0] != 0) return false;
+    if (m_v[1] != 0) return false;
+    if (m_v[2] != 0) return false;
+
+    if (m_v[3] != 0) return false;
+    if (m_v[4] != 0) return false;
+    if (m_v[5] != 0) return false;
+
+    if (m_v[6] != 0) return false;
+    if (m_v[7] != 0) return false;
+    if (m_v[8] != 0) return false;
+
+    return true;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Set the matrix element at the specified row and column
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline void Matrix3<S>::setRowCol(int row, int col, S value)
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 3);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 3);
+
+    m_v[3*col + row] = value;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Get the matrix element at the specified row and column
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline S Matrix3<S>::rowCol(int row, int col) const
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 3);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 3);
+
+    return m_v[3*col + row];
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Get modifiable reference to the the matrix element at the specified row and column
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+inline S& Matrix3<S>::operator()(int row, int col)
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 3);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 3);
+
+    return m_v[3*col + row];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the matrix element at the specified row and column
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+inline S Matrix3<S>::operator()(int row, int col) const
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 3);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 3);
+
+    return m_v[3*col + row];
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix3<S>::invert()
+{
+    // Use double internally here
+    double m00 = static_cast<double>(m_v[e00]);
+    double m10 = static_cast<double>(m_v[e10]);
+    double m20 = static_cast<double>(m_v[e20]);
+    double m01 = static_cast<double>(m_v[e01]);
+    double m11 = static_cast<double>(m_v[e11]);
+    double m21 = static_cast<double>(m_v[e21]);
+    double m02 = static_cast<double>(m_v[e02]);
+    double m12 = static_cast<double>(m_v[e12]);
+    double m22 = static_cast<double>(m_v[e22]);
+
+    double det = m00*m11*m22 + m01*m12*m20 + m02*m10*m21 - m00*m12*m21 - m01*m10*m22 - m02*m11*m20;
+
+    if (Math::abs(det) > std::numeric_limits<double>::epsilon())
+    {
+        double invDet = 1/det;
+
+        m_v[e00] = static_cast<S>( (m11*m22 - m12*m21) * invDet );
+        m_v[e01] = static_cast<S>( (m02*m21 - m01*m22) * invDet );
+        m_v[e02] = static_cast<S>( (m01*m12 - m02*m11) * invDet );
+        m_v[e10] = static_cast<S>( (m12*m20 - m10*m22) * invDet );
+        m_v[e11] = static_cast<S>( (m00*m22 - m02*m20) * invDet );
+        m_v[e12] = static_cast<S>( (m02*m10 - m00*m12) * invDet );
+        m_v[e20] = static_cast<S>( (m10*m21 - m11*m20) * invDet );
+        m_v[e21] = static_cast<S>( (m01*m20 - m00*m21) * invDet );
+        m_v[e22] = static_cast<S>( (m00*m11 - m01*m10) * invDet );
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+const Matrix3<S> Matrix3<S>::getInverted(bool* pInvertible) const
+{
+    Matrix3 m(*this);
+    if (m.invert())
+    {
+        if (pInvertible) *pInvertible = true;
+    }
+    else
+    {
+        if (pInvertible) *pInvertible = false;
+        m.setZero();
+    }
+
+    return m;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+S Matrix3<S>::determinant() const
+{
+    S det = m_v[e00]*m_v[e11]*m_v[e22] + 
+            m_v[e01]*m_v[e12]*m_v[e20] + 
+            m_v[e02]*m_v[e10]*m_v[e21] - 
+            m_v[e00]*m_v[e12]*m_v[e21] - 
+            m_v[e01]*m_v[e10]*m_v[e22] -
+            m_v[e02]*m_v[e11]*m_v[e20];
+
+    return det;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix3<S>::transpose()
+{
+    S tmp;
+    int i, j;
+    for (i = 0; i < 3; i++)
+    {
+        for (j = i + 1; j < 3; j++)
+        {
+            tmp = m_v[j + 3*i];
+            m_v[j + 3*i] = m_v[3*j + i];
+            m_v[3*j + i] = tmp;
+        }
+    }
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+const S* Matrix3<S>::ptr() const
+{
+    return m_v;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix3<S> Matrix3<S>::fromRotation(Vector3<S> axis, S angle)
+{
+    axis.normalize();
+
+    S rcos = Math::cos(angle);
+    S rsin = Math::sin(angle);
+
+    Matrix3 m;
+    m.m_v[e00] =             rcos + axis.x()*axis.x()*(1 - rcos);
+    m.m_v[e10] =  axis.z() * rsin + axis.y()*axis.x()*(1 - rcos);
+    m.m_v[e20] = -axis.y() * rsin + axis.z()*axis.x()*(1 - rcos);
+    m.m_v[e01] = -axis.z() * rsin + axis.x()*axis.y()*(1 - rcos);
+    m.m_v[e11] =             rcos + axis.y()*axis.y()*(1 - rcos);
+    m.m_v[e21] =  axis.x() * rsin + axis.z()*axis.y()*(1 - rcos);
+    m.m_v[e02] =  axis.y() * rsin + axis.x()*axis.z()*(1 - rcos);
+    m.m_v[e12] = -axis.x() * rsin + axis.y()*axis.z()*(1 - rcos);
+    m.m_v[e22] =             rcos + axis.z()*axis.z()*(1 - rcos);
+    
+    return m;
+}
+
+
+} 
+
+} //namespace external

external/resinsight/LibCore/cvfMatrix4.h

@@ -0,0 +1,143 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfBase.h"
+
+#include "cvfSystem.h"
+#include "cvfVector3.h"
+#include "cvfVector4.h"
+#include "cvfMatrix3.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Template matrix class for 4x4 matrices
+//
+//==================================================================================================
+template<typename S>
+class Matrix4
+{
+public:
+    Matrix4();
+    Matrix4(const Matrix4& other);
+    Matrix4(S m00, S m01, S m02, S m03, S m10, S m11, S m12, S m13, S m20, S m21, S m22, S m23, S m30, S m31, S m32, S m33);
+
+    explicit Matrix4(const Matrix3<S>& other);
+
+    template<typename T>
+    explicit Matrix4(const Matrix4<T>& other);
+
+    inline Matrix4&     operator=(const Matrix4& rhs);
+
+    bool                equals(const Matrix4& mat) const;
+    bool                operator==(const Matrix4& rhs) const;
+    bool                operator!=(const Matrix4& rhs) const;
+
+    void                multiply(const Matrix4& mat);
+    const Matrix4       operator*(const Matrix4& rhs) const;
+    const Vector4<S>    operator*(const Vector4<S>& rhs) const;
+
+    void                setIdentity();
+    bool                isIdentity() const;
+    void                setZero();
+    bool                isZero() const;
+
+    inline void         setRowCol(int row, int col, S value);
+    inline S            rowCol(int row, int col) const;
+    inline S&           operator()(int row, int col);
+    inline S            operator()(int row, int col) const;
+
+    void                setRow(int row, const Vector4<S>& vector);
+    Vector4<S>          row(int row) const;
+    void                setCol(int column, const Vector4<S>& vector);
+    Vector4<S>          col(int column) const;
+
+    template<typename T>
+    void                set(const Matrix4<T>& mat);
+
+    Vector3<S>          translation() const;
+    void                setTranslation(const Vector3<S>& trans);
+    void                translatePreMultiply(const Vector3<S>& trans);
+    void                translatePostMultiply(const Vector3<S>& trans);
+
+    bool                invert();
+    const Matrix4       getInverted(bool* pInvertible = NULL) const;
+    S                   determinant() const;
+    void                transpose();
+    const Matrix4       getTransposed() const;
+
+	void				setFromMatrix3(const Matrix3<S>& mat3);
+	Matrix3<S>          toMatrix3() const;
+	void				toMatrix3(Matrix3<S>* mat3) const;
+
+    inline const S*     ptr() const;
+
+    static Matrix4      fromTranslation(const Vector3<S>& trans);
+    static Matrix4      fromScaling(const Vector3<S>& scale);
+    static Matrix4      fromRotation(Vector3<S> axis, S angle);
+    static Matrix4      fromCoordSystemAxes(const Vector3<S>* xAxis, const Vector3<S>* yAxis, const Vector3<S>* zAxis);
+
+public:
+    static const Matrix4 IDENTITY;  ///< Identity matrix
+    static const Matrix4 ZERO;      ///< Matrix with all zeros
+
+private:
+    // Constants for accessing our internal array using standard matrix notation
+    static const int e00 = 0;   static const int e01 = 4;   static const int e02 = 8;   static const int e03 = 12;
+    static const int e10 = 1;   static const int e11 = 5;   static const int e12 = 9;   static const int e13 = 13;
+    static const int e20 = 2;   static const int e21 = 6;   static const int e22 = 10;  static const int e23 = 14;
+    static const int e30 = 3;   static const int e31 = 7;   static const int e32 = 11;  static const int e33 = 15;
+
+private:
+    S   m_v[16];        
+};
+
+
+template<typename S>
+Vector4<S> operator*(const Matrix4<S>& m, const Vector4<S>& v);
+
+typedef Matrix4<float>  Mat4f;
+typedef Matrix4<double> Mat4d;
+
+}
+} //namespace external
+#include "cvfMatrix4.inl"

external/resinsight/LibCore/cvfMatrix4.inl

@@ -0,0 +1,938 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Matrix4
+/// \ingroup Core
+///
+/// Matrices are stored internally as a one dimensional array for performance reasons. 
+/// 
+/// The internal indices into the 1D array are as follows:
+/// 
+/// <PRE>
+///   | m00  m01  m02  m03 |     | 0  4   8  12 | 
+///   | m10  m11  m12  m13 |     | 1  5   9  13 | 
+///   | m20  m21  m22  m23 |     | 2  6  10  14 | 
+///   | m30  m31  m32  m33 |     | 3  7  11  15 | 
+/// </PRE>
+///
+/// This is consistent with the way matrices are represented in %OpenGL.
+/// To exemplify, translation values are stored in elements 12,13,14; see figure below
+///
+/// <PRE>
+///   | 1  0  0 Tx |
+///   | 0  1  0 Ty |
+///   | 0  0  1 Tz |
+///   | 0  0  0  1 |
+/// </PRE>
+///
+/// From the %OpenGL red book (page 68)   v' = M*v
+///
+/// <PRE>
+///   | X'|   | 1  0  0 Tx |   | X |
+///   | Y'|   | 0  1  0 Ty |   | Y |
+///   | Z'| = | 0  0  1 Tz | * | Z |
+///   | 1 |   | 0  0  0  1 |   | 1 |
+/// </PRE>
+///
+/// Beware when porting code that uses C style double array indexing. In this case, the first 
+/// index given will corrspond to the columnd, eg M[3][0] = Tx, M[3][1] = Ty, M[3][2] = Tz
+///
+/// To ease accessing the internal 1D array in implementations, the private eij constants can be used.
+/// These are consistent with the normal row column ordering, so that e02 accesses the element 
+/// in the first row and the third column.
+///
+//==================================================================================================
+
+template<typename S> Matrix4<S> const Matrix4<S>::IDENTITY;
+template<typename S> Matrix4<S> const Matrix4<S>::ZERO(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+//----------------------------------------------------------------------------------------------------
+/// Default constructor. Initializes matrix to identity 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix4<S>::Matrix4()
+{
+    setIdentity();
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Copy constructor
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline Matrix4<S>::Matrix4(const Matrix4& other)
+{
+    System::memcpy(m_v, sizeof(m_v), other.m_v, sizeof(other.m_v));
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Constructor with explicit initialization of all matrix elements.
+/// 
+/// The value of the parameter \a mrc will be placed in row r and column c of the matrix, eg m23
+/// goes into row 2, column 3.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix4<S>::Matrix4(S m00, S m01, S m02, S m03, S m10, S m11, S m12, S m13, S m20, S m21, S m22, S m23, S m30, S m31, S m32, S m33)
+{
+    m_v[e00] = m00;
+    m_v[e10] = m10;
+    m_v[e20] = m20;
+    m_v[e30] = m30;
+    m_v[e01] = m01;
+    m_v[e11] = m11;
+    m_v[e21] = m21;
+    m_v[e31] = m31;
+    m_v[e02] = m02;
+    m_v[e12] = m12;
+    m_v[e22] = m22;
+    m_v[e32] = m32;
+    m_v[e03] = m03;
+    m_v[e13] = m13;
+    m_v[e23] = m23;
+    m_v[e33] = m33;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Matrix4<S>::Matrix4(const Matrix3<S>& other)
+{
+    setFromMatrix3(other);
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+Matrix4<S>::Matrix4(const Matrix4<T>& other)
+{
+    m_v[e00] = static_cast<S>(other.rowCol(0, 0));
+    m_v[e10] = static_cast<S>(other.rowCol(1, 0));
+    m_v[e20] = static_cast<S>(other.rowCol(2, 0));
+    m_v[e30] = static_cast<S>(other.rowCol(3, 0));
+    m_v[e01] = static_cast<S>(other.rowCol(0, 1));
+    m_v[e11] = static_cast<S>(other.rowCol(1, 1));
+    m_v[e21] = static_cast<S>(other.rowCol(2, 1));
+    m_v[e31] = static_cast<S>(other.rowCol(3, 1));
+    m_v[e02] = static_cast<S>(other.rowCol(0, 2));
+    m_v[e12] = static_cast<S>(other.rowCol(1, 2));
+    m_v[e22] = static_cast<S>(other.rowCol(2, 2));
+    m_v[e32] = static_cast<S>(other.rowCol(3, 2));
+    m_v[e03] = static_cast<S>(other.rowCol(0, 3));
+    m_v[e13] = static_cast<S>(other.rowCol(1, 3));
+    m_v[e23] = static_cast<S>(other.rowCol(2, 3));
+    m_v[e33] = static_cast<S>(other.rowCol(3, 3));
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Assignment operator
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline Matrix4<S>& Matrix4<S>::operator=(const Matrix4& obj)
+{
+    System::memcpy(m_v, sizeof(m_v), obj.m_v, sizeof(obj.m_v));
+    return *this;
+}
+
+
+
+//----------------------------------------------------------------------------------------------------
+/// Check if matrices are equal using exact comparisons.
+//----------------------------------------------------------------------------------------------------
+template<typename S>
+bool Matrix4<S>::equals(const Matrix4& mat) const
+{
+    for (int i = 0; i < 16; i++)
+    {
+        if (m_v[i] != mat.m_v[i]) return false;
+    }
+
+    return true;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Comparison operator. Checks for equality using exact comparisons.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix4<S>::operator==(const Matrix4& rhs) const
+{
+    return this->equals(rhs);
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Comparison operator. Checks for not equal using exact comparisons.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix4<S>::operator!=(const Matrix4& rhs) const
+{
+    int i;
+    for (i = 0; i < 16; i++)
+    {
+        if (m_v[i] != rhs.m_v[i]) return true;
+    }
+
+    return false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Multiplies this matrix M with the matrix \a mat, M = M*mat
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Matrix4<S>::multiply(const Matrix4& mat)
+{
+    *this = (*this)*mat;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+const Matrix4<S> Matrix4<S>::operator*(const Matrix4& rhs) const
+{
+    Matrix4 m;
+    m.m_v[e00] = m_v[e00] * rhs.m_v[e00] + m_v[e01] * rhs.m_v[e10] + m_v[e02] * rhs.m_v[e20] + m_v[e03] * rhs.m_v[e30];
+    m.m_v[e01] = m_v[e00] * rhs.m_v[e01] + m_v[e01] * rhs.m_v[e11] + m_v[e02] * rhs.m_v[e21] + m_v[e03] * rhs.m_v[e31];
+    m.m_v[e02] = m_v[e00] * rhs.m_v[e02] + m_v[e01] * rhs.m_v[e12] + m_v[e02] * rhs.m_v[e22] + m_v[e03] * rhs.m_v[e32];
+    m.m_v[e03] = m_v[e00] * rhs.m_v[e03] + m_v[e01] * rhs.m_v[e13] + m_v[e02] * rhs.m_v[e23] + m_v[e03] * rhs.m_v[e33];
+         
+    m.m_v[e10] = m_v[e10] * rhs.m_v[e00] + m_v[e11] * rhs.m_v[e10] + m_v[e12] * rhs.m_v[e20] + m_v[e13] * rhs.m_v[e30];
+    m.m_v[e11] = m_v[e10] * rhs.m_v[e01] + m_v[e11] * rhs.m_v[e11] + m_v[e12] * rhs.m_v[e21] + m_v[e13] * rhs.m_v[e31];
+    m.m_v[e12] = m_v[e10] * rhs.m_v[e02] + m_v[e11] * rhs.m_v[e12] + m_v[e12] * rhs.m_v[e22] + m_v[e13] * rhs.m_v[e32];
+    m.m_v[e13] = m_v[e10] * rhs.m_v[e03] + m_v[e11] * rhs.m_v[e13] + m_v[e12] * rhs.m_v[e23] + m_v[e13] * rhs.m_v[e33];
+         
+    m.m_v[e20] = m_v[e20] * rhs.m_v[e00] + m_v[e21] * rhs.m_v[e10] + m_v[e22] * rhs.m_v[e20] + m_v[e23] * rhs.m_v[e30];
+    m.m_v[e21] = m_v[e20] * rhs.m_v[e01] + m_v[e21] * rhs.m_v[e11] + m_v[e22] * rhs.m_v[e21] + m_v[e23] * rhs.m_v[e31];
+    m.m_v[e22] = m_v[e20] * rhs.m_v[e02] + m_v[e21] * rhs.m_v[e12] + m_v[e22] * rhs.m_v[e22] + m_v[e23] * rhs.m_v[e32];
+    m.m_v[e23] = m_v[e20] * rhs.m_v[e03] + m_v[e21] * rhs.m_v[e13] + m_v[e22] * rhs.m_v[e23] + m_v[e23] * rhs.m_v[e33];
+         
+    m.m_v[e30] = m_v[e30] * rhs.m_v[e00] + m_v[e31] * rhs.m_v[e10] + m_v[e32] * rhs.m_v[e20] + m_v[e33] * rhs.m_v[e30];
+    m.m_v[e31] = m_v[e30] * rhs.m_v[e01] + m_v[e31] * rhs.m_v[e11] + m_v[e32] * rhs.m_v[e21] + m_v[e33] * rhs.m_v[e31];
+    m.m_v[e32] = m_v[e30] * rhs.m_v[e02] + m_v[e31] * rhs.m_v[e12] + m_v[e32] * rhs.m_v[e22] + m_v[e33] * rhs.m_v[e32];
+    m.m_v[e33] = m_v[e30] * rhs.m_v[e03] + m_v[e31] * rhs.m_v[e13] + m_v[e32] * rhs.m_v[e23] + m_v[e33] * rhs.m_v[e33];
+          
+    return m;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+const Vector4<S> Matrix4<S>::operator*(const Vector4<S>& rhs) const
+{
+    return Vector4<S>(m_v[e00]*rhs.x() + m_v[e01]*rhs.y() + m_v[e02]*rhs.z() + m_v[e03]*rhs.w(),
+                      m_v[e10]*rhs.x() + m_v[e11]*rhs.y() + m_v[e12]*rhs.z() + m_v[e13]*rhs.w(),
+                      m_v[e20]*rhs.x() + m_v[e21]*rhs.y() + m_v[e22]*rhs.z() + m_v[e23]*rhs.w(),
+                      m_v[e30]*rhs.x() + m_v[e31]*rhs.y() + m_v[e32]*rhs.z() + m_v[e33]*rhs.w());
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Sets this matrix to identity
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::setIdentity()
+{
+    m_v[0]  = 1;
+    m_v[1]  = 0;    
+    m_v[2]  = 0;
+    m_v[3]  = 0;
+
+    m_v[4]  = 0;
+    m_v[5]  = 1;
+    m_v[6]  = 0;
+    m_v[7]  = 0;
+
+    m_v[8]  = 0;
+    m_v[9]  = 0;
+    m_v[10] = 1;
+    m_v[11] = 0;
+
+    m_v[12] = 0;
+    m_v[13] = 0;
+    m_v[14] = 0;
+    m_v[15] = 1;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Check if this matrix is identity using exact comparisons
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix4<S>::isIdentity() const
+{
+    if (m_v[0]  != 1) return false;
+    if (m_v[1]  != 0) return false;
+    if (m_v[2]  != 0) return false;
+    if (m_v[3]  != 0) return false;
+
+    if (m_v[4]  != 0) return false;
+    if (m_v[5]  != 1) return false;
+    if (m_v[6]  != 0) return false;
+    if (m_v[7]  != 0) return false;
+
+    if (m_v[8]  != 0) return false;
+    if (m_v[9]  != 0) return false;
+    if (m_v[10] != 1) return false;
+    if (m_v[11] != 0) return false;
+
+    if (m_v[12] != 0) return false;
+    if (m_v[13] != 0) return false;
+    if (m_v[14] != 0) return false;
+    if (m_v[15] != 1) return false;
+
+    return true;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Set all matrix elements to 0
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::setZero()
+{
+    m_v[0]  = 0;
+    m_v[1]  = 0;    
+    m_v[2]  = 0;
+    m_v[3]  = 0;
+    m_v[4]  = 0;
+    m_v[5]  = 0;
+    m_v[6]  = 0;
+    m_v[7]  = 0;
+    m_v[8]  = 0;
+    m_v[9]  = 0;
+    m_v[10] = 0;
+    m_v[11] = 0;
+    m_v[12] = 0;
+    m_v[13] = 0;
+    m_v[14] = 0;
+    m_v[15] = 0;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Returns true if all elements of the matrix are 0. Uses exact comparison.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix4<S>::isZero() const
+{
+    if (m_v[0]  != 0) return false;
+    if (m_v[1]  != 0) return false;
+    if (m_v[2]  != 0) return false;
+    if (m_v[3]  != 0) return false;
+
+    if (m_v[4]  != 0) return false;
+    if (m_v[5]  != 0) return false;
+    if (m_v[6]  != 0) return false;
+    if (m_v[7]  != 0) return false;
+
+    if (m_v[8]  != 0) return false;
+    if (m_v[9]  != 0) return false;
+    if (m_v[10] != 0) return false;
+    if (m_v[11] != 0) return false;
+
+    if (m_v[12] != 0) return false;
+    if (m_v[13] != 0) return false;
+    if (m_v[14] != 0) return false;
+    if (m_v[15] != 0) return false;
+
+    return true;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Set the matrix element at the specified row and column
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline void Matrix4<S>::setRowCol(int row, int col, S value)
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 4);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 4);
+
+    m_v[4*col + row] = value;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Get the matrix element at the specified row and column
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+inline S Matrix4<S>::rowCol(int row, int col) const
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 4);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 4);
+
+    return m_v[4*col + row];
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Get modifiable reference to the the matrix element at the specified row and column
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+inline S& Matrix4<S>::operator()(int row, int col)
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 4);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 4);
+
+    return m_v[4*col + row];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the matrix element at the specified row and column
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+inline S Matrix4<S>::operator()(int row, int col) const
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 4);
+    CVF_TIGHT_ASSERT(col >= 0 && col < 4);
+
+    return m_v[4*col + row];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::setRow(int row, const Vector4<S>& vector)
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 4);
+
+    m_v[row]      = vector.x();
+    m_v[row + 4]  = vector.y();
+    m_v[row + 8]  = vector.z();
+    m_v[row + 12] = vector.w();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+Vector4<S> Matrix4<S>::row(int row) const
+{
+    CVF_TIGHT_ASSERT(row >= 0 && row < 4);
+
+    return Vector4<S>(m_v[row], m_v[row + 4], m_v[row + 8], m_v[row + 12]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::setCol(int column, const Vector4<S>& vector)
+{
+    CVF_TIGHT_ASSERT(column >= 0 && column < 4);
+
+    m_v[4*column]     = vector.x();
+    m_v[4*column + 1] = vector.y();
+    m_v[4*column + 2] = vector.z();
+    m_v[4*column + 3] = vector.w();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+Vector4<S> Matrix4<S>::col(int column) const
+{
+    CVF_TIGHT_ASSERT(column >= 0 && column < 4);
+
+    return Vector4<S>(m_v[4*column], m_v[4*column + 1], m_v[4*column + 2], m_v[4*column + 3]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+void Matrix4<S>::set(const Matrix4<T>& mat)
+{
+    const T* matPtr = mat.ptr();
+    for (int i = 0; i < 16; i++)
+    {
+        m_v[i] = static_cast<S>(matPtr[i]);
+    }
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Extracts the translation part of the transformation matrix
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Vector3<S> Matrix4<S>::translation() const
+{
+    return Vector3<S>(m_v[e03], m_v[e13], m_v[e23]);
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Sets the translation transformation part of the matrix
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::setTranslation(const Vector3<S>& trans)
+{
+    m_v[e03] = trans.x();
+    m_v[e13] = trans.y();
+    m_v[e23] = trans.z();
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Adds translation by pre-multiplying the matrix with a matrix containing the specified translation
+/// 
+/// Adds translation to this (transformation) matrix by pre-multiplying the current matrix M with 
+/// a matrix T containing only the specified translation. 
+/// Calling this function has the effect of doing the multiplication M' = T x M
+/// 
+/// \param trans  Specifies the X, Y and Z components of the translation.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::translatePreMultiply(const Vector3<S>& trans)
+{
+    m_v[e00] += trans.x()*m_v[e30];
+    m_v[e01] += trans.x()*m_v[e31];
+    m_v[e02] += trans.x()*m_v[e32];
+    m_v[e03] += trans.x()*m_v[e33];
+
+    m_v[e10] += trans.y()*m_v[e30];
+    m_v[e11] += trans.y()*m_v[e31];
+    m_v[e12] += trans.y()*m_v[e32];
+    m_v[e13] += trans.y()*m_v[e33];
+
+    m_v[e20] += trans.z()*m_v[e30];
+    m_v[e21] += trans.z()*m_v[e31];
+    m_v[e22] += trans.z()*m_v[e32];
+    m_v[e23] += trans.z()*m_v[e33];
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Adds translation by post-multiplying the matrix with a matrix containing the specified translation
+///
+/// Adds translation to this (transformation) matrix by post-multiplying the current matrix M with 
+/// a matrix T containing only the specified translation. 
+/// Calling this function has the effect of doing the multiplication M' = M x T
+/// 
+/// \param trans  Specifies the X, Y and Z coordinates of the translation.
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::translatePostMultiply(const Vector3<S>& trans)
+{
+    m_v[e03] += trans.x()*m_v[e00] + trans.y()*m_v[e01] + trans.z()*m_v[e02];
+    m_v[e13] += trans.x()*m_v[e10] + trans.y()*m_v[e11] + trans.z()*m_v[e12];
+    m_v[e23] += trans.x()*m_v[e20] + trans.y()*m_v[e21] + trans.z()*m_v[e22];
+    m_v[e33] += trans.x()*m_v[e30] + trans.y()*m_v[e31] + trans.z()*m_v[e32];
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+bool Matrix4<S>::invert()
+{
+    // Use double internally here
+    const double m00 = static_cast<double>(m_v[e00]);
+    const double m10 = static_cast<double>(m_v[e10]);
+    const double m20 = static_cast<double>(m_v[e20]);
+    const double m30 = static_cast<double>(m_v[e30]);
+    const double m01 = static_cast<double>(m_v[e01]);
+    const double m11 = static_cast<double>(m_v[e11]);
+    const double m21 = static_cast<double>(m_v[e21]);
+    const double m31 = static_cast<double>(m_v[e31]);
+    const double m02 = static_cast<double>(m_v[e02]);
+    const double m12 = static_cast<double>(m_v[e12]);
+    const double m22 = static_cast<double>(m_v[e22]);
+    const double m32 = static_cast<double>(m_v[e32]);
+    const double m03 = static_cast<double>(m_v[e03]);
+    const double m13 = static_cast<double>(m_v[e13]);
+    const double m23 = static_cast<double>(m_v[e23]);
+    const double m33 = static_cast<double>(m_v[e33]);
+
+    const double s0 = m00 * m11 - m01 * m10;   
+    const double s1 = m00 * m12 - m02 * m10;   
+    const double s2 = m00 * m13 - m03 * m10;   
+    const double s3 = m01 * m12 - m02 * m11;   
+    const double s4 = m01 * m13 - m03 * m11;   
+    const double s5 = m02 * m13 - m03 * m12;   
+    
+    const double c5 = m22 * m33 - m23 * m32;
+    const double c4 = m21 * m33 - m23 * m31;
+    const double c3 = m21 * m32 - m22 * m31;
+    const double c2 = m20 * m33 - m23 * m30;
+    const double c1 = m20 * m32 - m22 * m30;
+    const double c0 = m20 * m31 - m21 * m30;
+
+    const double det = s0*c5 - s1*c4 + s2*c3 + s3*c2 - s4*c1 + s5*c0;
+
+    if (Math::abs(det) > std::numeric_limits<double>::epsilon())
+    {
+        const double invDet = 1/det;
+
+        m_v[e00] = static_cast<S>( (   m11 * c5 - m12 * c4 + m13 * c3 ) * invDet );
+        m_v[e10] = static_cast<S>( ( - m10 * c5 + m12 * c2 - m13 * c1 ) * invDet );
+        m_v[e20] = static_cast<S>( (   m10 * c4 - m11 * c2 + m13 * c0 ) * invDet );
+        m_v[e30] = static_cast<S>( ( - m10 * c3 + m11 * c1 - m12 * c0 ) * invDet );
+        m_v[e01] = static_cast<S>( ( - m01 * c5 + m02 * c4 - m03 * c3 ) * invDet );
+        m_v[e11] = static_cast<S>( (   m00 * c5 - m02 * c2 + m03 * c1 ) * invDet );
+        m_v[e21] = static_cast<S>( ( - m00 * c4 + m01 * c2 - m03 * c0 ) * invDet );
+        m_v[e31] = static_cast<S>( (   m00 * c3 - m01 * c1 + m02 * c0 ) * invDet );
+        m_v[e02] = static_cast<S>( (   m31 * s5 - m32 * s4 + m33 * s3 ) * invDet );
+        m_v[e12] = static_cast<S>( ( - m30 * s5 + m32 * s2 - m33 * s1 ) * invDet );
+        m_v[e22] = static_cast<S>( (   m30 * s4 - m31 * s2 + m33 * s0 ) * invDet );
+        m_v[e32] = static_cast<S>( ( - m30 * s3 + m31 * s1 - m32 * s0 ) * invDet );
+        m_v[e03] = static_cast<S>( ( - m21 * s5 + m22 * s4 - m23 * s3 ) * invDet );
+        m_v[e13] = static_cast<S>( (   m20 * s5 - m22 * s2 + m23 * s1 ) * invDet );
+        m_v[e23] = static_cast<S>( ( - m20 * s4 + m21 * s2 - m23 * s0 ) * invDet );
+        m_v[e33] = static_cast<S>( (   m20 * s3 - m21 * s1 + m22 * s0 ) * invDet );
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+const Matrix4<S> Matrix4<S>::getInverted(bool* pInvertible) const
+{
+    Matrix4 m(*this);
+    if (m.invert())
+    {
+        if (pInvertible) *pInvertible = true;
+    }
+    else
+    {
+        if (pInvertible) *pInvertible = false;
+        m.setZero();
+    }
+
+    return m;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+S Matrix4<S>::determinant() const
+{
+    // Consider using double precision for the intermediate calculations here
+    // Haven't seen any direct need for it yet, but good old GLview API did that
+    const S a0 = m_v[e00]*m_v[e11] - m_v[e01]*m_v[e10];
+    const S a1 = m_v[e00]*m_v[e12] - m_v[e02]*m_v[e10];
+    const S a2 = m_v[e00]*m_v[e13] - m_v[e03]*m_v[e10];
+    const S a3 = m_v[e01]*m_v[e12] - m_v[e02]*m_v[e11];
+    const S a4 = m_v[e01]*m_v[e13] - m_v[e03]*m_v[e11];
+    const S a5 = m_v[e02]*m_v[e13] - m_v[e03]*m_v[e12];
+
+    const S b0 = m_v[e20]*m_v[e31] - m_v[e21]*m_v[e30];
+    const S b1 = m_v[e20]*m_v[e32] - m_v[e22]*m_v[e30];
+    const S b2 = m_v[e20]*m_v[e33] - m_v[e23]*m_v[e30];
+    const S b3 = m_v[e21]*m_v[e32] - m_v[e22]*m_v[e31];
+    const S b4 = m_v[e21]*m_v[e33] - m_v[e23]*m_v[e31];
+    const S b5 = m_v[e22]*m_v[e33] - m_v[e23]*m_v[e32];
+
+    return (a0*b5 - a1*b4 + a2*b3 + a3*b2 - a4*b1 + a5*b0);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+void Matrix4<S>::transpose()
+{
+    S tmp;
+    int i, j;
+    for (i = 0; i < 4; i++)
+    {
+        for (j = i + 1; j < 4; j++)
+        {
+            tmp = m_v[j + 4*i];
+            m_v[j + 4*i] = m_v[4*j + i];
+            m_v[4*j + i] = tmp;
+        }
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename S>
+const Matrix4<S> Matrix4<S>::getTransposed() const
+{
+    Matrix4 m(*this);
+    m.transpose();
+    return m;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Matrix4<S>::setFromMatrix3(const Matrix3<S>& mat3)
+{
+    m_v[e00] = mat3.rowCol(0, 0);
+    m_v[e01] = mat3.rowCol(0, 1);
+    m_v[e02] = mat3.rowCol(0, 2);
+    m_v[e03] = 0;
+    m_v[e10] = mat3.rowCol(1, 0);
+    m_v[e11] = mat3.rowCol(1, 1);
+    m_v[e12] = mat3.rowCol(1, 2);
+    m_v[e13] = 0;
+    m_v[e20] = mat3.rowCol(2, 0);
+    m_v[e21] = mat3.rowCol(2, 1);
+    m_v[e22] = mat3.rowCol(2, 2);
+    m_v[e23] = 0;
+    m_v[e30] = 0;
+    m_v[e31] = 0;
+    m_v[e32] = 0;
+    m_v[e33] = 1;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Matrix3<S> Matrix4<S>::toMatrix3() const
+{
+    return Matrix3<S>(m_v[e00], m_v[e01], m_v[e02],
+                      m_v[e10], m_v[e11], m_v[e12],
+                      m_v[e20], m_v[e21], m_v[e22]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Matrix4<S>::toMatrix3(Matrix3<S>* mat3) const
+{
+    CVF_ASSERT(mat3);
+    mat3->setRowCol(0, 0, m_v[e00]);
+    mat3->setRowCol(0, 1, m_v[e01]);
+    mat3->setRowCol(0, 2, m_v[e02]);
+    mat3->setRowCol(1, 0, m_v[e10]);
+    mat3->setRowCol(1, 1, m_v[e11]);
+    mat3->setRowCol(1, 2, m_v[e12]);
+    mat3->setRowCol(2, 0, m_v[e20]);
+    mat3->setRowCol(2, 1, m_v[e21]);
+    mat3->setRowCol(2, 2, m_v[e22]);
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+const S* Matrix4<S>::ptr() const
+{
+    return m_v;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Static member function that creates a transformation matrix containing only translation
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix4<S> Matrix4<S>::fromTranslation(const Vector3<S>& trans)
+{
+    return Matrix4(1, 0, 0, trans.x(),
+                   0, 1, 0, trans.y(),
+                   0, 0, 1, trans.z(),
+                   0, 0, 0, 1);
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Static member function that creates a transformation matrix containing only scaling
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix4<S> Matrix4<S>::fromScaling(const Vector3<S>& scale)
+{
+    return Matrix4(scale.x(), 0,         0,         0,
+                   0,         scale.y(), 0,         0,
+                   0,         0,         scale.z(), 0,
+                   0,         0,         0,         1);
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// 
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix4<S> Matrix4<S>::fromRotation(Vector3<S> axis, S angle)
+{
+    axis.normalize();
+
+    S rcos = Math::cos(angle);
+    S rsin = Math::sin(angle);
+
+    Matrix4 m;
+    m.m_v[e00] =             rcos + axis.x()*axis.x()*(1 - rcos);
+    m.m_v[e10] =  axis.z() * rsin + axis.y()*axis.x()*(1 - rcos);
+    m.m_v[e20] = -axis.y() * rsin + axis.z()*axis.x()*(1 - rcos);
+    m.m_v[e01] = -axis.z() * rsin + axis.x()*axis.y()*(1 - rcos);
+    m.m_v[e11] =             rcos + axis.y()*axis.y()*(1 - rcos);
+    m.m_v[e21] =  axis.x() * rsin + axis.z()*axis.y()*(1 - rcos);
+    m.m_v[e02] =  axis.y() * rsin + axis.x()*axis.z()*(1 - rcos);
+    m.m_v[e12] = -axis.x() * rsin + axis.y()*axis.z()*(1 - rcos);
+    m.m_v[e22] =             rcos + axis.z()*axis.z()*(1 - rcos);
+    
+    return m;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Create a rotation matrix that will align the global X, Y and Z axes with the specified axes.
+/// 
+/// Note that at least one axis must be specified and all specified axes must be normalized. 
+/// If two or three axes are specified, they must be orthogonal to each other.
+/// 
+/// \param xAxis  Orientation of x axis
+/// \param yAxis  Orientation of y axis
+/// \param zAxis  Orientation of z axis
+//----------------------------------------------------------------------------------------------------
+template <typename S>
+Matrix4<S> Matrix4<S>::fromCoordSystemAxes(const Vector3<S>* xAxis, const Vector3<S>* yAxis, const Vector3<S>* zAxis)
+{
+    Vector3<S> x(0, 0, 0);
+    Vector3<S> y(0, 0, 0);
+    Vector3<S> z(0, 0, 0);
+
+    if (xAxis && yAxis && zAxis)
+    {
+        x = *xAxis;
+        y = *yAxis;
+        z = *zAxis;
+    }
+    else if (xAxis && yAxis)
+    {
+        x = *xAxis;
+        y = *yAxis;
+        z = x ^ y;
+    }
+    else if (xAxis && zAxis)
+    {
+        x = *xAxis;
+        z = *zAxis;
+        y = z ^ x;
+    }
+    else if (yAxis && zAxis)
+    {
+        y = *yAxis;
+        z = *zAxis;
+        x = y ^ z;
+    }
+    else if (xAxis)
+    {
+        xAxis->createOrthonormalBasis(0, &x, &y, &z);
+    }
+    else if (yAxis)
+    {
+        yAxis->createOrthonormalBasis(1, &x, &y, &z);
+    }
+    else if (zAxis)
+    {
+        zAxis->createOrthonormalBasis(2, &x, &y, &z);
+    }
+    else
+    {
+        CVF_FAIL_MSG("Must specify at least one axis");
+    }
+
+    Matrix4 m;
+    m.setIdentity();
+    m.setCol(0, Vector4<S>(x, 0));
+    m.setCol(1, Vector4<S>(y, 0));
+    m.setCol(2, Vector4<S>(z, 0));
+
+    return m;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Post multiplication: matrix * column vector
+/// 
+/// v' = M*v
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+cvf::Vector4<S> operator*(const cvf::Matrix4<S>& m, const cvf::Vector4<S>& v)
+{
+    cvf::Vector4<S> vec(
+        v.x()*m.rowCol(0,0) + v.y()*m.rowCol(0,1) + v.z()*m.rowCol(0,2) + v.w()*m.rowCol(0,3),
+        v.x()*m.rowCol(1,0) + v.y()*m.rowCol(1,1) + v.z()*m.rowCol(1,2) + v.w()*m.rowCol(1,3),
+        v.x()*m.rowCol(2,0) + v.y()*m.rowCol(2,1) + v.z()*m.rowCol(2,2) + v.w()*m.rowCol(2,3),
+        v.x()*m.rowCol(3,0) + v.y()*m.rowCol(3,1) + v.z()*m.rowCol(3,2) + v.w()*m.rowCol(3,3)
+        );
+
+    return vec;
+}
+
+} 
+
+} //namespace external

external/resinsight/LibCore/cvfObject.cpp

@@ -0,0 +1,124 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfObject.h"
+#include "cvfTrace.h"
+
+#include <map>
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Object
+/// \ingroup Core
+///
+/// Base class for all reference counted objects
+///
+/// Very often used in conjunction with the ref<> class (smart pointer) which wraps the 
+/// reference counting. Thus direct use of addRef() and release() is seldom needed.
+///
+/// The copy constructor and assignment operator is disabled by default so you will get compiler errors 
+/// instead of unexpected behavior if you pass objects (that derive from Object) by value or assign objects.
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Get the set of currently active/allocated object instances
+/// 
+/// Note that unless the define CVF_TRACK_ACTIVE_OBJECT_INSTANCES is set to 1, this function 
+/// will always return an empty set.
+//--------------------------------------------------------------------------------------------------
+std::set<Object*>* Object::activeObjectInstances()
+{ 
+    static std::set<Object*>*  sl_activeObjects = NULL;
+    if (!sl_activeObjects)
+    {
+        sl_activeObjects = new std::set<Object*>;
+    }
+
+    return sl_activeObjects;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Dump list of active object instances using Trace class
+/// 
+/// Currently this function utilizes RTTI and typeid to get the class names. 
+/// Data on active instances will only be present if CVF_TRACK_ACTIVE_OBJECT_INSTANCES is defined
+//--------------------------------------------------------------------------------------------------
+void Object::dumpActiveObjectInstances()
+{
+    Trace::show("Dumping active object instances:");
+
+    std::set<Object*>* objInstances = Object::activeObjectInstances();
+    size_t numInstances = objInstances->size();
+    
+#if ((CVF_TRACK_ACTIVE_OBJECT_INSTANCES >= 1 && defined(_DEBUG)) || CVF_TRACK_ACTIVE_OBJECT_INSTANCES == 2)
+
+    // Use a map to count the number of occurences of each class
+    std::map<std::string, int> occurences;
+
+    std::set<Object*>::iterator it;
+    for (it = objInstances->begin(); it != objInstances->end(); ++it)
+    {
+        Object* obj = *it;
+
+        const type_info& typeInfo = typeid(*obj);
+        const char* className = typeInfo.name();
+        if (occurences.find(className) != occurences.end())
+        {
+            occurences[className] += 1;
+        }
+        else
+        {
+            occurences[className] = 1;
+        }
+    }
+
+    if (occurences.size() > 0)
+    {
+        std::map<std::string, int>::iterator it;
+        for (it = occurences.begin(); it != occurences.end(); ++it)
+        {
+            Trace::show("%6d instances of:  %s", it->second, it->first.data());
+        }
+    }
+
+#else
+
+    Trace::show("  Tracking of active instances not enabled!");
+
+#endif
+
+    Trace::show("Total number of active object instances: %d", numInstances);
+}
+
+
+} // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfObject.h

@@ -0,0 +1,200 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfBase.h"
+#include "cvfSystem.h"
+
+#include <set>
+
+#include "cvfAtomicCounter.h"
+
+namespace external {
+
+#if !defined(CVF_ATOMIC_COUNTER_CLASS_EXISTS) && !defined(CVF_USE_NON_THREADSAFE_REFERENCE_COUNT)
+#error No support for atomics. Define CVF_USE_NON_THREADSAFE_REFERENCE_COUNT to be able to compile
+#endif
+
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Base class for all reference counted objects
+//
+//==================================================================================================
+class Object
+{
+public:
+    inline Object();
+    inline virtual ~Object();
+
+    inline int addRef() const;
+    inline int release() const;
+    inline int refCount() const;
+
+    // Helpers for debugging, see the CVF_TRACK_ACTIVE_OBJECT_INSTANCES define 
+    static std::set<Object*>* activeObjectInstances();
+    static void               dumpActiveObjectInstances();
+
+private:
+
+#if defined(CVF_USE_NON_THREADSAFE_REFERENCE_COUNT)
+    mutable int m_refCount;
+#elif defined(CVF_ATOMIC_COUNTER_CLASS_EXISTS)
+    mutable AtomicCounter m_refCount;
+#else
+    #error No support for atomics. Define CVF_USE_NON_THREADSAFE_REFERENCE_COUNT to be able to compile
+#endif
+
+
+    CVF_DISABLE_COPY_AND_ASSIGN(Object);
+};
+
+
+
+//==================================================================================================
+//
+// Smart pointer class
+//
+//==================================================================================================
+template <typename T>
+class ref
+{
+public:
+    ref(T* object = NULL);
+    ref(const ref& other);
+    template<typename T2> ref(const ref<T2>& other);
+    ~ref();
+
+    ref&                        operator=(T* rhs);
+    ref&                        operator=(ref rhs);
+    template<typename T2> ref&  operator=(const ref<T2>& rhs);
+
+    inline T*       operator->();
+    inline const T* operator->() const;
+    inline T&       operator*();
+    inline const T& operator*() const;
+    inline T*       p();
+    inline const T* p() const;
+    inline bool     isNull() const;
+    inline bool     notNull() const;
+
+    bool            operator<(const ref& rhs) const; 
+
+    void            swap(ref& other);
+
+private:
+    T* m_object;
+};
+
+/// \relates cvf::ref
+/// @{
+
+template<typename T1, typename T2> inline bool operator==(const ref<T1>& a, const ref<T2>& b)   { return a.p() == b.p(); }  ///< Returns true if the internal pointers of refs \a a and \a b are equal.
+template<typename T1, typename T2> inline bool operator!=(const ref<T1>& a, const ref<T2>& b)   { return a.p() != b.p(); }  ///< Returns true if the internal pointers of refs \a a and \a b are different.
+template<typename T1, typename T2> inline bool operator==(const ref<T1>& a, T2* b)              { return a.p() == b; }      ///< Returns true if the internal pointer of ref \a a is equal to the naked pointer \a b.
+template<typename T1, typename T2> inline bool operator!=(const ref<T1>& a, T2* b)              { return a.p() != b; }      ///< Returns true if the internal pointer of ref \a a is different from the naked pointer \a b.
+template<typename T1, typename T2> inline bool operator==(T1* a, const ref<T2>& b)              { return a == b.p(); }      ///< Returns true if the naked pointer \a a is equal to the internal pointer of ref \a b.
+template<typename T1, typename T2> inline bool operator!=(T1* a, const ref<T2>& b)              { return a != b.p(); }      ///< Returns true if the naked pointer \a a is different from the internal pointer of ref \a b.
+
+/// Swap contents of \a a and \a b. Matches signature of std::swap().
+/// \todo Need to investigate which STL algorithms actually utilize the swap() function.
+template<typename T> inline void swap(ref<T>& a, ref<T>& b)   { a.swap(b); }              
+
+/// @}
+
+//==================================================================================================
+//
+// Smart pointer class for const pointers
+//
+//==================================================================================================
+template <typename T>
+class cref
+{
+public:
+    cref(const T* object = NULL);
+    cref(const cref& other);
+    template<typename T2> cref(const cref<T2>& other);
+    ~cref();
+
+    cref&                       operator=(const T* rhs);
+    cref&                       operator=(cref rhs);
+    template<typename T2> cref& operator=(const cref<T2>& rhs);
+
+    inline const T* operator->() const;
+    inline const T& operator*() const;
+    inline const T* p() const;
+    inline bool     isNull() const;
+    inline bool     notNull() const;
+
+    bool            operator<(const cref& rhs) const; 
+
+    void            swap(cref& other);
+
+private:
+    const T* m_object;
+};
+
+/// \relates cvf::cref
+/// @{
+
+template<typename T1, typename T2> inline bool operator==(const cref<T1>& a, const cref<T2>& b)  { return a.p() == b.p(); }  ///< Returns true if the internal pointers of refs \a a and \a b are equal.
+template<typename T1, typename T2> inline bool operator!=(const cref<T1>& a, const cref<T2>& b)  { return a.p() != b.p(); }  ///< Returns true if the internal pointers of refs \a a and \a b are different.
+template<typename T1, typename T2> inline bool operator==(const cref<T1>& a, T2* b)              { return a.p() == b; }      ///< Returns true if the internal pointer of ref \a a is equal to the naked pointer \a b.
+template<typename T1, typename T2> inline bool operator!=(const cref<T1>& a, T2* b)              { return a.p() != b; }      ///< Returns true if the internal pointer of ref \a a is different from the naked pointer \a b.
+template<typename T1, typename T2> inline bool operator==(T1* a, const cref<T2>& b)              { return a == b.p(); }      ///< Returns true if the naked pointer \a a is equal to the internal pointer of ref \a b.
+template<typename T1, typename T2> inline bool operator!=(T1* a, const cref<T2>& b)              { return a != b.p(); }      ///< Returns true if the naked pointer \a a is different from the internal pointer of ref \a b.
+
+//==================================================================================================
+//
+// Creation of smart pointers.
+//
+//==================================================================================================
+template<typename T, class... Args>
+ref<T> make_ref(Args&&... args);
+
+template<typename T, class... Args>
+cref<T> make_cref(Args&&... args);
+
+/// @}
+
+}
+} //namespace external
+
+#include "cvfObject.inl"

external/resinsight/LibCore/cvfObject.inl

@@ -0,0 +1,592 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external {
+namespace cvf {
+
+
+//--------------------------------------------------------------------------------------------------
+/// Constructor. Set the ref count to zero
+//--------------------------------------------------------------------------------------------------
+inline Object::Object()
+:   m_refCount(0)
+{
+#if ((CVF_TRACK_ACTIVE_OBJECT_INSTANCES >= 1 && defined(_DEBUG)) || CVF_TRACK_ACTIVE_OBJECT_INSTANCES == 2)
+    activeObjectInstances()->insert(this);
+#endif
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Destructor. Asserts that the ref count is zero.
+//--------------------------------------------------------------------------------------------------
+inline Object::~Object()
+{
+    CVF_ASSERT(m_refCount == 0);
+
+#if ((CVF_TRACK_ACTIVE_OBJECT_INSTANCES >= 1 && defined(_DEBUG)) || CVF_TRACK_ACTIVE_OBJECT_INSTANCES == 2)
+    activeObjectInstances()->erase(this);
+#endif
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Increments reference count.
+/// 
+/// \return  The new reference count.
+//--------------------------------------------------------------------------------------------------
+inline int Object::addRef() const
+{
+    CVF_TIGHT_ASSERT(this);
+    return ++m_refCount;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Decrements the reference count. Returns the new reference count.
+/// 
+/// \return  The new reference count.
+/// 
+/// If the new reference count is zero, the object (this) is deleted.\n
+//--------------------------------------------------------------------------------------------------
+inline int Object::release() const
+{
+    CVF_TIGHT_ASSERT(m_refCount > 0);
+
+    if (--m_refCount == 0)
+    {
+        delete this;
+        return 0;
+    }
+    else
+    {
+        return m_refCount;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the current reference count
+//--------------------------------------------------------------------------------------------------
+inline int Object::refCount() const
+{
+    CVF_TIGHT_ASSERT(this);
+    return m_refCount;
+}
+
+
+
+//==================================================================================================
+///
+/// \class cvf::ref
+/// \ingroup Core
+///
+/// Smart pointer class used for handling reference counted objects (that derive from Object). 
+///
+/// The ref<T> class encapsulates reference counting by calling Object::addRef() and Object::release() 
+/// on the internally stored object pointer. 
+///
+/// \internal Inspired by boost's intrusive_ptr class.
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Constructor from naked pointer 
+/// 
+/// Will call addRef() on the passed object.
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+ref<T>::ref(T* object)
+{
+    if (object)
+    {
+        object->addRef();
+        m_object = object;
+    }
+    else
+    {
+        m_object = NULL;
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Copy constructor
+///  
+/// Copies the internal pointer from the passed ref object and calls addRef() on the object.
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+ref<T>::ref(const ref& other)
+{
+    if (other.m_object)
+    {
+        other.m_object->addRef();
+        m_object = other.m_object;
+    }
+    else
+    {
+        m_object = NULL;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Construct from related. 
+/// 
+/// Copies the internal pointer from the passed ref object and calls addRef() on the object.
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+template<typename T2>
+ref<T>::ref(const ref<T2>& other)
+{
+    if (other.notNull())
+    {
+        other->addRef();
+
+        // Escape const
+        m_object = const_cast<T2*>(other.p());
+    }
+    else
+    {
+        m_object = NULL;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Destructor. 
+/// 
+/// Will call release() on the internal pointer.
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+ref<T>::~ref()
+{
+    if (m_object)
+    {
+        m_object->release();
+        m_object = NULL;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment from raw pointer. 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+ref<T>& ref<T>::operator=(T* rhs)
+{
+    // Copy-and-swap (on temporary obj)
+    ref<T>(rhs).swap(*this);
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment operator
+/// 
+/// Copies the internal pointer from \a rhs and calls addRef().
+/// If we're already storing an internal pointer, this pointer will be release()'ed. 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+ref<T>& ref<T>::operator=(ref rhs)
+{
+    // Copy-and-swap (copy already done since parameter is passed by value)
+    rhs.swap(*this);
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment from related.
+/// 
+/// Copies the internal pointer from \a rhs and calls addRef().
+/// If we're already storing an internal pointer, this pointer will be release()'ed. 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+template<typename T2>
+ref<T>& ref<T>::operator=(const ref<T2>& rhs)
+{
+    // Copy-and-swap (on temporary obj)
+    ref<T>(rhs).swap(*this);
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the naked pointer this object is associated with. 
+/// 
+/// Added to be able to write the same code for smart pointers as for normal naked pointers.
+/// 
+/// \code
+/// ref<MyObject> myObject = new MyObject;
+/// myObject->doSomething();                // Easier than myObject.p()->doSomething()
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline T* ref<T>::operator->()
+{
+    CVF_TIGHT_ASSERT(m_object); 
+    return m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns naked const pointer this object is associated with. 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline const T* ref<T>::operator->() const
+{
+    CVF_TIGHT_ASSERT(m_object); 
+    return m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Dereference operator returning a modifiable reference to the associated object. 
+/// 
+/// Added to be able to write the same code for smart pointers as for normal naked pointers.
+/// \code
+/// ref<MyObject> myObject = new MyObject;
+/// *myObject.doSomething();
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline T& ref<T>::operator*()
+{
+    CVF_TIGHT_ASSERT(m_object); 
+    return *m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Dereference operator returning a const reference to the associated object. 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline const T& ref<T>::operator*() const
+{
+    CVF_TIGHT_ASSERT(m_object); 
+    return *m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the naked pointer
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline T* ref<T>::p()
+{
+    return m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns naked const pointer
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline const T* ref<T>::p() const
+{
+    return m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns true if the internal pointer is NULL
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline bool ref<T>::isNull() const
+{
+    return m_object == NULL;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns true if the internal pointer is different from NULL 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline bool ref<T>::notNull() const
+{
+    return m_object != NULL;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Does less than comparison of two ref objects.
+/// 
+/// \return Returns true if this object's internal pointer is less than the internal pointer of \a rhs.
+/// 
+/// The comparison is done by comparing the internal pointer values ( this.p() < rhs.p() )
+/// This operator is used in several STL collections (e.g. std::set) as well as in many STL algorithms
+/// (e.g. std::sort() ).
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+bool ref<T>::operator<(const ref& rhs) const
+{
+    CVF_TIGHT_ASSERT((m_object != NULL) && (rhs.p() != NULL));
+    return std::less<T*>()(m_object, rhs.m_object);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Exchanges the contents of the two smart pointers.
+/// 
+/// \param other  Modifiable reference to the ref object that should have its contents swapped.
+/// 
+/// Swap the associated pointer in this and the passed ref object. Will not modify the reference 
+/// count of any of the associated objects.
+/// 
+/// \warning Note that signature differs from normal practice. This is done to be 
+///          consistent with the signature of std::swap()
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void ref<T>::swap(ref& other)
+{
+    T* tmp = other.m_object;
+    other.m_object = m_object; 
+    m_object = tmp;
+}
+
+
+//==================================================================================================
+///
+/// \class cvf::cref
+/// \ingroup Core
+///
+/// Smart pointer class used for handling const reference counted objects
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Construct from naked pointer
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+cref<T>::cref(const T* object)
+{
+    if (object)
+    {
+        object->addRef();
+        m_object = object;
+    }
+    else
+    {
+        m_object = NULL;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy constructor
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+cref<T>::cref(const cref& other)
+{
+    if (other.m_object)
+    {
+        other.m_object->addRef();
+        m_object = other.m_object;
+    }
+    else
+    {
+        m_object = NULL;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Construct from related
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+template<typename T2>
+cref<T>::cref(const cref<T2>& other)
+{
+    if (other.notNull())
+    {
+        other->addRef();
+        m_object = other.p();
+    }
+    else
+    {
+        m_object = NULL;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+cref<T>::~cref()
+{
+    if (m_object)
+    {
+        m_object->release();
+        m_object = NULL;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+cref<T>& cref<T>::operator=(const T* rhs)
+{
+    // Copy-and-swap (on temporary obj)
+    cref<T>(rhs).swap(*this);
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+cref<T>& cref<T>::operator=(cref rhs)
+{
+    // Copy-and-swap (copy already done since parameter is passed by value)
+    rhs.swap(*this);
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+template<typename T2>
+cref<T>& cref<T>::operator=(const cref<T2>& rhs)
+{
+    // Copy-and-swap (on temporary obj)
+    cref<T>(rhs).swap(*this);
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline const T* cref<T>::operator->() const
+{
+    CVF_TIGHT_ASSERT(m_object); 
+    return m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline const T& cref<T>::operator*() const
+{
+    CVF_TIGHT_ASSERT(m_object); 
+    return *m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline const T* cref<T>::p() const
+{
+    return m_object;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline bool cref<T>::isNull() const
+{
+    return m_object == NULL;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+inline bool cref<T>::notNull() const
+{
+    return m_object != NULL;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+bool cref<T>::operator<(const cref& rhs) const
+{
+    CVF_TIGHT_ASSERT((m_object != NULL) && (rhs.p() != NULL));
+    return std::less<const T*>()(m_object, rhs.m_object);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+void cref<T>::swap(cref& other)
+{
+    const T* tmp = other.m_object;
+    other.m_object = m_object; 
+    m_object = tmp;
+}
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// Creation of smart pointers.
+//--------------------------------------------------------------------------------------------------
+template<typename T, class... Args>
+ref<T> make_ref(Args&&... args)
+{
+    return cvf::ref(new T(args...));
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Creation of const smart pointers.
+//--------------------------------------------------------------------------------------------------
+template<typename T, class... Args>
+cref<T> make_cref(Args&&... args)
+{
+    return cvf::cref(new T(args...));
+}
+
+
+
+}  // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfPlane.cpp

@@ -0,0 +1,664 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfPlane.h"
+#include "cvfMath.h"
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Plane
+/// \ingroup Core
+///
+/// Class defining a plane in space
+///
+/// The class describes a plane by the equation: \f$Ax + By + Cz + D = 0\f$
+/// The plane's normal is defined by the coefficients \f$[A, B, C]\f$
+/// 
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Default constructor
+///
+/// The plane will be set to invalid
+//--------------------------------------------------------------------------------------------------
+Plane::Plane()
+{
+    // Invalidate plane coefficients 
+    // Note: Coefficients set to zero will still comply with the line equation but
+    //       the normal is of zero length which is considered an invalid state in this class.
+    m_A = m_B = m_C = m_D = 0.0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Constructor with plane equation coefficients
+///
+/// Define a plane by the plane equation coefficients.
+/// Setting at least the A, B and C coefficients to zero will effectually set the plane to invalid.
+//--------------------------------------------------------------------------------------------------
+Plane::Plane(double A, double B, double C, double D)
+{ 
+    m_A = A;
+    m_B = B;
+    m_C = C;
+    m_D = D;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy constructor
+//--------------------------------------------------------------------------------------------------
+Plane::Plane(const Plane& other) 
+:   Object()
+{ 
+    *this = other;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Destructor
+//--------------------------------------------------------------------------------------------------
+Plane::~Plane()
+{
+
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment operator
+//--------------------------------------------------------------------------------------------------
+const Plane& Plane::operator=(const Plane& rhs)
+{ 
+    m_A = rhs.m_A; 
+    m_B = rhs.m_B; 
+    m_C = rhs.m_C; 
+    m_D = rhs.m_D; 
+
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Equality operator
+///
+/// Check if the two planes are identically defined. Note, equal planes may be defined differently
+/// and are as such considered not to be identical to each other. (Different plane coefficients)
+//--------------------------------------------------------------------------------------------------
+bool Plane::operator==(const Plane& rhs) const
+{
+    if (m_A != rhs.m_A) return false;
+    if (m_B != rhs.m_B) return false;
+    if (m_C != rhs.m_C) return false;
+    if (m_D != rhs.m_D) return false;
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Inequality operator
+///
+/// Check if the two planes are not identically defined. Note, equal planes may be defined differently
+/// and are as such considered not to be identical to each other. (Different plane coefficients)
+//--------------------------------------------------------------------------------------------------
+bool Plane::operator!=(const Plane& rhs) const
+{
+    return !operator==(rhs);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Is the plane definition valid or not
+///
+/// The plane is considered invalid if the normal is of zero length
+//--------------------------------------------------------------------------------------------------
+bool Plane::isValid() const
+{
+    return !((m_A == 0.0) && (m_B == 0.0) && (m_C == 0.0));
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Define a plane by the plane equation coefficients
+///
+/// \param     A   Plane coefficient A
+/// \param     B   Plane coefficient B
+/// \param     C   Plane coefficient C
+/// \param     D   Plane coefficient D
+///
+/// The coefficients defines a plane by the equation: \f$Ax + By + Cz + D = 0\f$
+/// The plane coefficients \f$[A, B, C]\f$ defines the normal to the plane
+//--------------------------------------------------------------------------------------------------
+void Plane::set(double A, double B, double C, double D)
+{ 
+    CVF_ASSERT(!(A == 0.0 && B == 0.0 && C == 0.0));
+
+    m_A = A; 
+    m_B = B; 
+    m_C = C; 
+    m_D = D; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute the plane equation from the given point and normal
+///
+/// \param     point   Point on the plane
+/// \param     normal  The plane's normal
+//--------------------------------------------------------------------------------------------------
+bool Plane::setFromPointAndNormal(const Vec3d& point, const Vec3d& normal)
+{
+    if (normal.isZero()) return false;
+
+    m_A = normal.x();
+    m_B = normal.y();
+    m_C = normal.z();
+    m_D = -(normal*point);
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute the plane equation from the given three points
+///
+/// \param     p1   First point on the plane
+/// \param     p2   Second point on the plane
+/// \param     p3   Third point on the plane
+///
+/// \return true if successfully set. false if points are on the same line.
+///
+/// The three points must be different from each other and cannot be on the same line in space
+//--------------------------------------------------------------------------------------------------
+bool Plane::setFromPoints(const Vec3d& p1, const Vec3d& p2, const Vec3d& p3)
+{
+    Vec3d v1 = p2 - p1;
+    Vec3d v2 = p3 - p1;
+    Vec3d normal = v1 ^ v2;
+
+    if (normal.isZero()) return false;
+
+    setFromPointAndNormal(p1, normal);
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the normal of the plane
+///
+/// The normal may not be normalized
+//--------------------------------------------------------------------------------------------------
+Vec3d Plane::normal() const
+{
+    Vec3d normal = Vec3d(m_A, m_B, m_C);
+    CVF_ASSERT(!normal.isZero());
+
+    return normal;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get a point located on the plane
+//--------------------------------------------------------------------------------------------------
+Vec3d Plane::pointInPlane() const
+{
+    double distToOrigin = distanceToOrigin();
+    Vec3d point(m_A, m_B, m_C);
+    point *= distToOrigin;
+
+    return point;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Flip the plane
+//--------------------------------------------------------------------------------------------------
+void Plane::flip()
+{
+    m_A *= -1.0;
+    m_B *= -1.0;
+    m_C *= -1.0;
+    m_D *= -1.0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Transforms the plane with the given homogeneous transformation \a matrix
+//--------------------------------------------------------------------------------------------------
+void Plane::transform(const Mat4d& matrix)
+{
+    Vec3d n = normal();
+    Vec3d point = pointInPlane();
+
+    n.transformVector(matrix);
+    point.transformPoint(matrix);
+
+    setFromPointAndNormal(point, n);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the distance from the point to the plane
+//--------------------------------------------------------------------------------------------------
+double Plane::distance(const Vec3d& point) const
+{
+    double factor = Math::sqrt(m_A*m_A + m_B*m_B + m_C*m_C);
+    CVF_ASSERT(factor > 0.0);
+
+    double dist = distanceSquared(point) / factor;
+
+    return dist;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the square of the distance from the point to the plane
+///
+/// The square of the distance is relatively fast to compute (no \a sqrt) and is useful for determine
+/// which side the point is on. To obtain the actual distance, divide by \f$\sqrt{(A^2 + B^2 + C^2)}\f$
+/// or use the distance() function directly.
+//--------------------------------------------------------------------------------------------------
+double Plane::distanceSquared(const Vec3d& point) const
+{
+    return  m_A*point.x() + m_B*point.y() + m_C*point.z() + m_D;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the distance from the plane to the origin
+//--------------------------------------------------------------------------------------------------
+double Plane::distanceToOrigin() const
+{
+    double factor = m_A*m_A + m_B*m_B + m_C*m_C;
+    CVF_ASSERT(factor > 0.0);
+
+    return -m_D/factor;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Project the given vector onto the plane
+///
+/// \param     vector   Vector to be projected
+/// \param     projectedVector   Projected vector to be returned by pointer
+/// 
+/// \return true if successfully projected.
+///         false if the given \a vector is parallel with the plane's normal
+//--------------------------------------------------------------------------------------------------
+bool Plane::projectVector(const Vec3d& vector, Vec3d* projectedVector) const
+{
+    CVF_ASSERT(projectedVector);
+
+    Vec3d n = normal();
+    Vec3d tmp = n ^ vector;
+    Vec3d k = tmp ^ n;
+    double length = k.length();
+
+    if (length <= 0.0) return false;
+
+    k *= 1.0/length;
+    length = vector*k;
+    *projectedVector = k;
+    *projectedVector *= length; 
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Project the given point onto the plane
+//--------------------------------------------------------------------------------------------------
+Vec3d Plane::projectPoint(const Vec3d& point) const
+{
+    Vec3d pip = pointInPlane();
+    
+    // Create vector from point in plane to node
+    Vec3d vector = point - pip;
+
+    // Project vector to find node in plane
+    Vec3d projectedPoint;
+    if (projectVector(vector, &projectedPoint))
+    {
+        projectedPoint += pip;
+    }
+    else
+    {
+        // The <point - pip> vector is parallel with the normal vector, use the point in plane as the projected
+        projectedPoint = pip;
+    }
+
+    return projectedPoint;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Find intersection line between two planes
+///
+/// \param  other       The other plane to find intersection line with
+/// \param  point       Point on line
+/// \param  direction   Normalized direction of line
+/// 
+/// \return true if success. false if direction is zero -> no point of intersection exists 
+//--------------------------------------------------------------------------------------------------
+bool Plane::intersect(const Plane& other, Vec3d* point, Vec3d* direction) const
+{
+    // Note: Ripped from Graphics Gems III page 233.
+
+    CVF_ASSERT(point);
+
+    double invdet = UNDEFINED_DOUBLE;  
+
+    Vec3d normal1 = this->normal();
+    Vec3d normal2 = other.normal();
+    Vec3d vector = normal1 ^ normal2;
+    Vec3d dir2(vector.x()*vector.x(), vector.y()*vector.y(), vector.z()*vector.z());
+
+    // Todo: VTFIsGreater(...) and VTFeqZero(..) replacement
+    if ((dir2.z() > dir2.y()) && (dir2.z() > dir2.x()) && (dir2.z() != 0.0))
+    {
+        // then get a point on the XY plane 
+        invdet = 1.0 / vector.z();
+
+        // solve < pl1.x() * xpt.x() + pl1.y() * xpt.y() = - pl1.w > < pl2.x() * xpt.x() + pl2.y() * xpt.y() = - pl2.w > 
+        point->x() = m_B*other.m_D - other.m_B*m_D;
+        point->y() = other.m_A*m_D - m_A*other.m_D;
+        point->z() = 0.0;
+    }
+    // Todo: VTFIsGreater(...) and VTFeqZero(..) replacement
+    else if ((dir2.y() > dir2.x()) && (dir2.y() != 0.0))
+    {
+        // then get a point on the XZ plane 
+        invdet = 1.0f / vector.y();
+
+        // solve < pl1.x() * xpt.x() + pl1.z() * xpt.z() = -pl1.w > < pl2.x() * xpt.x() + pl2.z() * xpt.z() = -pl2.w >
+        point->x() = other.m_C*m_D - m_C*other.m_D;
+        point->y() = 0.0;
+        point->z() = m_A*other.m_D - other.m_A*m_D;
+    }
+    // Todo: VTFeqZero(..) replacement
+    else if (dir2.x() != 0.0)
+    {
+        // then get a point on the YZ plane 
+        invdet = 1.0 / vector.x();
+
+        // solve < pl1.y() * xpt.y() + pl1.z() * xpt.z() = - pl1.w > < pl2.y() * xpt.y() + pl2.z() * xpt.z() = - pl2.w > 
+        point->x() = 0.0;
+        point->y() = m_C*other.m_D - other.m_C*m_D;
+        point->z() = other.m_B*m_D - m_B*other.m_D;
+    }
+    else 
+    {
+        // direction is zero, then no point of intersection exists
+        return false;
+    }
+
+    *point *= invdet;
+
+    if (direction)
+    {
+        *direction = vector;
+        direction->normalize();
+    }
+
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Find intersection between a line segment and a plane
+///
+/// \param a            Start of line segment
+/// \param b            End of line segment
+/// \param intersection Returns intersection point if not NULL
+///
+/// \return True if line segment intersects the plane
+//--------------------------------------------------------------------------------------------------
+bool Plane::intersect(const Vec3d& a, const Vec3d& b, Vec3d* intersection) const
+{
+    // From Real-Time Collision Detection by Christer Eriscon, published by Morgen Kaufmann Publishers, (c) 2005 Elsevier Inc
+
+    // Compute the t value for the directed line ab intersecting the plane
+    Vec3d ab = b - a;
+    double t = (-m_D - (normal() * a)) / (normal() * ab);
+
+    // If t in [0..1] compute and return intersection point
+    if (t >= 0.0 && t <= 1.0)
+    {
+        if (intersection)
+        {
+            *intersection = a + t * ab;
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// Clip a triangle against this plane
+///
+/// Clip the triangle given by parameters a, b and c against this plane. The vertices of the 
+/// resulting clipped polygon (triangle or quad) will be returned in \a clippedPolygon. Since the
+/// clipped polygon may be a quad, the \a clippedPolygon array must have room for at least 4 elements.
+///
+/// \return The number of resulting vertices that are populated in \a clippedPolygon. Will be 0, 3 or 4.
+//--------------------------------------------------------------------------------------------------
+size_t Plane::clipTriangle(const Vec3d& a, const Vec3d& b, const Vec3d& c, Vec3d clippedPolygon[4]) const
+{
+    // Except for the trivial cases where all vertices are in front 
+    // or behind plane, these are the permutations
+    //
+    // Single vertex on positive side of plane 
+    // => return a triangle                                
+    //
+    //  +\   /\c               /\c   /+          /\c        .
+    //    \ /  \              /  \  /       +   /  \   +    .
+    //     \    \            /    \/        ---/----\---    .
+    //    / \    \          /     /\          /      \      .
+    //  a/___\____\b      a/_____/__\b      a/________\b    .
+    //       +\                 /+
+    //
+    // Two vertices vertex on positive side of plane 
+    // => return a quad
+    //
+    //       /\c           \+  /\c               /\c  +/    .   
+    //      /  \            \ /  \              /  \  /     .  
+    //  ___/____\___         \    \            /    \/      .
+    //  + /      \ +        / \    \          /     /\      .
+    //  a/________\b      a/___\____\b      a/_____/__\b    .        
+    //                          \+               +/
+
+    bool onPosSide[3];
+    onPosSide[0] = distanceSquared(a) >= 0 ? true : false;
+    onPosSide[1] = distanceSquared(b) >= 0 ? true : false;
+    onPosSide[2] = distanceSquared(c) >= 0 ? true : false;
+    const int numPositiveVertices = (onPosSide[0] ? 1 : 0) + (onPosSide[1] ? 1 : 0) + (onPosSide[2] ? 1 : 0);
+    
+    // The entire triangle is on the negative side
+    // Clip everything
+    if (numPositiveVertices == 0)
+    {
+        return 0;
+    }
+
+    // All triangle vertices are on the positive side
+    // Return the same triangle
+    if (numPositiveVertices == 3) 
+    {
+        clippedPolygon[0] = a;
+        clippedPolygon[1] = b;
+        clippedPolygon[2] = c;
+        return 3;
+    }
+
+    // Handle case where a single vertex is on the positive side
+    // Will result in the return of a single clipped triangle
+    if (numPositiveVertices == 1)
+    {
+        if (onPosSide[0])
+        {
+            clippedPolygon[0] = a;
+            intersect(a, b, &clippedPolygon[1]);
+            intersect(a, c, &clippedPolygon[2]);
+        }
+        else if (onPosSide[1])
+        {
+            clippedPolygon[0] = b;
+            intersect(b, c, &clippedPolygon[1]);
+            intersect(b, a, &clippedPolygon[2]);
+        }
+        else
+        {
+            CVF_ASSERT(onPosSide[2]);
+            clippedPolygon[0] = c;
+            intersect(c, a, &clippedPolygon[1]);
+            intersect(c, b, &clippedPolygon[2]);
+        }
+
+        return 3;
+    }
+    else
+    {
+        CVF_ASSERT(numPositiveVertices == 2);
+        if (onPosSide[0] && onPosSide[1])
+        {
+            // a & b are on positive side
+            clippedPolygon[0] = a;
+            clippedPolygon[1] = b;
+            intersect(b, c, &clippedPolygon[2]);
+            intersect(a, c, &clippedPolygon[3]);
+        }
+        else if (onPosSide[1] && onPosSide[2])
+        {
+            // b & c are on positive side
+            clippedPolygon[0] = b;
+            clippedPolygon[1] = c;
+            intersect(c, a, &clippedPolygon[2]);
+            intersect(b, a, &clippedPolygon[3]);
+        }
+        else
+        {
+            // c && a are on positive side
+            CVF_ASSERT(onPosSide[2] && onPosSide[0]);
+            clippedPolygon[0] = c;
+            clippedPolygon[1] = a;
+            intersect(a, b, &clippedPolygon[2]);
+            intersect(c, b, &clippedPolygon[3]);
+        }
+
+        return 4;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Classify where the point is located relative to the plane
+///
+/// \return Plane::FRONT if the point is located on the side the plane normal is pointing\n
+///         Plane::BACK if the point is located on the opposite side the plane normal is pointing\n
+///         Plane::ON if the point is located in the plane
+///         
+//--------------------------------------------------------------------------------------------------
+Plane::Side Plane::side(const Vec3d& point) const
+{
+    double d = distanceSquared(point);
+
+    if (d > 0.0)
+    {
+        return FRONT;
+    }
+    else if (d < 0.0)
+    {
+        return BACK;
+    }
+    else
+    {
+        return ON;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Classify where the points are located relative to the plane
+/// 
+/// \param  points  Points to test for location relative the plane
+///  
+/// \return Plane::FRONT if points are either Plane::FRONT or Plane::ON\n
+///         Plane::BACK if points are either Plane::BACK or Plane::ON\n
+///         Plane::ON if all points are Plane::ON\n
+///         Plane::BOTH if points are located on both sides
+//--------------------------------------------------------------------------------------------------
+Plane::Side Plane::side(const Vec3dArray& points) const
+{
+    // Code taken from
+    // http://code.google.com/p/papervision3d/source/browse/trunk/as3/trunk/src/org/papervision3d/core/math/util/ClassificationUtil.as
+
+    cvf::uint frontCount = 0;
+    cvf::uint backCount = 0;
+
+    for (size_t i = 0; i < points.size(); i++)
+    {
+        Side s = side(points[i]);
+
+        if (s == FRONT)
+        {
+            frontCount++;
+        }
+        else if (s == BACK)
+        {
+            backCount++;
+        }
+    }
+    
+    if (frontCount > 0 && backCount == 0)
+    {
+        return FRONT;
+    }
+    else if (frontCount == 0 && backCount > 0)
+    {
+        return BACK;
+    }
+    else if (frontCount > 0 && backCount > 0)
+    {
+        return BOTH;
+    }
+    else
+    {
+        return ON;
+    }
+}
+
+
+} // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfPlane.h

@@ -0,0 +1,107 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfObject.h"
+#include "cvfVector3.h"
+#include "cvfMatrix4.h"
+#include "cvfArray.h"
+
+namespace external {
+namespace cvf {
+
+//=================================================================================================
+// 
+// Plane class
+// 
+//=================================================================================================
+class Plane : public Object
+{
+public:
+    enum Side { FRONT, BACK, ON, BOTH };
+
+public:
+    Plane();
+    Plane(double A, double B, double C, double D);
+    Plane(const Plane& other);
+    ~Plane();
+
+    const Plane&    operator=(const Plane& other);
+    bool            operator==(const Plane& other) const;
+    bool            operator!=(const Plane& other) const;
+
+    inline double   A() const   { return m_A; }     ///< Get plane coefficient A
+    inline double   B() const   { return m_B; }     ///< Get plane coefficient B     
+    inline double   C() const   { return m_C; }     ///< Get plane coefficient C
+    inline double   D() const   { return m_D; }     ///< Get plane coefficient D
+
+    bool            isValid() const;
+
+    void            set(double A, double B, double C, double D);
+    bool            setFromPointAndNormal(const Vec3d& point, const Vec3d& normal);
+    bool            setFromPoints(const Vec3d& p1, const Vec3d& p2, const Vec3d& p3);
+
+    Vec3d           normal() const;
+    Vec3d           pointInPlane() const;
+
+    void            flip();
+    void            transform(const Mat4d& matrix);
+
+    double          distance(const Vec3d& point) const;
+    double          distanceSquared(const Vec3d& point) const;
+    double          distanceToOrigin() const;
+
+    bool            projectVector(const Vec3d& vector, Vec3d* projectedVector) const;
+    Vec3d           projectPoint(const Vec3d& point) const;
+
+    bool            intersect(const Plane& other, Vec3d* point, Vec3d* direction = NULL) const;
+    bool            intersect(const Vec3d& a, const Vec3d& b, Vec3d* intersection) const;
+    size_t          clipTriangle(const Vec3d& ta, const Vec3d& tb, const Vec3d& tc, Vec3d clippedPolygon[4]) const;
+    
+    Side            side(const Vec3d& point) const;
+    Side            side(const Vec3dArray& points) const;
+
+private:
+    double m_A;     // Plane equation coefficients
+    double m_B;     //
+    double m_C;     //
+    double m_D;     //
+};
+
+}
+} //namespace external

external/resinsight/LibCore/cvfPropertySet.cpp

@@ -0,0 +1,168 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfPropertySet.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+///
+/// \class cvf::PropertySet
+/// \ingroup Core
+///
+/// 
+///
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+PropertySet::PropertySet(const String& classType)
+    : m_classType(classType)
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+PropertySet::~PropertySet()
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool PropertySet::operator==(const PropertySet& rhs) const
+{
+    if (m_classType == rhs.m_classType)
+    {
+        return (m_propMap == rhs.m_propMap);
+    }
+
+    return false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+String PropertySet::classType() const
+{
+    return m_classType;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool PropertySet::isEmpty() const
+{
+    return m_propMap.empty();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+Variant PropertySet::value(const String& key) const
+{
+    std::map<String, Variant>::const_iterator it = m_propMap.find(key);
+    if (it != m_propMap.end())
+    {
+        return it->second;
+    }
+    else
+    {
+        return Variant();
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void PropertySet::setValue(const String& key, const Variant& data)
+{
+    m_propMap[key] = data;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool PropertySet::contains(const String& key) const
+{
+    if (m_propMap.find(key) != m_propMap.end())
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<String> PropertySet::allKeys() const
+{
+    std::vector<String> all;
+    std::map<String, Variant>::const_iterator it;
+    for (it = m_propMap.begin(); it != m_propMap.end(); ++it)
+    {
+        all.push_back(it->first);
+    }
+
+    return all;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<Variant> PropertySet::allValues() const
+{
+    std::vector<Variant> all;
+    std::map<String, Variant>::const_iterator it;
+    for (it = m_propMap.begin(); it != m_propMap.end(); ++it)
+    {
+        all.push_back(it->second);
+    }
+
+    return all;
+}
+
+
+
+
+}  // namespace gc
+} //namespace external

external/resinsight/LibCore/cvfPropertySet.h

@@ -0,0 +1,80 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfObject.h"
+#include "cvfVariant.h"
+#include "cvfString.h"
+
+#include <map>
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// 
+//
+//==================================================================================================
+class PropertySet : public Object
+{
+public:
+    PropertySet(const String& classType);
+    ~PropertySet();
+
+    bool                    operator==(const PropertySet& rhs) const;
+
+    String                  classType() const;
+    bool                    isEmpty() const;
+
+    Variant                 value(const String& key) const;
+    void                    setValue(const String& key, const Variant& data);
+    bool                    contains(const String& key) const;
+
+    std::vector<String>     allKeys() const;
+    std::vector<Variant>    allValues() const;
+
+private:
+    String                      m_classType;
+    std::map<String, Variant>   m_propMap;
+};
+
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfQuat.h

@@ -0,0 +1,101 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfVector3.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// This class implements a quaternion 
+//
+//==================================================================================================
+template<typename S>
+class Quat
+{
+public:
+    Quat();
+    Quat(S x, S y, S z, S w);
+    Quat(const Quat& other);
+
+    template<typename T>
+    explicit Quat(const T& other);
+
+    Quat&   operator=(const Quat& rhs);
+    bool    operator==(const Quat& rhs) const;
+    bool    operator!=(const Quat& rhs) const;
+
+    const S&    x() const   { return m_x; }     ///< Get the X element of the quaternion
+    const S&    y() const   { return m_y; }     ///< Get the Y element of the quaternion
+    const S&    z() const   { return m_z; }     ///< Get the Z element of the quaternion
+    const S&    w() const   { return m_w; }     ///< Get the W element of the quaternion
+    S&          x()         { return m_x; }     ///< Get a reference to the X element of the quaternion. E.g. x() = 2;
+    S&          y()         { return m_y; }     ///< Get a reference to the Y element of the quaternion. E.g. y() = 2;
+    S&          z()         { return m_z; }     ///< Get a reference to the Z element of the quaternion. E.g. z() = 2;
+    S&          w()         { return m_w; }     ///< Get a reference to the W element of the quaternion. E.g. w() = 2;
+
+    void        set(S x, S y, S z, S w);
+
+    bool        normalize();
+
+    // The setFromAxisAngle() function is left as a placeholder to illustrate naming of functions
+    void        setFromAxisAngle(Vector3<S> rotationAxis, S angle);
+	void        toAxisAngle(Vector3<S>* rotationAxis, S* angle) const;
+
+    Matrix3<S>  toMatrix3() const;
+    Matrix4<S>  toMatrix4() const;
+
+    static Quat fromAxisAngle(Vector3<S> rotationAxis, S angle);
+    static Quat fromRotationMatrix(const Matrix4<S>& rotMat);
+
+private:
+    S   m_x;
+    S   m_y;
+    S   m_z;
+    S   m_w;
+};
+
+typedef Quat<float>  Quatf;
+typedef Quat<double> Quatd;
+
+}
+} //namespace external
+#include "cvfQuat.inl"

external/resinsight/LibCore/cvfQuat.inl

@@ -0,0 +1,396 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+namespace external {
+namespace cvf {
+
+
+    
+//==================================================================================================
+///
+/// \class cvf::Quat
+/// \ingroup Core
+///
+/// Templated quaternion 
+/// 
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Default constructor, initializes all elements to 0
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Quat<S>::Quat()
+:   m_x(0), 
+    m_y(0), 
+    m_z(0), 
+    m_w(0)
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Constructor with initialization
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Quat<S>::Quat(S x, S y, S z, S w)
+:   m_x(x), 
+    m_y(y), 
+    m_z(z), 
+    m_w(w)
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Copy constructor
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Quat<S>::Quat(const Quat& other)
+:   m_x(other.m_x), 
+    m_y(other.m_y), 
+    m_z(other.m_z), 
+    m_w(other.m_w)
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Conversion constructor for explicit conversion
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+Quat<S>::Quat(const T& other)
+{
+    m_x = static_cast<S>(other.x());
+    m_y = static_cast<S>(other.y());
+    m_z = static_cast<S>(other.z());
+    m_w = static_cast<S>(other.w());
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment operator
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Quat<S>& Quat<S>::operator=(const Quat& rhs)
+{
+    m_x = rhs.m_x;
+    m_y = rhs.m_y;
+    m_z = rhs.m_z;
+    m_w = rhs.m_w;
+
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Quat<S>::operator==(const Quat& rhs) const
+{
+    if (m_x != rhs.m_x) return false;
+    if (m_y != rhs.m_y) return false;
+    if (m_z != rhs.m_z) return false;
+    if (m_w != rhs.m_w) return false;
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Quat<S>::operator!=(const Quat& rhs) const
+{
+    if (m_x != rhs.m_x) return true;
+    if (m_y != rhs.m_y) return true;
+    if (m_z != rhs.m_z) return true;
+    if (m_w != rhs.m_w) return true;
+
+    return false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Quat<S>::set(S x, S y, S z, S w)
+{
+    m_x = x;
+    m_y = y;
+    m_z = z;
+    m_w = w;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Normalize the quaternion
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Quat<S>::normalize()
+{
+    // Quaternions always obey:  a^2 + b^2 + c^2 + d^2 = 1.0. 
+    // If they don't add up to 1.0, dividing by their magnitude will re-normalize them.
+
+    S len = Math::sqrt(m_x*m_x + m_y*m_y + m_z*m_z + m_w*m_w);
+
+    if (len > 0)
+    {
+        // Pre-compute 1/length and do multiplication instead of division
+        S oneOverLen = static_cast<S>(1.0/len);
+        m_x *= oneOverLen;
+        m_y *= oneOverLen;
+        m_z *= oneOverLen;
+        m_w *= oneOverLen;
+
+        return true;
+    }
+    else
+    {
+        // Might be NaN, so set it to zero
+        m_x = 0;
+        m_y = 0;
+        m_z = 0;
+        m_w = 0;
+
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Sets the quaternion from a rotation axis and an angle (in radians)
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Quat<S>::setFromAxisAngle(Vector3<S> rotationAxis, S angle)
+{
+    *this = Quat::fromAxisAngle(rotationAxis, angle);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Extracts the rotation in this quaternion as an axis and an angle (in radians)
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Quat<S>::toAxisAngle(Vector3<S>* rotationAxis, S* angle) const
+{
+    // From matrix an quaternion FAQ
+
+    CVF_ASSERT(rotationAxis);
+    CVF_ASSERT(angle);
+
+    // Need a normalized quaternion
+    Quat nQ(*this);
+    nQ.normalize();
+
+    // Clamp to acos' input domain
+    S cos_a = Math::clamp(nQ.m_w, static_cast<S>(-1), static_cast<S>(1));
+    *angle = 2*Math::acos(cos_a);
+
+    S sin_a = Math::sqrt(1 - cos_a*cos_a);
+    if (Math::abs(sin_a) < 0.0005) sin_a = 1;
+
+    rotationAxis->x() = nQ.m_x/sin_a;
+    rotationAxis->y() = nQ.m_y/sin_a;
+    rotationAxis->z() = nQ.m_z/sin_a;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Constructs a rotation matrix from this quaternion
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Matrix3<S> Quat<S>::toMatrix3() const
+{
+    // Based on Quaternions paper by Ken Shoemake
+    // The current version works even if quaternion isn't normalized
+    // If we assume that the quaternion is normalized, this function can be made simpler/quicker
+
+    S Nq = m_x*m_x + m_y*m_y + m_z*m_z + m_w*m_w;
+    S s = (Nq > 0) ? (2/Nq) : 0;
+
+    S xs = m_x*s;         
+    S ys = m_y*s;
+    S zs = m_z*s;
+
+    S wx = m_w*xs;
+    S wy = m_w*ys;
+    S wz = m_w*zs;
+    S xx = m_x*xs;
+    S xy = m_x*ys;
+    S xz = m_x*zs;
+    S yy = m_y*ys;
+    S yz = m_y*zs;
+    S zz = m_z*zs;
+
+
+    // Default constructor initializes to identity
+    Matrix3<S> m;
+    m.setRowCol( 0, 0,  1 - (yy + zz)); 
+    m.setRowCol( 0, 1,       xy - wz ); 
+    m.setRowCol( 0, 2,       xz + wy ); 
+
+    m.setRowCol( 1, 0,       xy + wz ); 
+    m.setRowCol( 1, 1,  1 - (xx + zz)); 
+    m.setRowCol( 1, 2,       yz - wx ); 
+ 
+    m.setRowCol( 2, 0,       xz - wy );
+    m.setRowCol( 2, 1,       yz + wx );
+    m.setRowCol( 2, 2,  1 - (xx + yy));
+
+    return m;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Constructs a rotation matrix from this quaternion
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Matrix4<S> Quat<S>::toMatrix4() const
+{
+    // Create via the Matrix3 version
+    return Matrix4<S>(toMatrix3());
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Creates a quaternion from specified rotation axis and angle (in radians)
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Quat<S> Quat<S>::fromAxisAngle(Vector3<S> rotationAxis, S angle) 
+{
+    // From matrix an quaternion FAQ
+
+    rotationAxis.normalize();
+
+    S halfAngle = static_cast<S>(angle/2.0);
+    S sinHalfAngle = Math::sin(halfAngle);
+
+    Quat q;
+    q.m_x = rotationAxis.x()*sinHalfAngle;;
+    q.m_y = rotationAxis.y()*sinHalfAngle;
+    q.m_z = rotationAxis.z()*sinHalfAngle;
+    q.m_w = Math::cos(halfAngle);
+
+    return q;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Creates a quaternion from the passed rotation matrix
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Quat<S> Quat<S>::fromRotationMatrix(const Matrix4<S>& rotMat)
+{
+    const S m00 = rotMat.rowCol(0, 0);
+    const S m01 = rotMat.rowCol(0, 1);
+    const S m02 = rotMat.rowCol(0, 2);
+    const S m10 = rotMat.rowCol(1, 0);
+    const S m11 = rotMat.rowCol(1, 1);
+    const S m12 = rotMat.rowCol(1, 2);
+    const S m20 = rotMat.rowCol(2, 0);
+    const S m21 = rotMat.rowCol(2, 1);
+    const S m22 = rotMat.rowCol(2, 2);
+
+
+    // If the trace of the matrix is greater than zero, then perform an "instant" calculation.
+    S trace = m00 + m11 + m22;
+
+    Quat q(0, 0, 0, 1);
+
+    // Try and test against a very small value instead of 0 here
+    // The FAQ suggests testing against ( T > 0.00000001 ) to avoid large distortions
+    if (trace > 0.00000001)
+    {
+        S s = Math::sqrt(trace + 1)*2;
+
+        q.m_x = (m21 - m12)/s;
+        q.m_y = (m02 - m20)/s;
+        q.m_z = (m10 - m01)/s;
+        q.m_w = static_cast<S>(0.25*s);
+    }
+    else
+    {
+        // If the trace of the matrix is equal to zero then identify
+        // which major diagonal element has the greatest value.
+        int iDominantColumn = 0;
+        if (m11 > m00) iDominantColumn = 1;
+        if (m22 > m11) iDominantColumn = 2;
+
+        if (iDominantColumn == 0)
+        {
+            S s = Math::sqrt(1 + m00 - m11 - m22)*2;
+            if (s > 0)
+            {
+                q.m_x = static_cast<S>(0.25*s);
+                q.m_y = (m10 + m01)/s;
+                q.m_z = (m20 + m02)/s;
+                q.m_w = (m21 - m12)/s;
+            }
+        }
+        else if (iDominantColumn == 1)
+        {
+            S s = Math::sqrt(1 + m11 - m00 - m22)*2;
+            if (s > 0)
+            {
+                q.m_x = (m10 + m01)/s;
+                q.m_y = static_cast<S>(0.25*s);
+                q.m_z = (m21 + m12)/s;
+                q.m_w = (m02 - m20)/s;
+            }
+        }
+        else 
+        {
+            S s = Math::sqrt(1 + m22 - m00 - m11)*2;
+            if (s > 0)
+            {
+                q.m_x = (m20 + m02)/s;
+                q.m_y = (m21 + m12)/s;
+                q.m_z = static_cast<S>(0.25*s);
+                q.m_w = (m10 - m01)/s;
+            }
+        }
+    }
+
+    return q;
+}
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfRect.h

@@ -0,0 +1,103 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+#include "cvfVector2.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// 
+//
+//==================================================================================================
+template <typename T>
+class Rect
+{
+public:
+    Rect();
+    Rect(T minX, T minY, T width, T height);
+    Rect(const Vector2<T>& min, T width, T height);
+    Rect(const Rect& rect);
+
+    Rect&   operator=(const Rect& rhs);
+
+    Vector2<T>  min() const;
+    Vector2<T>  max() const;
+    T           width() const;
+    T           height() const;
+    Vector2<T>  center() const;
+
+    void        setMin(const Vector2<T>& min);
+    void        setWidth(T width);
+    void        setHeight(T height);
+
+    bool        isValid() const;
+    void        normalize();
+
+    void        include(const Vector2<T>& coord);
+    void        include(const Rect& rect);
+
+    bool        contains(const Vector2<T>& coord) const;
+    bool        intersects(const Rect& rect) const;
+
+    void        translate(const Vector2<T>& offset);
+
+    bool        segmentIntersect(const Vec2d& p1, const Vec2d& p2, Vec2d* intersect1, Vec2d* intersect2);
+
+    static Rect fromMinMax(const Vector2<T>& min, const Vector2<T>& max);
+
+private:
+    static bool clipTest(double p, double q, double *u1, double *u2);
+
+private:
+    Vector2<T>  m_minPos;               ///< Position of left lower corner
+    T           m_width;                ///< Width
+    T           m_height;               ///< Height
+};
+
+typedef Rect<float>     Rectf;  ///< A rect with float components
+typedef Rect<double>    Rectd;  ///< A rect with double components
+typedef Rect<int>       Recti;  ///< A rect with integer components
+typedef Rect<uint>      Rectui; ///< A rect with unsigned integer components
+
+}
+} //namespace external
+#include "cvfRect.inl"
+

external/resinsight/LibCore/cvfRect.inl

@@ -0,0 +1,605 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+///
+/// \class cvf::Rect
+/// \ingroup Core
+///
+/// 
+//==================================================================================================
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Rect<T>::Rect()
+{
+    m_minPos.setZero();
+    m_width = 0;
+    m_height = 0;
+}
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Rect<T>::Rect(T minX, T minY, T width, T height)
+{
+    m_minPos.set(minX, minY);
+    m_width = width;
+    m_height = height;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Rect<T>::Rect(const Vector2<T>& min, T width, T height)
+{
+    m_minPos = min;
+    m_width = width;
+    m_height = height;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Rect<T>::Rect(const Rect& rect)
+{
+    m_minPos = rect.min();
+    m_width = rect.width();
+    m_height = rect.height();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assignment operator
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+Rect<T>& Rect<T>::operator=(const Rect& rhs)
+{
+    m_minPos = rhs.min();
+    m_width = rhs.max().x() - rhs.min().x();
+    m_height = rhs.max().y() - rhs.min().y();
+
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Vector2<T> Rect<T>::min() const
+{
+    return m_minPos;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Vector2<T> Rect<T>::max() const
+{
+    Vector2<T> max(m_minPos);
+    max.x() += m_width;
+    max.y() += m_height;
+
+    return max;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+T Rect<T>::width() const
+{
+    return m_width;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+T Rect<T>::height() const
+{
+    return m_height;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Vector2<T> Rect<T>::center() const
+{
+    Vector2<T> center(m_minPos);
+    center.x() += m_width / 2.0;
+    center.y() += m_height / 2.0;
+
+    return center;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Rect<T>::setMin(const Vector2<T>& min)
+{
+    m_minPos = min;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Rect<T>::setWidth(T width)
+{
+    m_width = width;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Rect<T>::setHeight(T height)
+{
+    m_height = height;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+bool Rect<T>::isValid() const
+{
+    return (m_width > 0.0) && (m_height > 0.0);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Normalizes the rectangle
+/// 
+/// Ensures that the rectangle has a non-negative width and height. If width or height is negative,
+/// the corresponding min component will be moved.
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Rect<T>::normalize()
+{
+    if (m_width < 0.0)
+    {
+        m_width = -m_width;
+        m_minPos.x() -= m_width;
+    }
+
+    if (m_height < 0.0)
+    {
+        m_height = -m_height;
+        m_minPos.y() -= m_height;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Rect<T>::include(const Vector2<T>& coord)
+{
+    if (!isValid())
+    {
+        Vector2<T> diff = coord - m_minPos;
+        m_width = diff.x();
+        m_height = diff.y();
+        return;
+    }
+
+    if (coord.x() < m_minPos.x())
+    {
+        T deltaX = m_minPos.x() - coord.x();
+        m_minPos.x() -= deltaX;
+        m_width += deltaX;
+    }
+    else if (coord.x() > m_minPos.x() + m_width)
+    {
+        T deltaX = coord.x() - (m_minPos.x() + m_width);
+        m_width += deltaX;
+    }
+
+    if (coord.y() < m_minPos.y())
+    {
+        T deltaY = m_minPos.y() - coord.y();
+        m_minPos.y() -= deltaY;
+        m_height += deltaY;
+    }
+    else if (coord.y() > m_minPos.y() + m_height)
+    {
+        T deltaY = coord.y() - (m_minPos.y() + m_height);
+        m_height += deltaY;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Rect<T>::include(const Rect& rect)
+{
+    if (!rect.isValid()) return;
+
+    T left = m_minPos.x();
+    T right = m_minPos.x();
+    if (m_width < 0.0)
+    {
+        left += m_width;
+    }
+    else
+    {
+        right += m_width;
+    }
+
+    if (rect.width() < 0.0) 
+    {
+        left = CVF_MIN(left, rect.min().x() + rect.width());
+        right = CVF_MAX(right, rect.min().x());
+    } 
+    else 
+    {
+        left = CVF_MIN(left, rect.min().x());
+        right = CVF_MAX(right, rect.min().x() + rect.width());
+    }
+
+    T bottom = m_minPos.y();
+    T top = m_minPos.y();
+    if (m_height < 0.0)
+    {
+        bottom += m_height;
+    }
+    else
+    {
+        top += m_height;
+    }
+
+    if (rect.height() < 0.0) 
+    {
+        bottom = CVF_MIN(bottom, rect.min().y() + rect.height());
+        top = CVF_MAX(top, rect.min().y());
+    } 
+    else 
+    {
+        bottom = CVF_MIN(bottom, rect.min().y());
+        top = CVF_MAX(top, rect.min().y() + rect.height());
+    }
+
+    m_minPos.set(left, bottom);
+    m_width = right - left;
+    m_height = top - bottom;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if the rectangle contains the specified coordinate
+/// 
+/// Returns true if the point is inside or on the edge of the rectangle; otherwise returns false.
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+bool Rect<T>::contains(const Vector2<T>& coord) const
+{
+    T left = m_minPos.x();
+    T right = m_minPos.x();
+    if (m_width < 0.0)
+    {
+        left += m_width;
+    }
+    else
+    {
+        right += m_width;
+    }
+
+    if (left == right) 
+    {
+        // null rect
+        return false;
+    }
+
+    if (coord.x() < left || coord.x() > right)
+    {
+        return false;
+    }
+
+    T bot = m_minPos.y();
+    T top = m_minPos.y();
+    if (m_height < 0.0)
+    {
+        bot += m_height;
+    }
+    else
+    {
+        top += m_height;
+    }
+
+    if (bot == top) 
+    {
+        // null rect
+        return false;
+    }
+
+    if (coord.y() < bot || coord.y() > top)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+bool Rect<T>::intersects(const Rect& rect) const
+{
+    T left1 = m_minPos.x();
+    T right1 = m_minPos.x();
+    if (m_width < 0.0)
+    {
+        left1 += m_width;
+    }
+    else
+    {
+        right1 += m_width;
+    }
+
+    if (left1 == right1) 
+    {
+        // null rect
+        return false;
+    }
+
+    T left2 = rect.min().x();
+    T right2 = rect.min().x();
+    if (rect.width() < 0.0)
+    {
+        left2 += rect.width();
+    }
+    else
+    {
+        right2 += rect.width();
+    }
+
+    if (left2 == right2) 
+    {
+        // null rect
+        return false;
+    }
+
+    if (left1 >= right2 || left2 >= right1)
+    {
+        return false;
+    }
+
+    T bot1 = m_minPos.y();
+    T top1 = m_minPos.y();
+    if (m_height < 0.0)
+    {
+        bot1 += m_height;
+    }
+    else
+    {
+        top1 += m_height;
+    }
+
+    if (bot1 == top1) 
+    {
+        // null rect
+        return false;
+    }
+
+    T bot2 = rect.min().y();
+    T top2 = rect.min().y();
+    if (rect.height() < 0.0)
+    {
+        bot2 += rect.height();
+    }
+    else
+    {
+        top2 += rect.height();
+    }
+
+    if (bot2 == top2) 
+    {
+        // null rect
+        return false;
+    }
+
+    if (bot1 >= top2 || bot2 >= top1)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+void Rect<T>::translate(const Vector2<T>& offset)
+{
+    m_minPos += offset;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+Rect<T> Rect<T>::fromMinMax(const Vector2<T>& min, const Vector2<T>& max)
+{
+    // Enforce min/max - otherwise we'll get bogus results for unsigned types
+    CVF_ASSERT(min.x() <= max.x());
+    CVF_ASSERT(min.y() <= max.y());
+
+    Rect<T> rect(min, max.x() - min.x(), max.y() - min.y());
+    return rect;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+bool Rect<T>::segmentIntersect(const Vec2d& p1, const Vec2d& p2, Vec2d* intersect1, Vec2d* intersect2)
+{
+    // Uses Liang-Barsky line clipping algorithm
+    // See http://stackoverflow.com/questions/99353/how-to-test-if-a-line-segment-intersects-an-axis-aligned-rectange-in-2d
+    CVF_ASSERT(intersect1);
+    CVF_ASSERT(intersect2);
+
+    if (!isValid()) return false;
+
+    double u1 = 0.0;
+    double u2 = 1.0;
+    double dx = p2.x() - p1.x();
+    double dy;
+
+    Vec2d maxPos = max();
+
+    if (clipTest(-dx, p1.x() - m_minPos.x(), &u1, &u2))
+    {
+        if (clipTest(dx, maxPos.x() - p1.x(), &u1, &u2))
+        {
+            dy = p2.y() - p1.y();
+            if (clipTest (-dy, p1.y() - m_minPos.y(), &u1, &u2))
+            {
+                if (clipTest (dy, maxPos.y() - p1.y(), &u1, &u2))
+                {
+                    *intersect1 = p1;
+                    *intersect2 = p2;
+                    if (u2 < 1.0)
+                    {
+                        intersect2->x() = p1.x() + u2 * dx;
+                        intersect2->y() = p1.y() + u2 * dy;
+                    }
+                    if (u1 > 0.0)
+                    {
+                        intersect1->x() += u1 * dx;
+                        intersect1->y() += u1 * dy;
+                    }
+
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template <typename T>
+bool Rect<T>::clipTest(double p, double q, double *u1, double *u2)
+{
+    // Uses Liang-Barsky line clipping algorithm
+    // See also http://stackoverflow.com/questions/99353/how-to-test-if-a-line-segment-intersects-an-axis-aligned-rectange-in-2d
+    CVF_ASSERT(u1);
+    CVF_ASSERT(u2);
+
+    bool retval = true;
+
+    if (p < 0.0)
+    {
+        double r = q / p;
+        if (r > *u2)
+        {
+            retval = false;
+        }
+        else if (r > *u1)
+        {
+            *u1 = r;
+        }
+    }
+    else if (p > 0.0)
+    {
+        double r = q / p;
+        if (r < *u1)
+        {
+            retval = false;
+        }
+        else if (r < *u2)
+        {
+            *u2 = r;
+        }
+    }
+    else
+    {
+        // p = 0, so line is parallel to this clipping edge 
+        if(q < 0.0)
+        {
+            // Line is outside clipping edge
+            retval = false;
+        }
+    }
+
+    return retval;
+}
+
+
+}  // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfString.h

@@ -0,0 +1,142 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfCharArray.h"
+
+#include <string>
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// A general unicode based string class 
+//
+//==================================================================================================
+class String
+{
+public:
+    String();
+    String(const std::string& str);
+    String(const std::wstring& str);
+    String(const String& str);
+    String(const char* str);
+    String(const wchar_t* str);
+
+    explicit String(char c);
+    
+    explicit String(int number);
+    explicit String(int64_t number);
+    explicit String(uint number);
+    explicit String(float number);
+    explicit String(double number);
+
+    String&         operator=(String rhs);
+    bool            operator==(const String& rhs) const;
+    bool            operator==(const wchar_t* rhs) const;
+    bool            operator<(const String& rhs) const;
+    bool            operator!=(const String& rhs) const;
+    const String    operator+(const String& rhs) const;
+    String&         operator+=(const String& rhs);
+
+    const wchar_t&  operator[](size_t pos) const;
+    wchar_t&        operator[](size_t pos);
+
+    String              toLower() const;
+    String              toUpper() const;
+    String              trimmedRight() const;
+    String              trimmedLeft() const;
+    String              trimmed() const;
+    String              simplified() const;
+
+    std::vector<String> split(const String& delimiters = " ") const;
+    size_t              find(const String& str, size_t start = 0) const;
+    bool                startsWith(const String& str) const;
+    String              subString(size_t start, size_t length = npos) const;
+	void                replace(const String& before, const String& after);
+
+    const wchar_t*      c_str() const;
+    CharArray           toAscii() const;                // Useful when you need a const char* pointer.
+    std::string         toStdString() const;
+    std::wstring        toStdWString() const;
+    CharArray           toUtf8() const;
+
+    static String       fromAscii(const char* str, size_t strSize = npos);
+    static String       fromUtf8(const char* str);
+
+    bool                isEmpty() const;
+    size_t              size() const;
+    void                resize(size_t size);
+
+    static String       number(float n, char format = 'g', int precision = -1);
+    static String       number(double n, char format = 'g', int precision = -1);
+
+    double              toDouble(bool* ok = NULL) const;
+    double              toDouble(double defaultValue) const;
+    float               toFloat(bool* ok = NULL) const;
+    float               toFloat(float defaultValue) const;
+    int                 toInt(bool* ok = NULL) const;
+    int                 toInt(int defaultValue) const;
+    uint                toUInt(bool* ok = NULL) const;
+    uint                toUInt(uint defaultValue) const;
+    int64_t             toInt64(bool* ok = NULL) const;
+    int64_t             toInt64(int64_t defaultValue) const;
+
+    String              arg(const String& a, int fieldWidth = 0, const wchar_t& fillChar = ' ') const;
+    String              arg(char a, int fieldWidth = 0, const wchar_t& fillChar = ' ') const;
+
+    String              arg(int a, int fieldWidth = 0, const wchar_t& fillChar = ' ') const;
+    String              arg(int64_t a, int fieldWidth = 0, const wchar_t& fillChar = ' ') const;
+    String              arg(uint a, int fieldWidth = 0, const wchar_t& fillChar = ' ') const;
+    String              arg(float a, int fieldWidth = 0, char format = 'g', int precision = -1, const wchar_t& fillChar = ' ') const;
+    String              arg(double a, int fieldWidth = 0, char format = 'g', int precision = -1, const wchar_t& fillChar = ' ') const;
+
+    void                swap(String& other);
+
+    static const size_t npos;       // Same as std::string::npos. This value, when used as the value for a count parameter n in string's member functions, roughly indicates "as many as possible".
+                                    // As a return value it is usually used to indicate failure.
+private:
+    std::wstring m_string;
+};
+
+String   operator+(const char* str1, const String& str2);
+
+}
+} //namespace external

external/resinsight/LibCore/cvfSystem.cpp

@@ -0,0 +1,320 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfSystem.h"
+#include "cvfString.h"
+
+#include <memory>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::System
+/// \ingroup Core
+///
+/// Static wrapper class for system functions
+/// 
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Check if we're running 64bit 
+//--------------------------------------------------------------------------------------------------
+bool System::is64Bit()
+{
+    return (sizeof(void*) == 8) ? true : false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if we are running on a big endian system.
+/// 
+/// \return  Returns true if we're on big endian, false for little endian.
+//--------------------------------------------------------------------------------------------------
+bool System::isBigEndian()
+{
+    int iInt = 1;
+    char* pcChar = reinterpret_cast<char*>(&iInt);
+
+    return !(*pcChar);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+///  
+//--------------------------------------------------------------------------------------------------
+bool System::memcpy(void* dst, size_t dstSizeInBytes, const void* src, size_t numBytesToCopy)
+{
+#if WIN32
+
+    // Debug version asserts
+    errno_t err = memcpy_s(dst, dstSizeInBytes, src, numBytesToCopy);
+    if (err == 0)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+
+#else
+
+    if (!dst || dstSizeInBytes == 0 || !src)
+    {
+        // Be consistent with the behavior of memcpy_s.
+        return false;
+    }
+
+    if (numBytesToCopy > dstSizeInBytes)
+    {
+        // The source memory is too large to copy to the destination.  
+        // To be consistent with memcpy_s, return false to indicate failure
+        return false;
+    }
+
+    ::memcpy(dst, src, numBytesToCopy);
+
+    return true;
+
+#endif
+}
+
+
+//--------------------------------------------------------------------------------------------------
+///  
+//--------------------------------------------------------------------------------------------------
+bool System::strcpy(char* strDestination, size_t maxNumElementsInDestination, const char* strSource)
+{
+#ifdef WIN32
+
+    // Debug version asserts
+    // Note that on windows the debug versions functions first fills the buffer with 0xFD
+    errno_t err = strcpy_s(strDestination, maxNumElementsInDestination, strSource);
+    if (err == 0)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+
+#else
+
+    CVF_UNUSED(maxNumElementsInDestination);
+    ::strcpy(strDestination, strSource);
+
+    return true;
+
+#endif
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Append a string 
+/// 
+/// \param  strDestination               Null-terminated destination string buffer
+/// \param  maxNumElementsInDestination  Total size of the destination string buffer in characters
+/// \param  strSource                    Null-terminated source string buffer
+//--------------------------------------------------------------------------------------------------
+bool System::strcat(char* strDestination, size_t maxNumElementsInDestination, const char* strSource)
+{
+#ifdef WIN32
+
+    errno_t err = strcat_s(strDestination, maxNumElementsInDestination, strSource);
+    if (err == 0)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+
+#else
+
+    if (!strDestination || maxNumElementsInDestination == 0 || !strSource)
+    {
+        // Be consistent with the behavior of strcat_s.
+        return false;
+    }
+
+    size_t dstLen = strlen(strDestination);
+    size_t srcLen = strlen(strSource);
+    size_t sumLen = srcLen + dstLen;
+    if (sumLen + 1 > maxNumElementsInDestination)
+    {
+        return false;
+    }
+
+    strncat(strDestination, strSource, srcLen);
+    strDestination[sumLen] = 0;
+
+    return true;
+
+#endif
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Wrapper for sprintf
+/// 
+/// \param buffer                  The buffer to write into
+/// \param maxNumElementsInBuffer  Size of the buffer in number of characters
+/// \param format                  Format string
+/// 
+/// \return Number of character written into buffer, excluding the terminating NULL character.
+///         If the function fails the return is -1
+/// 
+/// Not that at most maxNumElementsInBuffer - 1 characters are ever written into the buffer since
+/// a termination character is always written to the last position in the buffer.
+//--------------------------------------------------------------------------------------------------
+int System::sprintf(char* buffer, size_t maxNumElementsInBuffer, const char* format, ...)
+{
+    if (!buffer || maxNumElementsInBuffer == 0 || !format)
+    {
+        return -1;
+    }
+
+    va_list argList;
+    va_start(argList, format);
+
+#ifdef WIN32
+
+    int numWritten = vsnprintf_s(buffer, maxNumElementsInBuffer*sizeof(char), maxNumElementsInBuffer - 1, format, argList);
+
+#else
+
+    int numWritten = vsnprintf(buffer, maxNumElementsInBuffer, format, argList);
+    
+    // Linux will fill the buffer without adding a NULL
+    // Catch this and report as error
+    if (numWritten == static_cast<int>(maxNumElementsInBuffer))
+    {
+        numWritten = -1;
+    }
+
+#endif
+
+    va_end(argList);
+
+    // Ensure buffer is NULL terminated
+    buffer[maxNumElementsInBuffer - 1] = '\0';
+
+    return numWritten;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Wrapper for sprintf
+/// 
+/// \param buffer                  The buffer to write into
+/// \param maxNumElementsInBuffer  Size of the buffer in number of wide characters (not bytes)
+/// \param format                  Format string
+/// 
+/// \return Number of wide character written into buffer, excluding the terminating NULL character.
+///         If the function fails the return is -1
+/// 
+/// Not that at most maxNumElementsInBuffer - 1 characters are ever written into the buffer since
+/// a termination character is always written to the last position in the buffer.
+//--------------------------------------------------------------------------------------------------
+int System::swprintf(wchar_t* buffer, size_t maxNumElementsInBuffer, const wchar_t* format, ...)
+{
+    if (!buffer || maxNumElementsInBuffer == 0 || !format)
+    {
+        return -1;
+    }
+
+    va_list argList;
+    va_start(argList, format);
+
+#ifdef WIN32
+    int numWritten = _vsnwprintf_s(buffer, maxNumElementsInBuffer, maxNumElementsInBuffer - 1, format, argList);
+#else
+    int numWritten = vswprintf(buffer, maxNumElementsInBuffer, format, argList);
+#endif
+
+    va_end(argList);
+
+    buffer[maxNumElementsInBuffer - 1] = L'\0';
+
+    return numWritten;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+size_t System::strlen(const char* str)
+{
+    if (str)
+    {
+        return ::strlen(str);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+int System::strcmp(const char* str1, const char* str2)
+{
+    if (str1 == NULL || str2 == NULL)
+    {
+        if (str1 == NULL && str2 == NULL)
+        {
+            return 0;
+        }
+
+        if (str1 == NULL)
+        {
+            return -1;
+        }
+        else
+        {
+            return 1;
+        }
+    }
+    else
+    {
+        return ::strcmp(str1, str2);
+    }
+}
+
+
+} // namespace cvf
+
+} //namespace external

external/resinsight/LibCore/cvfSystem.h

@@ -0,0 +1,65 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Static wrapper class for system functions
+//
+//==================================================================================================
+class System
+{
+public:
+    static bool     is64Bit();
+    static bool     isBigEndian();
+
+    static bool     memcpy(void* dst, size_t dstSizeInBytes, const void* src, size_t numBytesToCopy);
+    static bool     strcpy(char* strDestination, size_t maxNumElementsInDestination, const char* strSource);
+    static bool     strcat(char* strDestination, size_t maxNumElementsInDestination, const char* strSource);
+    static int      sprintf(char* buffer, size_t maxNumElementsInBuffer, const char* format, ...);
+    static int      swprintf(wchar_t* buffer, size_t maxNumElementsInBuffer, const wchar_t* format, ...);
+    static size_t   strlen(const char* str);
+    static int      strcmp(const char* str1, const char* str2);
+};
+
+}
+} //namespace external

external/resinsight/LibCore/cvfTBBControl.h

@@ -0,0 +1,63 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Static wrapper class to control usage of TBB
+//
+//==================================================================================================
+class TBBControl
+{
+public:
+    static void     enable(bool enableTBB);
+    static bool     isEnabled();
+
+private:
+    static bool     sm_useTBB;
+};
+
+
+} // cvf
+
+
+} //namespace external

external/resinsight/LibCore/cvfTimer.h

@@ -0,0 +1,69 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfObject.h"
+
+namespace external {
+namespace cvf {
+
+class PrivateTimerState;
+
+
+//=================================================================================================
+// 
+// Timer class
+// 
+//=================================================================================================
+class Timer : public Object
+{
+public:
+    Timer();
+    ~Timer();
+
+    void	restart();
+
+    double	time() const;
+    double  lapTime();
+
+private:
+	PrivateTimerState* m_timerState;
+};
+
+}
+} //namespace external

external/resinsight/LibCore/cvfTrace.cpp

@@ -0,0 +1,166 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#include "cvfBase.h"
+#include "cvfTrace.h"
+#include "cvfSystem.h"
+
+#ifdef WIN32
+#pragma warning (push)
+#pragma warning (disable: 4668)
+#include <windows.h>
+#pragma warning (pop)
+#else
+#include <cstdio>
+#include <cstdarg>
+#endif
+
+#ifdef CVF_ANDROID
+#include <android/log.h>
+#endif
+
+namespace external 
+{
+
+namespace cvf {
+
+//==================================================================================================
+///
+/// \class cvf::Trace
+/// \ingroup Core
+///
+/// Class for writing debug text to console, DevStudio output window and file (future)
+///
+/// TODO: Create file output.
+///
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// Write debug text to console, DevStudio output window and file (future)
+//--------------------------------------------------------------------------------------------------
+void Trace::show(String message)
+{
+    showTraceOutput(message, true);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Write printf formatted debug text to console, DevStudio output window and file (future)
+//--------------------------------------------------------------------------------------------------
+void Trace::show(const char* format, ...)
+{
+    // Create the printf-style string and send it to the console and trace file
+    // TODO! Note: var-arg is solved locally here, but needs to be revisited e.g. in String class
+    va_list argList;
+    va_start(argList, format);
+
+    const int maxFormatLength = 4000;
+    char temp[maxFormatLength + 1];
+
+#ifdef WIN32
+    _vsnprintf_s(temp, maxFormatLength, format, argList);
+#elif defined(CVF_ANDROID)
+    __android_log_print(ANDROID_LOG_DEBUG, "CVF_TAG", format, argList);
+#else
+    vsprintf(temp, format, argList);
+#endif
+
+    va_end(argList);    
+
+    showTraceOutput(temp, true);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void Trace::showFileLineNumber(const String& file, int line, const String& message)
+{
+    String tmp = file + "(" + String(line) + ")";
+
+    if (!message.isEmpty())
+    {
+        tmp += ": msg: " + message;
+    }
+
+    Trace::show(tmp);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Show the trace output in console and DevStudio output window
+//--------------------------------------------------------------------------------------------------
+void Trace::showTraceOutput(String text, bool addNewLine)
+{
+#ifdef WIN32
+    AllocConsole();
+
+    HANDLE hStdOutputHandle = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    if (hStdOutputHandle)
+    {
+        unsigned long iDum = 0;
+        CharArray ascii = text.toAscii();
+        DWORD stringLength = static_cast<DWORD>(System::strlen(ascii.ptr()));
+
+        WriteConsoleA(hStdOutputHandle, ascii.ptr(), stringLength, &iDum, NULL);
+        if (addNewLine) WriteConsole(hStdOutputHandle, "\n", 1, &iDum, NULL);
+    }
+#elif defined(CVF_ANDROID)
+    __android_log_print(ANDROID_LOG_DEBUG, "CVF_TAG", "%s", text.toAscii().ptr());
+#else
+    fprintf(stderr, "%s", text.toAscii().ptr());
+    if (addNewLine) 
+    {
+        fprintf(stderr, "\n");
+    }
+#endif
+
+    // Show output in "Output window" in Visual Studio
+#if defined(WIN32) && defined(_DEBUG)
+    // Alternativly use OutputDebugStringA(text.toAscii().ptr()); if this does not work on some platforms
+    _RPT0(_CRT_WARN, text.toAscii().ptr());
+    if (addNewLine)
+    {
+        _RPT0(_CRT_WARN, "\n");
+    }
+#endif
+}
+
+
+} // namespace cvf
+} // namespace external

external/resinsight/LibCore/cvfTrace.h

@@ -0,0 +1,69 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfString.h"
+
+namespace external {
+namespace cvf {
+
+
+//=================================================================================================
+// 
+// Trace class
+// 
+//=================================================================================================
+class Trace
+{
+public:
+    static void show(String message);
+    static void show(const char* format, ...);
+    static void showFileLineNumber(const String& file, int line, const String& message);
+
+private:
+    static void showTraceOutput(String text, bool addNewLine);
+};
+
+
+}// namespace cvf
+
+
+#define CVF_TRACE_FILELINE               cvf::Trace::showFileLineNumber(__FILE__, __LINE__, "");
+#define CVF_TRACE_FILELINE_MSG(message)  cvf::Trace::showFileLineNumber(__FILE__, __LINE__, message);
+
+} //namespace external

external/resinsight/LibCore/cvfValueArray.h

@@ -0,0 +1,78 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfVector4.h"
+#include "cvfColor4.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Abstract base class for templated read-only array that returns elements by value
+//
+//==================================================================================================
+template <typename T>
+class ValueArray
+{
+public:
+    virtual         ~ValueArray() {}
+    virtual T       val(size_t index) const = 0;
+    virtual size_t  size() const = 0;
+};
+
+
+typedef ValueArray<int>         IntValueArray;
+typedef ValueArray<uint>	    UIntValueArray;
+typedef ValueArray<ushort>	    UShortValueArray;
+typedef ValueArray<ubyte>	    UByteValueArray;
+typedef ValueArray<float>       FloatValueArray;
+typedef ValueArray<double>      DoubleValueArray;
+typedef ValueArray<Vec2f>       Vec2fValueArray;
+typedef ValueArray<Vec3f>       Vec3fValueArray;
+typedef ValueArray<Vec3d>       Vec3dValueArray;
+typedef ValueArray<Color3ub>    Color3ubValueArray;
+typedef ValueArray<Color3f>     Color3fValueArray;
+typedef ValueArray<Color4ub>    Color4ubValueArray;
+
+}
+
+
+} //namespace external

external/resinsight/LibCore/cvfVector2.h

@@ -0,0 +1,137 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfMath.h"
+
+#include <limits>
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Vector class for 2D vectors
+//
+//==================================================================================================
+template<typename S>
+class Vector2
+{
+public:
+    Vector2();
+    Vector2(S x, S y);
+    Vector2(const Vector2& other);
+
+    template<typename T>
+    explicit Vector2(const T& other);
+
+    inline Vector2&         operator=(const Vector2& rhs);
+
+    inline bool             equals(const Vector2& other) const;
+    inline bool             operator==(const Vector2& rhs) const;
+    inline bool             operator!=(const Vector2& rhs) const;
+    
+    inline void             add(const Vector2& other);
+    inline void             subtract(const Vector2& other);
+    inline const Vector2    operator+(const Vector2& rhs) const;
+    inline const Vector2    operator-(const Vector2& rhs) const;
+    inline Vector2&         operator+=(const Vector2& rhs);
+    inline Vector2&         operator-=(const Vector2& rhs);
+    inline const Vector2    operator-() const;
+
+    inline void             scale(S scalar);
+    inline const Vector2    operator*(S scalar) const;
+    inline const Vector2    operator/(S scalar) const;
+    inline Vector2&         operator*=(S scalar);
+    inline Vector2&         operator/=(S scalar);
+
+    inline S                dot(const Vector2& other) const;
+    inline S                operator*(const Vector2& rhs) const;    // Dot product
+
+    template<typename T> 
+    void                    set(const T& other);
+    inline void             set(S x, S y);
+    inline void             setZero();
+    inline const S&         x() const   { return m_v[0]; }          ///< Get the X element of the vector
+    inline const S&         y() const   { return m_v[1]; }          ///< Get the Y element of the vector
+    inline S&               x()         { return m_v[0]; }          ///< Get a reference to the X element of the vector. E.g. x() = 1;
+    inline S&               y()         { return m_v[1]; }          ///< Get a reference to the Y element of the vector. E.g. y() = 2;
+
+    inline const S&         operator[](int index) const;            // Get component 0 or 1. E.g. x = v[0];
+    inline S&               operator[](int index);                  // Set component 0 or 1. E.g. v[0] = x;
+
+    inline S*               ptr()       { return m_v; }             ///< Get a raw pointer to the internal c array of type S.
+    inline const S*         ptr() const { return m_v; }             ///< Get a const raw pointer to the internal c array of type S.
+
+    inline bool     isZero() const;
+    inline bool     isUndefined() const;
+
+    bool            normalize();
+    const Vector2   getNormalized(bool* normalizationOK = NULL) const;
+
+    inline S        length() const;
+    inline S        lengthSquared() const;
+    bool            setLength(S newLength);
+
+    const Vector2   perpendicularVector() const;
+
+public:
+    static const Vector2 X_AXIS;    ///< X axis vector <1, 0>
+    static const Vector2 Y_AXIS;    ///< Y axis vector <0, 1>
+    static const Vector2 ZERO;      ///< Null vector <0, 0>
+    static const Vector2 UNDEFINED; ///< Undefined vector
+
+private:
+    template<typename T> 
+    friend const Vector2<T> operator*(T scalar, const Vector2<T>& rhs);
+
+private:
+    S m_v[2];
+};
+
+
+typedef Vector2<float>  Vec2f;  ///< A vector with float components
+typedef Vector2<double> Vec2d;  ///< A vector with double components
+typedef Vector2<int>    Vec2i;  ///< A vector with int components
+typedef Vector2<uint>   Vec2ui;  ///< A vector with uint components
+typedef Vector2<ushort> Vec2us;  ///< A vector with ushort components
+
+}
+} //namespace external
+#include "cvfVector2.inl"

external/resinsight/LibCore/cvfVector2.inl

@@ -0,0 +1,534 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Vector2
+/// \ingroup Core
+///
+/// Templated vector class for a 2 component vector.
+///
+/// Three ready-to-use typedefs are defined:\n
+///  - cvf::Vec2f (Vector2<float>)
+///  - cvf::Vec2d (Vector2<double>)
+///  - cvf::Vec2i (Vector2<int>)
+/// 
+//==================================================================================================
+
+template<typename S> Vector2<S> const Vector2<S>::X_AXIS(1, 0);    
+template<typename S> Vector2<S> const Vector2<S>::Y_AXIS(0, 1);
+template<typename S> Vector2<S> const Vector2<S>::ZERO(0, 0);
+
+//--------------------------------------------------------------------------------------------------
+/// Default constructor.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector2<S>::Vector2()
+{
+    m_v[0] = 0;
+    m_v[1] = 0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the vector to <x,y>
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector2<S>::Vector2(S x, S y) 
+{
+    m_v[0] = x;
+    m_v[1] = y;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the vector to the same as other
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector2<S>::Vector2(const Vector2& other) 
+{ 
+    *this = other; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// An explicit cast constructor to convert from one vector type to another.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+Vector2<S>::Vector2(const T& other)
+{
+    m_v[0] = static_cast<S>(other.x());
+    m_v[1] = static_cast<S>(other.y());
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assign the vector to the contents of other
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector2<S>& Vector2<S>::operator=(const Vector2& other)
+{
+    m_v[0] = other.m_v[0];
+    m_v[1] = other.m_v[1];
+
+    return *this;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if two vectors are equal. An exact match is required.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Vector2<S>::equals(const Vector2& other) const
+{
+    return (*this == other);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if two vectors are equal. An exact match is required.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector2<S>::operator==(const Vector2& rhs) const
+{
+    return (m_v[0] == rhs.m_v[0]) && (m_v[1] == rhs.m_v[1]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if two vectors are different. Returns true if not an exact match
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector2<S>::operator!=(const Vector2& rhs) const
+{
+     return !operator==(rhs);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the sum of this vector and the rhs vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline const Vector2<S> Vector2<S>::operator+(const Vector2& rhs) const
+{
+    return Vector2(m_v[0]+rhs.m_v[0], m_v[1]+rhs.m_v[1]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Adds the vector \a other to this vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Vector2<S>::add(const Vector2& other)
+{
+    (*this) += other;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Subtracts the vector \a other from this vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void cvf::Vector2<S>::subtract(const Vector2& other)
+{
+    (*this) -= other;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute this-rhs and return the result.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline const Vector2<S> Vector2<S>::operator-(const Vector2& rhs) const
+{
+    return Vector2(m_v[0] - rhs.m_v[0], m_v[1] - rhs.m_v[1]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Scale this vector by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Vector2<S>::scale(S scalar)
+{
+    (*this) *= scalar;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return this vector scaled by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector2<S> Vector2<S>::operator*(S scalar) const
+{
+    return Vector2(m_v[0]*scalar, m_v[1]*scalar);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return vector scaled by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+const Vector2<T> operator*(T scalar, const Vector2<T>& rhs)
+{
+    // Note that this is a friend function
+    return Vector2<T>(rhs.m_v[0]*scalar, rhs.m_v[1]*scalar);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return a vector where each component is the corresponding component in this divided by scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector2<S> Vector2<S>::operator/(S scalar) const
+{
+    return Vector2(m_v[0]/scalar, m_v[1]/scalar);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return a vector which is the negation of this
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector2<S> Vector2<S>::operator-() const
+{
+    return Vector2(-m_v[0], -m_v[1]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Add the given vector to this
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector2<S>& Vector2<S>::operator+=(const Vector2& v)
+{ 
+    m_v[0] += v.x(); 
+    m_v[1] += v.y(); 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Subtract the given vector from this
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector2<S>& Vector2<S>::operator-=(const Vector2& v)
+{ 
+    m_v[0] -= v.x(); 
+    m_v[1] -= v.y(); 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Scale this with the given scalar. Each component is multiplied with the given value
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector2<S>& Vector2<S>::operator*=(S scalar)
+{ 
+    m_v[0] *= scalar; 
+    m_v[1] *= scalar; 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Divide this with the given scalar. Each component is divided by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector2<S>& Vector2<S>::operator/=(S scalar)
+{ 
+    m_v[0] /= scalar; 
+    m_v[1] /= scalar; 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get component 0 or 1. E.g. x = v[0];
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline const S& Vector2<S>::operator[](int index) const
+{
+    CVF_TIGHT_ASSERT(index >= 0);
+    CVF_TIGHT_ASSERT(index < 2);
+
+    return m_v[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set component 0 or 1. E.g. v[0] = x;
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S& Vector2<S>::operator[](int index)
+{
+    CVF_TIGHT_ASSERT(index >= 0);
+    CVF_TIGHT_ASSERT(index < 2);
+
+    return m_v[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute the dot product of this and \a other
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+S Vector2<S>::dot(const Vector2& other) const
+{
+    return (*this)*other;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute the dot product of this and rhs and return the result (scalar)
+/// 
+/// Formula:
+/// \code
+/// S = tx*rx + ty*ry
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector2<S>::operator*(const Vector2& rhs) const
+{
+    return m_v[0]*rhs.m_v[0] + m_v[1]*rhs.m_v[1];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the vector from the other vector (of different type). Cast each component to convert it.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+void Vector2<S>::set(const T& other)
+{
+    m_v[0] = static_cast<S>(other.x());
+    m_v[1] = static_cast<S>(other.y());
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the length of the vector
+/// 
+/// Formula:
+/// \code
+/// len = sqrt(x*x + y*y)
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector2<S>::length() const
+{
+    return Math::sqrt(m_v[0]*m_v[0] + m_v[1]*m_v[1]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the squared length (L2) of the vector
+/// 
+/// Formula:
+/// \code
+/// len = x*x + y*y
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector2<S>::lengthSquared() const
+{
+    return m_v[0]*m_v[0] + m_v[1]*m_v[1];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the length of the vector to \a newLength. 
+/// 
+/// \sa Vector3::setLength() 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Vector2<S>::setLength(S newLength)
+{
+    CVF_ASSERT(newLength >= 0);
+
+    S currLen = length();
+
+    if (currLen > std::numeric_limits<S>::epsilon() && newLength > 0)
+    {
+        S scale = newLength/currLen;
+        m_v[0] *= scale;
+        m_v[1] *= scale;
+
+        return true;
+    }
+    else
+    {
+        setZero();
+
+        return (newLength == 0) ? true : false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return a unit length perpendicular vector
+/// 
+/// Returns the vector (y,-x), normalized. This can be thought of as the 'right' vector.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector2<S> Vector2<S>::perpendicularVector() const
+{
+    S len = length();
+    if (len > 0.0)
+    {
+        S oneOverLen = (static_cast<S>(1.0)/len);
+        return Vector2<S>(m_v[1]*oneOverLen, -m_v[0]*oneOverLen);
+    }
+    else
+    {
+        return Vector2<S>::ZERO;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Normalize the vector (make sure the length is 1.0).
+/// 
+/// \return  Returns true if normalization was possible. Returns false if length is zero or a NaN vector.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Vector2<S>::normalize()
+{
+    S len = length();
+    if (len > 0.0)
+    {
+        // Precompute 1/length and do multiplication instead of division
+        S oneOverLen = (static_cast<S>(1.0)/len);
+        m_v[0] *= oneOverLen;
+        m_v[1] *= oneOverLen;
+
+        return true;
+    }
+    else
+    {
+        // Might be NaN, so set it to zero
+        m_v[0] = 0;
+        m_v[1] = 0;
+        
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns a normalized version of the current vector. The vector is unchanged.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector2<S> Vector2<S>::getNormalized(bool* normalizationOK) const
+{
+    S len = length();
+    if (len > 0.0)
+    {
+        if (normalizationOK) *normalizationOK = true;
+
+        S oneOverLen = (static_cast<S>(1.0)/len);
+        return Vector2<S>(m_v[0]*oneOverLen, m_v[1]*oneOverLen);
+    }
+    else
+    {
+        if (normalizationOK) *normalizationOK = false;
+        return Vector2<S>::ZERO;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set all components to 0
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline void Vector2<S>::setZero()
+{
+    m_v[0] = 0;
+    m_v[1] = 0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if all components are zero (exact match)
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector2<S>::isZero() const
+{
+    return (m_v[0] == 0) && (m_v[1] == 0);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if vector is undefined
+/// 
+/// \return Returns true if any one of the components is undefined
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector2<S>::isUndefined() const
+{
+    if (Math::isUndefined(m_v[0]) ||
+        Math::isUndefined(m_v[1]))
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the components of the vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline void Vector2<S>::set(S x, S y)
+{
+    m_v[0] = x;
+    m_v[1] = y;
+}
+
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfVector3.cpp

@@ -0,0 +1,39 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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 "cvfBase.h"
+#include "cvfVector3.h"
+
+namespace external {
+namespace cvf {
+
+
+template<> Vector3<double> const Vector3<double>::UNDEFINED(UNDEFINED_DOUBLE, UNDEFINED_DOUBLE, UNDEFINED_DOUBLE);
+template<> Vector3<float>  const Vector3<float>::UNDEFINED(UNDEFINED_FLOAT, UNDEFINED_FLOAT, UNDEFINED_FLOAT);
+template<> Vector3<int>    const Vector3<int>::UNDEFINED(UNDEFINED_INT, UNDEFINED_INT, UNDEFINED_INT);
+template<> Vector3<size_t> const Vector3<size_t>::UNDEFINED(UNDEFINED_SIZE_T, UNDEFINED_SIZE_T, UNDEFINED_SIZE_T);
+
+
+} // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfVector3.h

@@ -0,0 +1,164 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfVector2.h"
+
+namespace external {
+namespace cvf {
+
+
+// Forward declaration of templated matrix class
+template<typename S>
+class Matrix4;
+
+template<typename S>
+class Matrix3;
+
+
+//==================================================================================================
+//
+// Vector class for 3D vectors
+//
+//==================================================================================================
+template<typename S>
+class Vector3
+{
+public:
+    Vector3();
+    Vector3(S x, S y, S z);
+    Vector3(const Vector3& other);
+
+    explicit Vector3(const Vector2<S>& other);
+    Vector3(const Vector2<S>& other, S z);
+
+    template<typename T>
+    explicit Vector3(const T& other);
+
+    inline Vector3&         operator=(const Vector3& rhs);
+
+    inline bool             equals(const Vector3& other) const;
+    inline bool             operator==(const Vector3& rhs) const;
+    inline bool             operator!=(const Vector3& rhs) const;
+    
+    inline void             add(const Vector3& other);
+    inline void             subtract(const Vector3& other);
+    inline const Vector3    operator+(const Vector3& rhs) const;
+    inline const Vector3    operator-(const Vector3& rhs) const;
+    inline Vector3&         operator+=(const Vector3& rhs);
+    inline Vector3&         operator-=(const Vector3& rhs);
+    inline const Vector3    operator-() const;
+
+    inline void             scale(S scalar);
+    inline const Vector3    operator*(S scalar) const;
+    inline const Vector3    operator/(S scalar) const;
+    inline Vector3&         operator*=(S scalar);
+    inline Vector3&         operator/=(S scalar);
+
+    inline S                dot(const Vector3& other) const;
+    inline S                operator*(const Vector3& rhs) const;    // Dot product
+
+    inline void             cross(const Vector3& v1, const Vector3& v2);
+    inline const Vector3    operator^(const Vector3& rhs) const;    // Cross product
+
+    template<typename T> 
+    void                    set(const T& other);
+    inline void             set(S x, S y, S z);
+    inline void             setZero();
+    inline const S&         x() const       { return m_v[0]; }      ///< Get the X element of the vector
+    inline const S&         y() const       { return m_v[1]; }      ///< Get the Y element of the vector
+    inline const S&         z() const       { return m_v[2]; }      ///< Get the Z element of the vector
+    inline S&               x()             { return m_v[0]; }      ///< Get a reference to the X element of the vector. E.g. x() = 1;
+    inline S&               y()             { return m_v[1]; }      ///< Get a reference to the Y element of the vector. E.g. y() = 2;
+    inline S&               z()             { return m_v[2]; }      ///< Get a reference to the Z element of the vector. E.g. z() = 3;
+    inline const S&         operator[](int index) const;            // Get component 0,1,2. E.g. x = v[0];
+    inline S&               operator[](int index);                  // Set component 0,1,2. E.g. v[0] = x;
+
+    inline S*               ptr()           { return m_v; }         ///< Get a raw pointer to the internal c array of type S.
+    inline const S*         ptr() const     { return m_v; }         ///< Get a const raw pointer to the internal c array of type S.
+
+    inline bool     isZero() const;
+    inline bool     isUndefined() const;
+
+    bool            normalize();
+    const Vector3   getNormalized(bool* normalizationOK = NULL) const;
+
+    inline S        length() const;
+    inline S        lengthSquared() const;
+    bool            setLength(S newLength);
+
+    inline S        pointDistance(const Vector3& otherPoint) const;
+    inline S        pointDistanceSquared(const Vector3& otherPoint) const;
+
+    void            transformPoint(const Matrix4<S>& m);    
+    const Vector3   getTransformedPoint(const Matrix4<S>& m) const;
+
+    void            transformVector(const Matrix4<S>& m);
+    const Vector3   getTransformedVector(const Matrix4<S>& m) const;
+    void            transformVector(const Matrix3<S>& m);
+    const Vector3   getTransformedVector(const Matrix3<S>& m) const;
+
+    bool            createOrthonormalBasis(int mapToAxis, Vector3<S>* uAxis, Vector3<S>* vAxis, Vector3<S>* wAxis) const;
+    const Vector3   perpendicularVector(bool* perpendicularOK = NULL) const;
+
+public:
+    static const Vector3 X_AXIS;    ///< X axis vector <1, 0, 0>
+    static const Vector3 Y_AXIS;    ///< Y axis vector <0, 1, 0>
+    static const Vector3 Z_AXIS;    ///< Z axis vector <0, 0, 1>
+    static const Vector3 ZERO;      ///< Null vector <0, 0, 0>
+    static const Vector3 UNDEFINED; ///< Undefined vector
+
+private:
+    template<typename T> 
+    friend const Vector3<T> operator*(T scalar, const Vector3<T>& rhs);
+
+private:
+    S m_v[3];
+};
+
+
+typedef Vector3<float>  Vec3f;  ///< A vector with float components
+typedef Vector3<double> Vec3d;  ///< A vector with double components
+typedef Vector3<int>    Vec3i;  ///< A vector with int components
+typedef Vector3<uint>   Vec3ui;  ///< A vector with uint components
+typedef Vector3<size_t> Vec3st;  ///< A vector with size_t components
+
+}
+} //namespace external
+#include "cvfVector3.inl"
+

external/resinsight/LibCore/cvfVector3.inl

@@ -0,0 +1,800 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace external {
+namespace cvf {
+
+
+
+//==================================================================================================
+///
+/// \class cvf::Vector3
+/// \ingroup Core
+///
+/// Templated vector class for a 3 component vector.
+///
+/// Three ready-to-use typedefs are defined:\n
+///  - cvf::Vec3f (Vector3<float>)
+///  - cvf::Vec3d (Vector3<double>)
+///  - cvf::Vec3i (Vector3<int>)
+/// 
+//==================================================================================================
+
+template<typename S> Vector3<S> const Vector3<S>::X_AXIS(1,0,0);    
+template<typename S> Vector3<S> const Vector3<S>::Y_AXIS(0,1,0);
+template<typename S> Vector3<S> const Vector3<S>::Z_AXIS(0,0,1);
+template<typename S> Vector3<S> const Vector3<S>::ZERO(0,0,0);
+
+//--------------------------------------------------------------------------------------------------
+/// Default constructor.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector3<S>::Vector3()
+{
+    m_v[0] = 0;
+    m_v[1] = 0;
+    m_v[2] = 0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the vector to <x,y,z>
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector3<S>::Vector3(S x, S y, S z) 
+{
+    m_v[0] = x;
+    m_v[1] = y;
+    m_v[2] = z;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the vector to the same as other
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector3<S>::Vector3(const Vector3& other) 
+{ 
+    *this = other; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// An explicit cast constructor to convert from one vector type to another.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+Vector3<S>::Vector3(const T& other)
+{
+    m_v[0] = static_cast<S>(other.x());
+    m_v[1] = static_cast<S>(other.y());
+    m_v[2] = static_cast<S>(other.z());
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Explicit constructor from 2D vector.
+/// 
+/// Will initialize x and y components from the 2D vector, z will be set to 0.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector3<S>::Vector3(const Vector2<S>& other)
+{
+    m_v[0] = other.x();
+    m_v[1] = other.y();
+    m_v[2] = 0.0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Constructor 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector3<S>::Vector3(const Vector2<S>& other, S z)
+{
+    m_v[0] = other.x();
+    m_v[1] = other.y();
+    m_v[2] = z;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Assign the vector to the contents of other
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+Vector3<S>& Vector3<S>::operator=(const Vector3& other)
+{
+    m_v[0] = other.m_v[0];
+    m_v[1] = other.m_v[1];
+    m_v[2] = other.m_v[2];
+
+    return *this;
+}
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if two vectors are equal. An exact match is required.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Vector3<S>::equals(const Vector3& other) const
+{
+    return (*this == other);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if two vectors are equal. An exact match is required.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector3<S>::operator==(const Vector3& rhs) const
+{
+    return (m_v[0] == rhs.m_v[0]) && (m_v[1] == rhs.m_v[1]) && (m_v[2] == rhs.m_v[2]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if two vectors are different. Returns true if not an exact match
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector3<S>::operator!=(const Vector3& rhs) const
+{
+     return !operator==(rhs);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Adds the vector \a other to this vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void cvf::Vector3<S>::add(const Vector3& other)
+{
+    (*this) += other;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Subtracts the vector \a other from this vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void cvf::Vector3<S>::subtract(const Vector3& other)
+{
+    (*this) -= other;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns the sum of this vector and the rhs vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline const Vector3<S> Vector3<S>::operator+(const Vector3& rhs) const
+{
+    return Vector3(m_v[0]+rhs.m_v[0], m_v[1]+rhs.m_v[1], m_v[2]+rhs.m_v[2]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute this-rhs and return the result.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline const Vector3<S> Vector3<S>::operator-(const Vector3& rhs) const
+{
+    return Vector3(m_v[0] - rhs.m_v[0], m_v[1] - rhs.m_v[1], m_v[2] - rhs.m_v[2]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Scale this vector by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Vector3<S>::scale(S scalar)
+{
+    (*this) *= scalar;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return this vector scaled by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::operator*(S scalar) const
+{
+    return Vector3(m_v[0]*scalar, m_v[1]*scalar, m_v[2]*scalar);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return vector scaled by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename T>
+const Vector3<T> operator*(T scalar, const Vector3<T>& rhs)
+{
+    // Note that this is a friend function
+    return Vector3<T>(rhs.m_v[0]*scalar, rhs.m_v[1]*scalar, rhs.m_v[2]*scalar);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return a vector where each component is the corresponding component in this divided by scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::operator/(S scalar) const
+{
+    return Vector3(m_v[0]/scalar, m_v[1]/scalar, m_v[2]/scalar);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return a vector which is the negation of this
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::operator-() const
+{
+    return Vector3(-m_v[0], -m_v[1], -m_v[2]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Add the given vector to this
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector3<S>& Vector3<S>::operator+=(const Vector3& v)
+{ 
+    m_v[0] += v.x(); 
+    m_v[1] += v.y(); 
+    m_v[2] += v.z(); 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Subtract the given vector from this
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector3<S>& Vector3<S>::operator-=(const Vector3& v)
+{ 
+    m_v[0] -= v.x(); 
+    m_v[1] -= v.y(); 
+    m_v[2] -= v.z(); 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Scale this with the given scalar. Each component is multiplied with the given value
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector3<S>& Vector3<S>::operator*=(S scalar)
+{ 
+    m_v[0] *= scalar; 
+    m_v[1] *= scalar; 
+    m_v[2] *= scalar; 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Divide this with the given scalar. Each component is divided by the given scalar
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline Vector3<S>& Vector3<S>::operator/=(S scalar)
+{ 
+    m_v[0] /= scalar; 
+    m_v[1] /= scalar; 
+    m_v[2] /= scalar; 
+    return *this; 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get component 0,1,2. E.g. x = v[0];
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline const S& Vector3<S>::operator[](int index) const
+{
+    CVF_TIGHT_ASSERT(index >= 0);
+    CVF_TIGHT_ASSERT(index < 3);
+
+    return m_v[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set component 0,1,2. E.g. v[0] = x;
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S& Vector3<S>::operator[](int index)
+{
+    CVF_TIGHT_ASSERT(index >= 0);
+    CVF_TIGHT_ASSERT(index < 3);
+
+    return m_v[index];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute the dot product of this and \a other
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+S Vector3<S>::dot(const Vector3& other) const
+{
+    return (*this)*other;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute the dot product of this and rhs and return the result (scalar)
+/// 
+/// Formula:
+/// \code
+/// S = tx*rx + ty*ry + tz*rz
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector3<S>::operator*(const Vector3& rhs) const
+{
+    return m_v[0]*rhs.m_v[0] + m_v[1]*rhs.m_v[1] + m_v[2]*rhs.m_v[2];
+}
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// Sets this vector to the cross product of vectors \a v1 and \a v2
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void cvf::Vector3<S>::cross(const Vector3& v1, const Vector3& v2)
+{
+    *this = v1 ^ v2;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Compute the cross product of this and rhs and return the result (vector)
+/// 
+/// Formula:
+/// \code
+/// vec = <ty*rz - tz*ry, tz*rx - tx*rz, tx*ry - ty*rx>
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline const Vector3<S> Vector3<S>::operator^(const Vector3& rhs) const
+{
+    return Vector3(m_v[1]*rhs.m_v[2] - m_v[2]*rhs.m_v[1], m_v[2]*rhs.m_v[0] - m_v[0]*rhs.m_v[2], m_v[0]*rhs.m_v[1] - m_v[1]*rhs.m_v[0]); 
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the vector from the other vector (of different type). Cast each component to convert it.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+template<typename T>
+void Vector3<S>::set(const T& other)
+{
+    m_v[0] = static_cast<S>(other.x());
+    m_v[1] = static_cast<S>(other.y());
+    m_v[2] = static_cast<S>(other.z());
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the length of the vector
+/// 
+/// Formula:
+/// \code
+/// len = sqrt(x*x + y*y + z*z)
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector3<S>::length() const
+{
+    return Math::sqrt(m_v[0]*m_v[0] + m_v[1]*m_v[1] + m_v[2]*m_v[2]);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the squared length (L2) of the vector
+/// 
+/// Formula:
+/// \code
+/// len = x*x + y*y + z*z
+/// \endcode
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector3<S>::lengthSquared() const
+{
+    return m_v[0]*m_v[0] + m_v[1]*m_v[1] + m_v[2]*m_v[2];
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the length of the vector to \a newLength. 
+/// 
+/// \return  The method returns true if scaling was a success. Returns false if the vector was of 
+///          zero length and \a newLength was different from 0.
+/// 
+/// This is the same as calling normalize() and then scaling with \a newLength.
+/// If the current vector length is 0 or \a newLength is 0, the vector is set to all zeros.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Vector3<S>::setLength(S newLength)
+{
+    CVF_ASSERT(newLength >= 0);
+
+    S currLen = length();
+
+    if (currLen > std::numeric_limits<S>::epsilon() && newLength > 0)
+    {
+        S scale = newLength/currLen;
+        m_v[0] *= scale;
+        m_v[1] *= scale;
+        m_v[2] *= scale;
+
+        return true;
+    }
+    else
+    {
+        setZero();
+
+        return (newLength == 0) ? true : false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Get the distance between this point and the point specified in \a otherPoint
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector3<S>::pointDistance(const Vector3& otherPoint) const
+{
+    return Math::sqrt(pointDistanceSquared(otherPoint));
+}
+
+//--------------------------------------------------------------------------------------------------
+/// Get the squared distance between this point and the point specified in \a otherPoint
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline S Vector3<S>::pointDistanceSquared(const Vector3& otherPoint) const
+{
+    S x = otherPoint.m_v[0] - m_v[0];
+    S y = otherPoint.m_v[1] - m_v[1];
+    S z = otherPoint.m_v[2] - m_v[2];
+
+    return (x*x + y*y + z*z);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Normalize the vector (make sure the length is 1.0).
+/// 
+/// \return  Returns true if normalization was possible. Returns false if length is zero or a NaN vector.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+bool Vector3<S>::normalize()
+{
+    S len = length();
+    if (len > 0.0)
+    {
+        // Precompute 1/length and do multiplication instead of division
+        S oneOverLen = (static_cast<S>(1.0)/len);
+        m_v[0] *= oneOverLen;
+        m_v[1] *= oneOverLen;
+        m_v[2] *= oneOverLen;
+
+        return true;
+    }
+    else
+    {
+        // Might be NaN, so set it to zero
+        m_v[0] = 0;
+        m_v[1] = 0;
+        m_v[2] = 0;
+
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Returns a normalized version of the current vector. The vector is unchanged.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::getNormalized(bool* normalizationOK) const
+{
+    S len = length();
+    if (len > 0.0)
+    {
+        if (normalizationOK) *normalizationOK = true;
+
+        S oneOverLen = (static_cast<S>(1.0)/len);
+        return Vector3<S>(m_v[0]*oneOverLen, m_v[1]*oneOverLen, m_v[2]*oneOverLen);
+    }
+    else
+    {
+        if (normalizationOK) *normalizationOK = false;
+        return Vector3<S>::ZERO;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set all components to 0
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline void Vector3<S>::setZero()
+{
+    m_v[0] = 0;
+    m_v[1] = 0;
+    m_v[2] = 0;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if all components are zero (exact match)
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector3<S>::isZero() const
+{
+    return (m_v[0] == 0) && (m_v[1] == 0) && (m_v[2] == 0);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Check if vector is undefined
+/// 
+/// \return Returns true if any one of the components is undefined
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline bool Vector3<S>::isUndefined() const
+{
+    if (Math::isUndefined(m_v[0]) ||
+        Math::isUndefined(m_v[1]) ||
+        Math::isUndefined(m_v[2]))
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Set the components of the vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+inline void Vector3<S>::set(S x, S y, S z)
+{
+    m_v[0] = x;
+    m_v[1] = y;
+    m_v[2] = z;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Transforms this vector as a point.
+/// 
+/// Transforms this vector as a point by multiplying it with the passed matrix.
+/// This will both rotate and translate this.
+/// Assumes the matrix m doesn't contain any perspective projection
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Vector3<S>::transformPoint(const Matrix4<S>& m)
+{
+    const S* pV = m.ptr();
+
+    S valX = pV[0]*x() + pV[4]*y() + pV[8]*z()  + pV[12];
+    S valY = pV[1]*x() + pV[5]*y() + pV[9]*z()  + pV[13];
+    S valZ = pV[2]*x() + pV[6]*y() + pV[10]*z() + pV[14];
+
+    x() = valX;
+    y() = valY;
+    z() = valZ;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return this vector transformed as a point (rotation and translation) with the given matrix.
+/// \sa
+///  transformPoint
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::getTransformedPoint(const Matrix4<S>& m) const
+{
+    Vector3<S> pt(*this);
+    pt.transformPoint(m);
+    return pt;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Transforms this vector as a vector.
+/// 
+/// Transforms this vector as a vector by multiplying it with the passed matrix. 
+/// This will only rotate the vector, but not consider the translation part of the matrix.
+/// Assumes the matrix m doesn't contain any perspective projection.
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Vector3<S>::transformVector(const Matrix4<S>& m)
+{
+    const S* pV = m.ptr();
+
+    S valX = pV[0]*x() + pV[4]*y() + pV[8]*z();
+    S valY = pV[1]*x() + pV[5]*y() + pV[9]*z();
+    S valZ = pV[2]*x() + pV[6]*y() + pV[10]*z();
+
+    x() = valX;
+    y() = valY;
+    z() = valZ;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return this vector transformed as a vector (rotation only) with the given matrix.
+/// \sa
+///  transformVector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::getTransformedVector(const Matrix4<S>& m) const
+{
+    Vector3<S> vec(*this);
+    vec.transformVector(m);
+    return vec;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Transforms this vector.
+/// 
+/// Transforms this vector by multiplying it with the passed matrix. 
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+void Vector3<S>::transformVector(const Matrix3<S>& m)
+{
+    const S* pV = m.ptr();
+
+    S valX = pV[0]*x() + pV[3]*y() + pV[6]*z();
+    S valY = pV[1]*x() + pV[4]*y() + pV[7]*z();
+    S valZ = pV[2]*x() + pV[5]*y() + pV[8]*z();
+
+    x() = valX;
+    y() = valY;
+    z() = valZ;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return this vector transformed with the given matrix.
+/// \sa
+///  transformVector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::getTransformedVector(const Matrix3<S>& m) const
+{
+    Vector3<S> vec(*this);
+    vec.transformVector(m);
+    return vec;
+}
+
+
+//----------------------------------------------------------------------------------------------------
+/// Create an orthonormal basis from this vector
+/// 
+/// \param mapToAxis  Specifies which axis this vector should be mapped onto (0=u, 1=v, 2=w)
+/// \param uAxis      Output u vector
+/// \param vAxis      Output v vector
+/// \param wAxis      Output w vector
+/// 
+/// Will create an orthonormal basis from this vector. The returned u, v and w axes will all be unit
+/// length and will be perpendicular to each other.
+/// The vector does not have to be normalized before calling this function.
+//----------------------------------------------------------------------------------------------------
+template<typename S>
+bool Vector3<S>::createOrthonormalBasis(int mapToAxis, Vector3<S>* uAxis, Vector3<S>* vAxis, Vector3<S>* wAxis) const
+{
+    bool normalizedOK = false;
+    Vector3<S> W = getNormalized(&normalizedOK);
+    if (!normalizedOK)
+    {
+        return false;
+    }
+
+    Vector3<S> U(0, 0, 0);
+    if (Math::abs(W.x()) >= Math::abs(W.y()))
+    {
+        // W.x or W.z component has largest magnitude
+        S length = Math::sqrt(W.x()*W.x() + W.z()*W.z());
+        U.x() = -W.z()/length;
+        U.y() = 0.0;
+        U.z() = +W.x()/length;
+    }
+    else
+    {
+        // W.y or W.z component has largest magnitude
+        S length = Math::sqrt(W.y()*W.y() + W.z()*W.z());
+        U.x() = 0.0;
+        U.y() = +W.z()/length;
+        U.z() = -W.y()/length;
+    }
+
+    // Get V as cross product of WxU
+    // Could be optimized by taking into account the fact that either the y or x component of U will be 0
+    Vector3<S> V = W^U;
+
+    // Algorithm above maps our vector onto W axis
+    // If another axis is requested, we need to shuffle the vectors
+    if (mapToAxis == 0)
+    {
+        if (uAxis) *uAxis = W;
+        if (vAxis) *vAxis = U;
+        if (wAxis) *wAxis = V;
+    }
+    else if (mapToAxis == 1)
+    {
+        if (uAxis) *uAxis = V;
+        if (vAxis) *vAxis = W;
+        if (wAxis) *wAxis = U;
+    }
+    else
+    {
+        if (uAxis) *uAxis = U;
+        if (vAxis) *vAxis = V;
+        if (wAxis) *wAxis = W;
+    }
+
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// Return a unit length perpendicular vector
+//--------------------------------------------------------------------------------------------------
+template<typename S>
+const Vector3<S> Vector3<S>::perpendicularVector(bool* perpendicularOK) const
+{
+    Vector3<S> perpendic(0, 0, 0);
+    bool ok = createOrthonormalBasis(0, NULL, &perpendic, NULL);
+    if (perpendicularOK)
+    {
+        *perpendicularOK = ok;
+    }
+
+    return perpendic;
+}
+
+
+}  // namespace cvf
+} //namespace external

external/resinsight/LibCore/cvfVector4.h

@@ -0,0 +1,130 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library 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.
+//
+//   This library 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.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cvfVector3.h"
+
+namespace external {
+namespace cvf {
+
+
+//==================================================================================================
+//
+// Vector class for 3D vectors
+//
+//==================================================================================================
+template<typename S>
+class Vector4
+{
+public:
+    Vector4() {}
+    Vector4(S x, S y, S z, S w);
+    Vector4(const Vector4& other);
+
+    Vector4(const Vector3<S>& other, S w);
+
+    template<typename T>
+    explicit Vector4(const T& other);
+
+    inline Vector4&         operator=(const Vector4& rhs);
+
+    inline bool             equals(const Vector4& other) const;
+    inline bool             operator==(const Vector4& rhs) const;
+    inline bool             operator!=(const Vector4& rhs) const;
+
+    inline void             add(const Vector4& other);
+    inline void             subtract(const Vector4& other);
+    inline const Vector4    operator+(const Vector4& rhs) const;
+    inline const Vector4    operator-(const Vector4& rhs) const;
+    inline Vector4&         operator+=(const Vector4& rhs);
+    inline Vector4&         operator-=(const Vector4& rhs);
+    inline const Vector4    operator-() const;
+
+    inline void             scale(S scalar);
+    inline const Vector4    operator*(S scalar) const;
+    inline const Vector4    operator/(S scalar) const;
+    inline Vector4&         operator*=(S scalar);
+    inline Vector4&         operator/=(S scalar);
+
+    inline S                dot(const Vector4& other) const;
+    inline S                operator*(const Vector4& rhs) const;    // Dot product
+
+    template<typename T> 
+    void                    set(const T& other);
+    inline void             set(S x, S y, S z, S w);
+    inline void             setZero();
+    inline const S&         x() const       { return m_v[0]; }      ///< Get the X element of the vector
+    inline const S&         y() const       { return m_v[1]; }      ///< Get the Y element of the vector
+    inline const S&         z() const       { return m_v[2]; }      ///< Get the Z element of the vector
+    inline const S&         w() const       { return m_v[3]; }      ///< Get the W element of the vector
+    inline S&               x()             { return m_v[0]; }      ///< Get a reference to the X element of the vector. E.g. x() = 1;
+    inline S&               y()             { return m_v[1]; }      ///< Get a reference to the Y element of the vector. E.g. y() = 2;
+    inline S&               z()             { return m_v[2]; }      ///< Get a reference to the Z element of the vector. E.g. z() = 3;
+    inline S&               w()             { return m_v[3]; }      ///< Get a reference to the W element of the vector. E.g. w() = 3;
+
+    inline const S&         operator[](int index) const;            // Get component 0,1,2,3. E.g. x = v[0];
+    inline S&               operator[](int index);                  // Set component 0,1,2,3. E.g. v[0] = x;
+
+    inline S*               ptr()       { return m_v; }             ///< Get a raw pointer to the internal c array of type S.
+    inline const S*         ptr() const { return m_v; }             ///< Get a const raw pointer to the internal c array of type S.
+
+    inline bool     isZero() const;
+
+    bool            normalize();
+    const Vector4   getNormalized(bool* normalizationOK = NULL) const;
+
+    inline S        length() const;
+    inline S        lengthSquared() const;
+    bool            setLength(S newLength);
+
+public:
+    static const Vector4 ZERO;      ///< Null vector <0, 0, 0>
+    static const Vector4 UNDEFINED; ///< Undefined vector
+
+private:
+    S m_v[4];
+};
+
+
+typedef Vector4<float>  Vec4f;  ///< A vector with float components
+typedef Vector4<double> Vec4d;  ///< A vector with double components
+typedef Vector4<int>    Vec4i;  ///< A vector with int components
+
+}
+} //namespace external
+#include "cvfVector4.inl"