Added example program and necessary configuration macros.

configure.ac

@@ -10,21 +10,73 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([LT_INIT], [LT_INIT])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([opm/polymer/HelloPolymer.hpp])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
+AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
+AC_PROG_RANLIB
 m4_ifdef([LT_INIT], [], [AC_PROG_LIBTOOL])
 
+# AX_LAPACK requires a working F77 compiler or, rather, its runtime
+# support libraries.
+AC_PROG_F77
+
+# F77 name mangling
+AC_F77_WRAPPERS
+
 # Checks for libraries.
+AX_LAPACK
+AX_BOOST_BASE([1.37])
+AX_BOOST_SYSTEM
+AX_BOOST_DATE_TIME
+AX_BOOST_FILESYSTEM
+AX_BOOST_UNIT_TEST_FRAMEWORK
+
+AC_SEARCH_LIBS([process_grdecl], [opmcore], [opmcore_lib=yes], [opmcore_lib=no], [$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS])
+
 
 # Checks for header files.
+AC_CHECK_HEADERS([opm/core/grid.h], [],
+[AC_MSG_ERROR(
+  [cannot proceed without 'opm-core' header files.
+   *** Update CPPFLAGS and try again. ***])])
+
+AC_CHECK_HEADERS([suitesparse/umfpack.h],
+                 [umfpack_header=yes],
+                 [umfpack_header=no])
+
+
 
 # Checks for typedefs, structures, and compiler characteristics.
 
 # Checks for library functions.
+AC_SEARCH_LIBS([umfpack_dl_solve], [umfpack],
+               [umfpack_lib=yes], [umfpack_lib=no])
+
+AC_SEARCH_LIBS([preprocess], [opmcore], [],
+[AC_MSG_ERROR(
+  [cannot proceed without CPGPreprocess library.
+   *** Update LDFLAGS and try again. ***])],
+[$BOOST_SYSTEM_LIB $LAPACK_LIBS $BLAS_LIBS])
+
+AC_SEARCH_LIBS([csrmatrix_elm_index], [opmcore], [],
+[AC_MSG_ERROR(
+  [cannot proceed without opmpressure library.
+   *** Update LDFLAGS and try again. ***])],
+[$BOOST_SYSTEM_LIB $LAPACK_LIBS $BLAS_LIBS])
+
+AM_CONDITIONAL([UMFPACK],
+  [test "x$umfpack_header" != "xno" -a "x$umfpack_lib" != "xno"])
+
+m4_ifdef([AM_COND_IF],
+[AM_COND_IF([UMFPACK], [],
+ [AC_MSG_NOTICE([Found no working installation of UMFPACK.
+                 UMFPACK support is disabled.])])
+])
 
 AC_CONFIG_FILES([
   Makefile

examples/Makefile.am

@@ -2,7 +2,11 @@ AM_CPPFLAGS =					\
 -I$(top_srcdir)
 
 noinst_PROGRAMS =				\
-hello
+hello						\
+polymer_reorder
 
 hello_SOURCES =					\
 SayHello.cpp
+
+polymer_reorder_SOURCES =			\
+polymer_reorder.cpp

examples/polymer_reorder.cpp

@@ -0,0 +1,851 @@
+/*===========================================================================
+//
+// File: spu_2p.cpp
+//
+// Created: 2011-10-05 10:29:01+0200
+//
+// Authors: Ingeborg S. Ligaarden <Ingeborg.Ligaarden@sintef.no>
+//          Jostein R. Natvig     <Jostein.R.Natvig@sintef.no>
+//          Halvor M. Nilsen      <HalvorMoll.Nilsen@sintef.no>
+//          Atgeirr F. Rasmussen  <atgeirr@sintef.no>
+//          Bård Skaflestad       <Bard.Skaflestad@sintef.no>
+//
+//==========================================================================*/
+
+
+/*
+  Copyright 2011 SINTEF ICT, Applied Mathematics.
+  Copyright 2011 Statoil ASA.
+
+  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 3 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/>.
+*/
+#include "config.h"
+
+#include <opm/core/linalg/sparse_sys.h>
+
+#include <opm/core/pressure/tpfa/ifs_tpfa.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>
+
+#include <opm/core/utility/cart_grid.h>
+#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/core/utility/Units.hpp>
+#include <opm/core/utility/cpgpreprocess/cgridinterface.h>
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
+
+#include <opm/core/fluid/SimpleFluid2p.hpp>
+#include <opm/core/fluid/IncompPropertiesBasic.hpp>
+#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
+
+#include <opm/core/transport/transport_source.h>
+#include <opm/core/transport/CSRMatrixUmfpackSolver.hpp>
+#include <opm/core/transport/NormSupport.hpp>
+#include <opm/core/transport/ImplicitAssembly.hpp>
+#include <opm/core/transport/ImplicitTransport.hpp>
+#include <opm/core/transport/JacobianSystem.hpp>
+#include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
+#include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>
+
+#include <opm/core/transport/reorder/twophasetransport.hpp>
+
+#include <boost/filesystem/convenience.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include <cassert>
+#include <cstddef>
+
+#include <algorithm>
+#include <tr1/array>
+#include <functional>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
+#include <iterator>
+#include <vector>
+
+
+
+
+namespace Opm
+{
+
+
+    /// Concrete grid class constructing a
+    /// corner point grid from a deck,
+    /// or a cartesian grid.
+    class Grid
+    {
+    public:
+	Grid(const Opm::EclipseGridParser& deck)
+	{
+	    // Extract data from deck.
+	    const std::vector<double>& zcorn = deck.getFloatingPointValue("ZCORN");
+	    const std::vector<double>& coord = deck.getFloatingPointValue("COORD");
+	    const std::vector<int>& actnum = deck.getIntegerValue("ACTNUM");
+	    std::vector<int> dims;
+	    if (deck.hasField("DIMENS")) {
+		dims = deck.getIntegerValue("DIMENS");
+	    } else if (deck.hasField("SPECGRID")) {
+		dims = deck.getSPECGRID().dimensions;
+	    } else {
+		THROW("Deck must have either DIMENS or SPECGRID.");
+	    }
+
+	    // Collect in input struct for preprocessing.
+	    struct grdecl grdecl;
+	    grdecl.zcorn = &zcorn[0];
+	    grdecl.coord = &coord[0];
+	    grdecl.actnum = &actnum[0];
+	    grdecl.dims[0] = dims[0];
+	    grdecl.dims[1] = dims[1];
+	    grdecl.dims[2] = dims[2];
+
+	    // Process and compute.
+	    ug_ = preprocess(&grdecl, 0.0);
+	    compute_geometry(ug_);
+	}
+
+	Grid(int nx, int ny)
+	{
+	    ug_ = create_cart_grid_2d(nx, ny);
+	}
+
+	Grid(int nx, int ny, int nz)
+	{
+	    ug_ = create_cart_grid_3d(nx, ny, nz);
+	}
+
+	~Grid()
+	{
+	    free_grid(ug_);
+	}
+
+	virtual const UnstructuredGrid* c_grid() const
+	{
+	    return ug_;
+	}
+
+    private:
+	// Disable copying and assignment.
+	Grid(const Grid& other);
+	Grid& operator=(const Grid& other);
+	struct UnstructuredGrid* ug_;
+    };
+
+} // namespace Opm
+
+
+
+
+class ReservoirState {
+public:
+    ReservoirState(const UnstructuredGrid* g, const int num_phases = 2)
+        : press_ (g->number_of_cells, 0.0),
+          fpress_(g->number_of_faces, 0.0),
+          flux_  (g->number_of_faces, 0.0),
+          sat_   (num_phases * g->number_of_cells, 0.0)
+    {
+	for (int cell = 0; cell < g->number_of_cells; ++cell) {
+	    sat_[num_phases*cell + num_phases - 1] = 1.0;
+	}
+    }
+
+    int numPhases() const { return sat_.size()/press_.size(); }
+
+    ::std::vector<double>& pressure    () { return press_ ; }
+    ::std::vector<double>& facepressure() { return fpress_; }
+    ::std::vector<double>& faceflux    () { return flux_  ; }
+    ::std::vector<double>& saturation  () { return sat_   ; }
+
+    const ::std::vector<double>& pressure    () const { return press_ ; }
+    const ::std::vector<double>& facepressure() const { return fpress_; }
+    const ::std::vector<double>& faceflux    () const { return flux_  ; }
+    const ::std::vector<double>& saturation  () const { return sat_   ; }
+
+private:
+    ::std::vector<double> press_ ;
+    ::std::vector<double> fpress_;
+    ::std::vector<double> flux_  ;
+    ::std::vector<double> sat_   ;
+};
+
+
+
+
+class PressureSolver {
+public:
+    PressureSolver(const UnstructuredGrid* g,
+		   const Opm::IncompPropertiesInterface& props)
+        : htrans_(g->cell_facepos[ g->number_of_cells ]),
+          trans_ (g->number_of_faces),
+          gpress_(g->cell_facepos[ g->number_of_cells ])
+    {
+	UnstructuredGrid* gg = const_cast<UnstructuredGrid*>(g);
+        tpfa_htrans_compute(gg, props.permeability(), &htrans_[0]);
+
+        h_ = ifs_tpfa_construct(gg);
+    }
+
+    ~PressureSolver()
+    {
+        ifs_tpfa_destroy(h_);
+    }
+
+    template <class State>
+    void
+    solve(const UnstructuredGrid*      g     ,
+          const ::std::vector<double>& totmob,
+          const ::std::vector<double>& src   ,
+          State&                       state )
+    {
+	UnstructuredGrid* gg = const_cast<UnstructuredGrid*>(g);
+        tpfa_eff_trans_compute(gg, &totmob[0], &htrans_[0], &trans_[0]);
+
+        // No gravity
+        ::std::fill(gpress_.begin(), gpress_.end(), double(0.0));
+
+        ifs_tpfa_assemble(gg, &trans_[0], &src[0], &gpress_[0], h_);
+
+        using Opm::ImplicitTransportLinAlgSupport::CSRMatrixUmfpackSolver;
+
+        CSRMatrixUmfpackSolver linsolve;
+        linsolve.solve(h_->A, h_->b, h_->x);
+
+        ifs_tpfa_press_flux(gg, &trans_[0], h_,
+                            &state.pressure()[0],
+                            &state.faceflux()[0]);
+    }
+
+private:
+    ::std::vector<double> htrans_;
+    ::std::vector<double> trans_ ;
+    ::std::vector<double> gpress_;
+
+    struct ifs_tpfa_data* h_;
+};
+
+
+
+
+static void
+compute_porevolume(const UnstructuredGrid* g,
+                   const Opm::IncompPropertiesInterface& props,
+                   std::vector<double>& porevol)
+{
+    int num_cells = g->number_of_cells;
+    porevol.resize(num_cells);
+    const double* poro = props.porosity();
+    ::std::transform(poro, poro + num_cells,
+                     g->cell_volumes,
+                     porevol.begin(),
+                     ::std::multiplies<double>());
+}
+
+
+static void
+compute_totmob(const Opm::IncompPropertiesInterface& props,
+	       const std::vector<double>& s,
+	       std::vector<double>& totmob)
+{
+    int num_cells = props.numCells();
+    int num_phases = props.numPhases();
+    totmob.resize(num_cells);
+    ASSERT(int(s.size()) == num_cells*num_phases);
+    std::vector<int> cells(num_cells);
+    for (int cell = 0; cell < num_cells; ++cell) {
+	cells[cell] = cell;
+    }
+    std::vector<double> kr(num_cells*num_phases);
+    props.relperm(num_cells, &s[0], &cells[0], &kr[0], 0);
+    const double* mu = props.viscosity();
+    for (int cell = 0; cell < num_cells; ++cell) {
+	totmob[cell] = 0;
+	for (int phase = 0; phase < num_phases; ++phase) {	
+	    totmob[cell] += kr[2*cell + phase]/mu[phase];
+	}
+    }
+}
+
+
+template <class State>
+void outputState(const UnstructuredGrid* grid,
+		 const State& state,
+		 const int step,
+		 const std::string& output_dir)
+{
+    std::ostringstream vtkfilename;
+    vtkfilename << output_dir << "/output-" << std::setw(3) << std::setfill('0') << step << ".vtu";
+    std::ofstream vtkfile(vtkfilename.str().c_str());
+    if (!vtkfile) {
+	THROW("Failed to open " << vtkfilename.str());
+    }
+    writeVtkDataGeneralGrid(grid, state, vtkfile);
+}
+
+
+
+
+template <class State>
+void writeVtkDataAllCartesian(const std::tr1::array<int, 3>& dims,
+			      const std::tr1::array<double, 3>& cell_size,
+			      const State& state,
+			      std::ostream& vtk_file)
+{
+    // Dimension is hardcoded in the prototype and the next two lines,
+    // but the rest is flexible (allows dimension == 2 or 3).
+    int dimension = 3;
+    int num_cells = dims[0]*dims[1]*dims[2];
+
+    ASSERT(dimension == 2 || dimension == 3);
+    ASSERT(num_cells = dims[0]*dims[1]* (dimension == 2 ? 1 : dims[2]));
+
+    vtk_file << "# vtk DataFile Version 2.0\n";
+    vtk_file << "Structured Grid\n \n";
+    vtk_file << "ASCII \n";
+    vtk_file << "DATASET STRUCTURED_POINTS\n";
+
+    vtk_file << "DIMENSIONS "
+	     << dims[0] + 1 << " "
+	     << dims[1] + 1 << " ";
+    if (dimension == 3) {
+	vtk_file << dims[2] + 1;
+    } else {
+	vtk_file << 1;
+    }
+    vtk_file << "\n";
+	
+    vtk_file << "ORIGIN " << 0.0 << " " << 0.0 << " " << 0.0 << "\n";
+
+    vtk_file << "SPACING " << cell_size[0] << " " << cell_size[1];
+    if (dimension == 3) {
+	vtk_file << " " << cell_size[2];
+    } else {
+	vtk_file << " " << 0.0;
+    }
+    vtk_file << "\n";
+
+    vtk_file << "CELL_DATA " << num_cells << '\n';
+    vtk_file << "SCALARS pressure float" << '\n';
+    vtk_file << "LOOKUP_TABLE pressure_table " << '\n';
+    for (int i = 0; i < num_cells; ++i) {
+	vtk_file << state.pressure()[i] << '\n';
+    }
+
+    ASSERT(state.numPhases() == 2);
+    vtk_file << "SCALARS saturation float" << '\n';
+    vtk_file << "LOOKUP_TABLE saturation_table " << '\n';
+    for (int i = 0; i < num_cells; ++i) {
+	double s = state.saturation()[2*i];
+    	if (s > 1e-10) {
+    	    vtk_file << s << '\n';
+    	} else {
+    	    vtk_file << 0.0 << '\n';
+    	}
+    }
+}
+
+typedef std::map<std::string, std::string> PMap;
+
+
+struct Tag
+{
+    Tag(const std::string& tag, const PMap& props, std::ostream& os)
+	: name_(tag), os_(os)
+    {
+	indent(os);
+	os << "<" << tag;
+	for (PMap::const_iterator it = props.begin(); it != props.end(); ++it) {
+	    os << " " << it->first << "=\"" << it->second << "\""; 
+	}
+	os << ">\n";
+	++indent_;
+    }
+    Tag(const std::string& tag, std::ostream& os)
+	: name_(tag), os_(os)
+    {
+	indent(os);
+	os << "<" << tag << ">\n";
+	++indent_;
+    }
+    ~Tag()
+    {
+	--indent_;
+	indent(os_);
+	os_ << "</" << name_ << ">\n";
+    }
+    static void indent(std::ostream& os)
+    {
+	for (int i = 0; i < indent_; ++i) {
+	    os << "  ";
+	}
+    }
+private:
+    static int indent_;
+    std::string name_;
+    std::ostream& os_;
+};
+
+int Tag::indent_ = 0;
+
+
+template <class State>
+void writeVtkDataGeneralGrid(const UnstructuredGrid* grid,
+			     const State& state,
+			     std::ostream& os)
+{
+    if (grid->dimensions != 3) {
+	THROW("Vtk output for 3d grids only");
+    }
+    os.precision(12);
+    os << "<?xml version=\"1.0\"?>\n";
+    PMap pm;
+    pm["type"] = "UnstructuredGrid";
+    Tag vtkfiletag("VTKFile", pm, os);
+    Tag ugtag("UnstructuredGrid", os);
+    int num_pts = grid->number_of_nodes;
+    int num_cells = grid->number_of_cells;
+    pm.clear();
+    pm["NumberOfPoints"] = boost::lexical_cast<std::string>(num_pts);
+    pm["NumberOfCells"] = boost::lexical_cast<std::string>(num_cells);
+    Tag piecetag("Piece", pm, os);
+    {
+	Tag pointstag("Points", os);
+	pm.clear();
+	pm["type"] = "Float64";
+	pm["Name"] = "Coordinates";
+	pm["NumberOfComponents"] = "3";
+	pm["format"] = "ascii";
+	Tag datag("DataArray", pm, os);
+	for (int i = 0; i < num_pts; ++i) {
+	    Tag::indent(os);
+	    os << grid->node_coordinates[3*i + 0] << ' '
+	       << grid->node_coordinates[3*i + 1] << ' '
+	       << grid->node_coordinates[3*i + 2] << '\n';
+	}
+    }
+    {
+	Tag cellstag("Cells", os);
+	pm.clear();
+	pm["type"] = "Int32";
+	pm["NumberOfComponents"] = "1";
+	pm["format"] = "ascii";
+	std::vector<int> cell_numpts;
+	cell_numpts.reserve(num_cells);
+	{
+	    pm["Name"] = "connectivity";
+	    Tag t("DataArray", pm, os);
+	    int hf = 0;
+	    for (int c = 0; c < num_cells; ++c) {
+		std::set<int> cell_pts;
+		for (; hf < grid->cell_facepos[c+1]; ++hf) {
+		    int f = grid->cell_faces[hf];
+		    const int* fnbeg = grid->face_nodes + grid->face_nodepos[f];
+		    const int* fnend = grid->face_nodes + grid->face_nodepos[f+1];
+		    cell_pts.insert(fnbeg, fnend);
+		}
+		cell_numpts.push_back(cell_pts.size());
+		Tag::indent(os);
+		std::copy(cell_pts.begin(), cell_pts.end(),
+			  std::ostream_iterator<int>(os, " "));
+		os << '\n';
+	    }
+	}
+	{
+	    pm["Name"] = "offsets";
+	    Tag t("DataArray", pm, os);
+	    int offset = 0;
+	    const int num_per_line = 10;
+	    for (int c = 0; c < num_cells; ++c) {
+		if (c % num_per_line == 0) {
+		    Tag::indent(os);
+		}
+		offset += cell_numpts[c];
+		os << offset << ' ';
+		if (c % num_per_line == num_per_line - 1
+		    || c == num_cells - 1) {
+		    os << '\n';
+		}
+	    }
+	}
+	std::vector<int> cell_foffsets;
+	cell_foffsets.reserve(num_cells);
+	{
+	    pm["Name"] = "faces";
+	    Tag t("DataArray", pm, os);
+	    const int* fp = grid->cell_facepos;
+	    int offset = 0;
+	    for (int c = 0; c < num_cells; ++c) {
+		Tag::indent(os);
+		os << fp[c+1] - fp[c] << '\n';
+		++offset;
+		for (int hf = fp[c]; hf < fp[c+1]; ++hf) {
+		    int f = grid->cell_faces[hf];
+		    const int* np = grid->face_nodepos;
+		    int f_num_pts = np[f+1] - np[f];
+		    Tag::indent(os);
+		    os << f_num_pts << ' ';
+		    ++offset;
+		    std::copy(grid->face_nodes + np[f],
+			      grid->face_nodes + np[f+1],
+			      std::ostream_iterator<int>(os, " "));
+		    os << '\n';
+		    offset += f_num_pts;
+		}
+		cell_foffsets.push_back(offset);
+	    }
+	}
+	{
+	    pm["Name"] = "faceoffsets";
+	    Tag t("DataArray", pm, os);
+	    const int num_per_line = 10;
+	    for (int c = 0; c < num_cells; ++c) {
+		if (c % num_per_line == 0) {
+		    Tag::indent(os);
+		}
+		os << cell_foffsets[c] << ' ';
+		if (c % num_per_line == num_per_line - 1
+		    || c == num_cells - 1) {
+		    os << '\n';
+		}
+	    }
+	}
+	{
+	    pm["type"] = "UInt8";
+	    pm["Name"] = "types";
+	    Tag t("DataArray", pm, os);
+	    const int num_per_line = 10;
+	    for (int c = 0; c < num_cells; ++c) {
+		if (c % num_per_line == 0) {
+		    Tag::indent(os);
+		}
+		os << "42 ";
+		if (c % num_per_line == num_per_line - 1
+		    || c == num_cells - 1) {
+		    os << '\n';
+		}
+	    }
+	}
+    }
+    {
+	pm.clear();
+	pm["Scalars"] = "saturation";
+	Tag celldatatag("CellData", pm, os);
+	pm.clear();
+	pm["type"] = "Int32";
+	pm["NumberOfComponents"] = "1";
+	pm["format"] = "ascii";
+	pm["type"] = "Float64";
+	{
+	    pm["Name"] = "pressure";
+	    Tag ptag("DataArray", pm, os);
+	    const int num_per_line = 5;
+	    for (int c = 0; c < num_cells; ++c) {
+		if (c % num_per_line == 0) {
+		    Tag::indent(os);
+		}
+		os << state.pressure()[c] << ' ';
+		if (c % num_per_line == num_per_line - 1
+		    || c == num_cells - 1) {
+		    os << '\n';
+		}
+	    }	    
+	}
+	{
+	    pm["Name"] = "saturation";
+	    Tag ptag("DataArray", pm, os);
+	    const int num_per_line = 5;
+	    for (int c = 0; c < num_cells; ++c) {
+		if (c % num_per_line == 0) {
+		    Tag::indent(os);
+		}
+		os << state.saturation()[2*c] << ' ';
+		if (c % num_per_line == num_per_line - 1
+		    || c == num_cells - 1) {
+		    os << '\n';
+		}
+	    }	    
+	}
+    }
+}
+
+
+
+
+static void toWaterSat(const std::vector<double>& sboth, std::vector<double>& sw)
+{
+    int num = sboth.size()/2;
+    sw.resize(num);
+    for (int i = 0; i < num; ++i) {
+	sw[i] = sboth[2*i];
+    }
+}
+
+static void toBothSat(const std::vector<double>& sw, std::vector<double>& sboth)
+{
+    int num = sw.size();
+    sboth.resize(2*num);
+    for (int i = 0; i < num; ++i) {
+	sboth[2*i] = sw[i];
+	sboth[2*i + 1] = 1.0 - sw[i];
+    }
+}
+
+
+
+
+// --------------- Types needed to define transport solver ---------------
+
+class SimpleFluid2pWrappingProps
+{
+public:
+    SimpleFluid2pWrappingProps(const Opm::IncompPropertiesInterface& props)
+	: props_(props)
+    {
+	if (props.numPhases() != 2) {
+	    THROW("SimpleFluid2pWrapper requires 2 phases.");
+	}
+    }
+
+    double density(int phase) const
+    {
+	return props_.density()[phase];
+    }
+
+    template <class Sat,
+	      class Mob,
+	      class DMob>
+    void mobility(int c, const Sat& s, Mob& mob, DMob& dmob) const
+    {
+	props_.relperm(1, &s[0], &c, &mob[0], &dmob[0]);
+	const double* mu = props_.viscosity();
+	mob[0] /= mu[0];
+	mob[1] /= mu[1];
+	// Recall that we use Fortran ordering for kr derivatives,
+	// therefore dmob[i*2 + j] is row j and column i of the
+	// matrix.
+	// Each row corresponds to a kr function, so which mu to
+	// divide by also depends on the row, j.
+	dmob[0*2 + 0] /= mu[0];
+	dmob[0*2 + 1] /= mu[1];
+	dmob[1*2 + 0] /= mu[0];
+	dmob[1*2 + 1] /= mu[1];
+    }
+
+    template <class Sat,
+	      class Pcap,
+	      class DPcap>
+    void pc(int c, const Sat& s, Pcap& pcap, DPcap& dpcap) const
+    {
+	double pc[2];
+	double dpc[4];
+	props_.capPress(1, &s[0], &c, pc, dpc);
+	pcap = pc[0];
+	ASSERT(pc[1] == 0.0);
+	dpcap = dpc[0];
+	ASSERT(dpc[1] == 0.0);
+	ASSERT(dpc[2] == 0.0);
+	ASSERT(dpc[3] == 0.0);
+    }
+ 
+    /// \todo Properly implement s_min() and s_max().
+    ///       We must think about how to do this in
+    ///       the *Properties* classes.
+    double s_min(int c) const { (void) c; return 0.0; }
+    double s_max(int c) const { (void) c; return 1.0; }
+
+private:
+    const Opm::IncompPropertiesInterface& props_;
+};
+
+typedef SimpleFluid2pWrappingProps TwophaseFluid;
+typedef Opm::SinglePointUpwindTwoPhase<TwophaseFluid> TransportModel;
+
+using namespace Opm::ImplicitTransportDefault;
+
+typedef NewtonVectorCollection< ::std::vector<double> >      NVecColl;
+typedef JacobianSystem        < struct CSRMatrix, NVecColl > JacSys;
+
+template <class Vector>
+class MaxNorm {
+public:
+    static double
+    norm(const Vector& v) {
+        return AccumulationNorm <Vector, MaxAbs>::norm(v);
+    }
+};
+
+typedef Opm::ImplicitTransport<TransportModel,
+                               JacSys        ,
+                               MaxNorm       ,
+                               VectorNegater ,
+                               VectorZero    ,
+                               MatrixZero    ,
+                               VectorAssign  > TransportSolver;
+
+
+
+// ----------------- Main program -----------------
+int
+main(int argc, char** argv)
+{
+    std::cout << "\n================    Test program for incompressible two-phase flow     ===============\n\n";
+    Opm::parameter::ParameterGroup param(argc, argv, false);
+    std::cout << "---------------    Reading parameters     ---------------" << std::endl;
+
+    // Reading various control parameters.
+    const int num_psteps = param.getDefault("num_psteps", 1);
+    const double stepsize_days = param.getDefault("stepsize_days", 1.0);
+    const double stepsize = Opm::unit::convert::from(stepsize_days, Opm::unit::day);
+    const bool guess_old_solution = param.getDefault("guess_old_solution", false);
+    const bool use_reorder = param.getDefault("use_reorder", true);
+    const bool output = param.getDefault("output", true);
+    std::string output_dir;
+    if (output) {
+	output_dir = param.getDefault("output_dir", std::string("output"));
+	// Ensure that output dir exists
+	boost::filesystem::path fpath(output_dir);
+	create_directories(fpath);
+    }
+
+    // If we have a "deck_filename", grid and props will be read from that.
+    bool use_deck = param.has("deck_filename");
+    boost::scoped_ptr<Opm::Grid> grid;
+    boost::scoped_ptr<Opm::IncompPropertiesInterface> props;
+    if (use_deck) {
+	std::string deck_filename = param.get<std::string>("deck_filename");
+	Opm::EclipseGridParser deck(deck_filename);
+	// Grid init
+	grid.reset(new Opm::Grid(deck));
+	// Rock and fluid init
+	const int* gc = grid->c_grid()->global_cell;
+	std::vector<int> global_cell(gc, gc + grid->c_grid()->number_of_cells);
+	props.reset(new Opm::IncompPropertiesFromDeck(deck, global_cell));
+    } else {
+	// Grid init.
+	const int nx = param.getDefault("nx", 100);
+	const int ny = param.getDefault("ny", 100);
+	const int nz = param.getDefault("nz", 1);
+	grid.reset(new Opm::Grid(nx, ny, nz));
+	// Rock and fluid init.
+	props.reset(new Opm::IncompPropertiesBasic(param, grid->c_grid()->dimensions, grid->c_grid()->number_of_cells));
+    }
+
+    // Extra rock init.
+    std::vector<double> porevol;
+    compute_porevolume(grid->c_grid(), *props, porevol);
+    double tot_porevol = std::accumulate(porevol.begin(), porevol.end(), 0.0);
+
+    // Extra fluid init for transport solver.
+    TwophaseFluid fluid(*props);
+
+    // Solvers init.
+    PressureSolver psolver(grid->c_grid(), *props);
+    TransportModel  model  (fluid, *grid->c_grid(), porevol, 0, guess_old_solution);
+    TransportSolver tsolver(model);
+
+    // State-related and source-related variables init.
+    std::vector<double> totmob;
+    ReservoirState state(grid->c_grid(), props->numPhases());
+    // We need a separate reorder_sat, because the reorder
+    // code expects a scalar sw, not both sw and so.
+    std::vector<double> reorder_sat(grid->c_grid()->number_of_cells);
+    double flow_per_sec = 0.1*tot_porevol/Opm::unit::day;
+    std::vector<double> src   (grid->c_grid()->number_of_cells, 0.0);
+    src[0]                         =  flow_per_sec;
+    src[grid->c_grid()->number_of_cells - 1] = -flow_per_sec;
+    TransportSource* tsrc = create_transport_source(2, 2);
+    double ssrc[]   = { 1.0, 0.0 };
+    double ssink[]  = { 0.0, 1.0 };
+    double zdummy[] = { 0.0, 0.0 };
+    append_transport_source(0, 2, 0, src[0], ssrc, zdummy, tsrc);
+    append_transport_source(grid->c_grid()->number_of_cells - 1, 2, 0,
+			    src.back(), ssink, zdummy, tsrc);
+    std::vector<double> reorder_src = src;
+
+    // Control init.
+    Opm::ImplicitTransportDetails::NRReport  rpt;
+    Opm::ImplicitTransportDetails::NRControl ctrl;
+    double current_time = 0.0;
+    double total_time = stepsize*num_psteps;
+    ctrl.max_it = param.getDefault("max_it", 20);
+    ctrl.verbosity = param.getDefault("verbosity", 0);
+    ctrl.max_it_ls = param.getDefault("max_it_ls", 5);
+
+    // Linear solver init.
+    using Opm::ImplicitTransportLinAlgSupport::CSRMatrixUmfpackSolver;
+    CSRMatrixUmfpackSolver linsolve;
+
+    // Warn if any parameters are unused.
+    if (param.anyUnused()) {
+	std::cout << "--------------------   Unused parameters:   --------------------\n";
+	param.displayUsage();
+	std::cout << "----------------------------------------------------------------" << std::endl;
+    }
+
+    // Write parameters used for later reference.
+    if (output) {
+	param.writeParam(output_dir + "/spu_2p.param");
+    }
+
+    // Main simulation loop.
+    std::cout << "\n\n================    Starting main simulation loop     ===============" << std::endl;
+    for (int pstep = 0; pstep < num_psteps; ++pstep) {
+        std::cout << "\n\n---------------    Simulation step number " << pstep
+                  << "    ---------------"
+                  << "\n      Current time (days)     " << Opm::unit::convert::to(current_time, Opm::unit::day)
+                  << "\n      Current stepsize (days) " << Opm::unit::convert::to(stepsize, Opm::unit::day)
+                  << "\n      Total time (days)       " << Opm::unit::convert::to(total_time, Opm::unit::day)
+                  << "\n" << std::endl;
+
+	if (output) {
+	    outputState(grid->c_grid(), state, pstep, output_dir);
+	}
+
+	compute_totmob(*props, state.saturation(), totmob);
+	psolver.solve(grid->c_grid(), totmob, src, state);
+
+	if (use_reorder) {
+	    toWaterSat(state.saturation(), reorder_sat);
+	    // We must treat reorder_src here,
+	    // if we are to handle anything but simple water
+	    // injection, since it is expected to be
+	    // equal to total outflow (if negative)
+	    // and water inflow (if positive).
+	    // Also, for anything but noflow boundaries,
+	    // boundary flows must be accumulated into
+	    // source term following the same convention.
+	    twophasetransport(&porevol[0],
+			      &reorder_src[0],
+			      stepsize,
+			      const_cast<UnstructuredGrid*>(grid->c_grid()),
+			      props.get(),
+			      &state.faceflux()[0],
+			      &reorder_sat[0]);
+	    toBothSat(reorder_sat, state.saturation());
+	} else {
+	    tsolver.solve(*grid->c_grid(), tsrc, stepsize, ctrl, state, linsolve, rpt);
+	    std::cout << rpt;
+	}
+
+	current_time += stepsize;
+    }
+
+    if (output) {
+	outputState(grid->c_grid(), state, num_psteps, output_dir);
+    }
+
+    destroy_transport_source(tsrc);
+}

m4/ax_blas.m4

@@ -0,0 +1,201 @@
+# ===========================================================================
+#          http://www.gnu.org/software/autoconf-archive/ax_blas.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro looks for a library that implements the BLAS linear-algebra
+#   interface (see http://www.netlib.org/blas/). On success, it sets the
+#   BLAS_LIBS output variable to hold the requisite library linkages.
+#
+#   To link with BLAS, you should link with:
+#
+#     $BLAS_LIBS $LIBS $FLIBS
+#
+#   in that order. FLIBS is the output variable of the
+#   AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is
+#   sometimes necessary in order to link with F77 libraries. Users will also
+#   need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same
+#   reason.
+#
+#   Many libraries are searched for, from ATLAS to CXML to ESSL. The user
+#   may also use --with-blas=<lib> in order to use some specific BLAS
+#   library <lib>. In order to link successfully, however, be aware that you
+#   will probably need to use the same Fortran compiler (which can be set
+#   via the F77 env. var.) as was used to compile the BLAS library.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a BLAS library is
+#   found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
+#   not found. If ACTION-IF-FOUND is not specified, the default action will
+#   define HAVE_BLAS.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#
+#   This program 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 program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 11
+
+AU_ALIAS([ACX_BLAS], [AX_BLAS])
+AC_DEFUN([AX_BLAS], [
+AC_PREREQ(2.50)
+AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
+ax_blas_ok=no
+
+AC_ARG_WITH(blas,
+	[AS_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
+case $with_blas in
+	yes | "") ;;
+	no) ax_blas_ok=disable ;;
+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
+	*) BLAS_LIBS="-l$with_blas" ;;
+esac
+
+# Get fortran linker names of BLAS functions to check for.
+AC_F77_FUNC(sgemm)
+AC_F77_FUNC(dgemm)
+
+ax_blas_save_LIBS="$LIBS"
+LIBS="$LIBS $FLIBS"
+
+# First, check BLAS_LIBS environment variable
+if test $ax_blas_ok = no; then
+if test "x$BLAS_LIBS" != x; then
+	save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+	AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
+	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes], [BLAS_LIBS=""])
+	AC_MSG_RESULT($ax_blas_ok)
+	LIBS="$save_LIBS"
+fi
+fi
+
+# BLAS linked to by default?  (happens on some supercomputers)
+if test $ax_blas_ok = no; then
+	save_LIBS="$LIBS"; LIBS="$LIBS"
+	AC_MSG_CHECKING([if $sgemm is being linked in already])
+	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes])
+	AC_MSG_RESULT($ax_blas_ok)
+	LIBS="$save_LIBS"
+fi
+
+# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(atlas, ATL_xerbla,
+		[AC_CHECK_LIB(f77blas, $sgemm,
+		[AC_CHECK_LIB(cblas, cblas_dgemm,
+			[ax_blas_ok=yes
+			 BLAS_LIBS="-lcblas -lf77blas -latlas"],
+			[], [-lf77blas -latlas])],
+			[], [-latlas])])
+fi
+
+# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(blas, $sgemm,
+		[AC_CHECK_LIB(dgemm, $dgemm,
+		[AC_CHECK_LIB(sgemm, $sgemm,
+			[ax_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
+			[], [-lblas])],
+			[], [-lblas])])
+fi
+
+# BLAS in Intel MKL library?
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(mkl, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lmkl"])
+fi
+
+# BLAS in Apple vecLib library?
+if test $ax_blas_ok = no; then
+	save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS"
+	AC_MSG_CHECKING([for $sgemm in -framework vecLib])
+	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"])
+	AC_MSG_RESULT($ax_blas_ok)
+	LIBS="$save_LIBS"
+fi
+
+# BLAS in Alpha CXML library?
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(cxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lcxml"])
+fi
+
+# BLAS in Alpha DXML library? (now called CXML, see above)
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(dxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-ldxml"])
+fi
+
+# BLAS in Sun Performance library?
+if test $ax_blas_ok = no; then
+	if test "x$GCC" != xyes; then # only works with Sun CC
+		AC_CHECK_LIB(sunmath, acosp,
+			[AC_CHECK_LIB(sunperf, $sgemm,
+				[BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
+                                 ax_blas_ok=yes],[],[-lsunmath])])
+	fi
+fi
+
+# BLAS in SCSL library?  (SGI/Cray Scientific Library)
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(scs, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lscs"])
+fi
+
+# BLAS in SGIMATH library?
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(complib.sgimath, $sgemm,
+		     [ax_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
+fi
+
+# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(blas, $sgemm,
+		[AC_CHECK_LIB(essl, $sgemm,
+			[ax_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
+			[], [-lblas $FLIBS])])
+fi
+
+# Generic BLAS library?
+if test $ax_blas_ok = no; then
+	AC_CHECK_LIB(blas, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lblas"])
+fi
+
+AC_SUBST(BLAS_LIBS)
+
+LIBS="$ax_blas_save_LIBS"
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_blas_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
+        :
+else
+        ax_blas_ok=no
+        $2
+fi
+])dnl AX_BLAS

m4/ax_boost_base.m4

@@ -0,0 +1,258 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# DESCRIPTION
+#
+#   Test for the Boost C++ libraries of a particular version (or newer)
+#
+#   If no path to the installed boost library is given the macro searchs
+#   under /usr, /usr/local, /opt and /opt/local and evaluates the
+#   $BOOST_ROOT environment variable. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
+#
+#   And sets:
+#
+#     HAVE_BOOST
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2009 Peter Adolphs
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 20
+
+AC_DEFUN([AX_BOOST_BASE],
+[
+AC_ARG_WITH([boost],
+  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
+    [use Boost library from a standard location (ARG=yes),
+     from the specified location (ARG=<path>),
+     or disable it (ARG=no)
+     @<:@ARG=yes@:>@ ])],
+    [
+    if test "$withval" = "no"; then
+        want_boost="no"
+    elif test "$withval" = "yes"; then
+        want_boost="yes"
+        ac_boost_path=""
+    else
+        want_boost="yes"
+        ac_boost_path="$withval"
+    fi
+    ],
+    [want_boost="yes"])
+
+
+AC_ARG_WITH([boost-libdir],
+        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
+        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
+        [
+        if test -d "$withval"
+        then
+                ac_boost_lib_path="$withval"
+        else
+                AC_MSG_ERROR(--with-boost-libdir expected directory name)
+        fi
+        ],
+        [ac_boost_lib_path=""]
+)
+
+if test "x$want_boost" = "xyes"; then
+    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
+    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+        boost_lib_version_req_sub_minor="0"
+        fi
+    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+    succeeded=no
+
+    dnl On 64-bit systems check for system libraries in both lib64 and lib.
+    dnl The former is specified by FHS, but e.g. Debian does not adhere to
+    dnl this (as it rises problems for generic multi-arch support).
+    dnl The last entry in the list is chosen by default when no libraries
+    dnl are found, e.g. when only header-only libraries are installed!
+    libsubdirs="lib"
+    ax_arch=`uname -m`
+    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
+        libsubdirs="lib64 lib lib64"
+    fi
+
+    dnl first we check the system location for boost libraries
+    dnl this location ist chosen if boost libraries are installed with the --layout=system option
+    dnl or if you install boost with RPM
+    if test "$ac_boost_path" != ""; then
+        BOOST_CPPFLAGS="-I$ac_boost_path/include"
+        for ac_boost_path_tmp in $libsubdirs; do
+                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
+                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
+                        break
+                fi
+        done
+    elif test "$cross_compiling" != yes; then
+        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+                for libsubdir in $libsubdirs ; do
+                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                done
+                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
+                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+                break;
+            fi
+        done
+    fi
+
+    dnl overwrite ld flags if we have required special directory with
+    dnl --with-boost-libdir parameter
+    if test "$ac_boost_lib_path" != ""; then
+       BOOST_LDFLAGS="-L$ac_boost_lib_path"
+    fi
+
+    CPPFLAGS_SAVED="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+    export CPPFLAGS
+
+    LDFLAGS_SAVED="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+    export LDFLAGS
+
+    AC_REQUIRE([AC_PROG_CXX])
+    AC_LANG_PUSH(C++)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    @%:@include <boost/version.hpp>
+    ]], [[
+    #if BOOST_VERSION >= $WANT_BOOST_VERSION
+    // Everything is okay
+    #else
+    #  error Boost version is too old
+    #endif
+    ]])],[
+        AC_MSG_RESULT(yes)
+    succeeded=yes
+    found_system=yes
+        ],[
+        ])
+    AC_LANG_POP([C++])
+
+
+
+    dnl if we found no boost with system layout we search for boost libraries
+    dnl built and installed without the --layout=system option or for a staged(not installed) version
+    if test "x$succeeded" != "xyes"; then
+        _version=0
+        if test "$ac_boost_path" != ""; then
+            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                    V_CHECK=`expr $_version_tmp \> $_version`
+                    if test "$V_CHECK" = "1" ; then
+                        _version=$_version_tmp
+                    fi
+                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+                done
+            fi
+        else
+            if test "$cross_compiling" != yes; then
+                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                            V_CHECK=`expr $_version_tmp \> $_version`
+                            if test "$V_CHECK" = "1" ; then
+                                _version=$_version_tmp
+                                best_path=$ac_boost_path
+                            fi
+                        done
+                    fi
+                done
+
+                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+                if test "$ac_boost_lib_path" = ""; then
+                    for libsubdir in $libsubdirs ; do
+                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                    done
+                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
+                fi
+            fi
+
+            if test "x$BOOST_ROOT" != "x"; then
+                for libsubdir in $libsubdirs ; do
+                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                done
+                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
+                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
+                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
+                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
+                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
+                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
+                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
+                    fi
+                fi
+            fi
+        fi
+
+        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+        export CPPFLAGS
+        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+        export LDFLAGS
+
+        AC_LANG_PUSH(C++)
+            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+        @%:@include <boost/version.hpp>
+        ]], [[
+        #if BOOST_VERSION >= $WANT_BOOST_VERSION
+        // Everything is okay
+        #else
+        #  error Boost version is too old
+        #endif
+        ]])],[
+            AC_MSG_RESULT(yes)
+        succeeded=yes
+        found_system=yes
+            ],[
+            ])
+        AC_LANG_POP([C++])
+    fi
+
+    if test "$succeeded" != "yes" ; then
+        if test "$_version" = "0" ; then
+            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
+        else
+            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
+        fi
+        # execute ACTION-IF-NOT-FOUND (if present):
+        ifelse([$3], , :, [$3])
+    else
+        AC_SUBST(BOOST_CPPFLAGS)
+        AC_SUBST(BOOST_LDFLAGS)
+        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+        # execute ACTION-IF-FOUND (if present):
+        ifelse([$2], , :, [$2])
+    fi
+
+    CPPFLAGS="$CPPFLAGS_SAVED"
+    LDFLAGS="$LDFLAGS_SAVED"
+fi
+
+])

m4/ax_boost_date_time.m4

@@ -0,0 +1,114 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_boost_date_time.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_DATE_TIME
+#
+# DESCRIPTION
+#
+#   Test for Date_Time library from the Boost C++ libraries. The macro
+#   requires a preceding call to AX_BOOST_BASE. Further documentation is
+#   available at <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_DATE_TIME_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_DATE_TIME
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2008 Michael Tindal
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 19
+
+AC_DEFUN([AX_BOOST_DATE_TIME],
+[
+	AC_ARG_WITH([boost-date-time],
+	AS_HELP_STRING([--with-boost-date-time@<:@=special-lib@:>@],
+                   [use the Date_Time library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-date-time=boost_date_time-gcc-mt-d-1_33_1 ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_date_time_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_date_time_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::Date_Time library is available,
+					   ax_cv_boost_date_time,
+        [AC_LANG_PUSH([C++])
+		 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/date_time/gregorian/gregorian_types.hpp>]],
+                                   [[using namespace boost::gregorian; date d(2002,Jan,10);
+                                     return 0;
+                                   ]])],
+         ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
+         AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_date_time" = "xyes"; then
+			AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+            ax_lib="-lboost_date_time"
+
+            if test "x$ax_boost_user_date_time_lib" = "x"; then
+                for libextension in `ls $BOOSTLIBDIR/libboost_date_time*.so* $BOOSTLIBDIR/libboost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_date_time.*\)\.so.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
+                                 [link_date_time="no"])
+				done
+                if test "x$link_date_time" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_date_time*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e 's;^\(boost_date_time.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
+                                 [link_date_time="no"])
+				done
+                fi
+            else
+               for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do
+				      AC_CHECK_LIB($ax_lib, main,
+                                   [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
+                                   [link_date_time="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_date_time" != "xyes"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])

m4/ax_boost_filesystem.m4

@@ -0,0 +1,118 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_FILESYSTEM
+#
+# DESCRIPTION
+#
+#   Test for Filesystem library from the Boost C++ libraries. The macro
+#   requires a preceding call to AX_BOOST_BASE. Further documentation is
+#   available at <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_FILESYSTEM_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_FILESYSTEM
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2009 Michael Tindal
+#   Copyright (c) 2009 Roman Rybalko <libtorrent@romanr.info>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 22
+
+AC_DEFUN([AX_BOOST_FILESYSTEM],
+[
+	AC_ARG_WITH([boost-filesystem],
+	AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
+                   [use the Filesystem library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_filesystem_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_filesystem_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+		LIBS_SAVED=$LIBS
+		LIBS="$LIBS $BOOST_SYSTEM_LIB"
+		export LIBS
+
+        AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
+					   ax_cv_boost_filesystem,
+        [AC_LANG_PUSH([C++])
+         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
+                                   [[using namespace boost::filesystem;
+                                   path my_path( "foo/bar/data.txt" );
+                                   return 0;]])],
+					       ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
+         AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_filesystem" = "xyes"; then
+			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+            if test "x$ax_boost_user_filesystem_lib" = "x"; then
+                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.dylib$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                 [link_filesystem="no"])
+				done
+                if test "x$link_filesystem" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                 [link_filesystem="no"])
+				done
+		    fi
+            else
+               for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
+				      AC_CHECK_LIB($ax_lib, exit,
+                                   [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                   [link_filesystem="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_filesystem" != "xyes"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+		LDFLAGS="$LDFLAGS_SAVED"
+		LIBS="$LIBS_SAVED"
+	fi
+])

m4/ax_boost_system.m4

@@ -0,0 +1,120 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_SYSTEM
+#
+# DESCRIPTION
+#
+#   Test for System library from the Boost C++ libraries. The macro requires
+#   a preceding call to AX_BOOST_BASE. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_SYSTEM_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_SYSTEM
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2008 Michael Tindal
+#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 14
+
+AC_DEFUN([AX_BOOST_SYSTEM],
+[
+	AC_ARG_WITH([boost-system],
+	AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
+                   [use the System library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-system=boost_system-gcc-mt ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_system_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_system_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+        AC_REQUIRE([AC_CANONICAL_BUILD])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::System library is available,
+					   ax_cv_boost_system,
+        [AC_LANG_PUSH([C++])
+			 CXXFLAGS_SAVE=$CXXFLAGS
+
+			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
+                                   [[boost::system::system_category]])],
+                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
+			 CXXFLAGS=$CXXFLAGS_SAVE
+             AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_system" = "xyes"; then
+			AC_SUBST(BOOST_CPPFLAGS)
+
+			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+
+			LDFLAGS_SAVE=$LDFLAGS
+            if test "x$ax_boost_user_system_lib" = "x"; then
+                for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                 [link_system="no"])
+				done
+                if test "x$link_system" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                 [link_system="no"])
+				done
+                fi
+
+            else
+               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
+				      AC_CHECK_LIB($ax_lib, exit,
+                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                   [link_system="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_system" = "xno"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])

m4/ax_boost_unit_test_framework.m4

@@ -0,0 +1,138 @@
+# ================================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_boost_unit_test_framework.html
+# ================================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_UNIT_TEST_FRAMEWORK
+#
+# DESCRIPTION
+#
+#   Test for Unit_Test_Framework library from the Boost C++ libraries. The
+#   macro requires a preceding call to AX_BOOST_BASE. Further documentation
+#   is available at <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_UNIT_TEST_FRAMEWORK
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 17
+
+AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
+[
+	AC_ARG_WITH([boost-unit-test-framework],
+	AS_HELP_STRING([--with-boost-unit-test-framework@<:@=special-lib@:>@],
+                   [use the Unit_Test_Framework library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-unit-test-framework=boost_unit_test_framework-gcc ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_unit_test_framework_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_unit_test_framework_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is available,
+					   ax_cv_boost_unit_test_framework,
+        [AC_LANG_PUSH([C++])
+			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]],
+                                    [[using boost::unit_test::test_suite;
+							 test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])],
+                   ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no)
+         AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
+			AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+            ax_lib="-lboost_unit_test_framework"
+
+            if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
+			saved_ldflags="${LDFLAGS}"
+                for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do
+                    if test -r $monitor_library ; then
+                       libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'`
+                       ax_lib=${libextension}
+                       link_unit_test_framework="yes"
+                    else
+                       link_unit_test_framework="no"
+                    fi
+
+			    if test "x$link_unit_test_framework" = "xyes"; then
+                      BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
+                      AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+					  break
+				    fi
+                done
+                if test "x$link_unit_test_framework" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_unit_test_framework*.{dll,a}* 2>/dev/null  | sed 's,.*/,,' | sed -e 's;^\(boost_unit_test_framework.*\)\.dll.*$;\1;' -e 's;^\(boost_unit_test_framework.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"; AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) link_unit_test_framework="yes"; break],
+                                 [link_unit_test_framework="no"])
+				done
+                fi
+            else
+                link_unit_test_framework="no"
+			saved_ldflags="${LDFLAGS}"
+                for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do
+                   if test "x$link_unit_test_framework" = "xyes"; then
+                      break;
+                   fi
+                   for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do
+                   if test -r $unittest_library ; then
+                       libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'`
+                       ax_lib=${libextension}
+                       link_unit_test_framework="yes"
+                    else
+                       link_unit_test_framework="no"
+                    fi
+
+				if test "x$link_unit_test_framework" = "xyes"; then
+                        BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
+                        AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+					    break
+				    fi
+                  done
+               done
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_unit_test_framework" != "xyes"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])

m4/ax_lapack.m4

@@ -0,0 +1,131 @@
+# ===========================================================================
+#         http://www.gnu.org/software/autoconf-archive/ax_lapack.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LAPACK([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro looks for a library that implements the LAPACK linear-algebra
+#   interface (see http://www.netlib.org/lapack/). On success, it sets the
+#   LAPACK_LIBS output variable to hold the requisite library linkages.
+#
+#   To link with LAPACK, you should link with:
+#
+#     $LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS
+#
+#   in that order. BLAS_LIBS is the output variable of the AX_BLAS macro,
+#   called automatically. FLIBS is the output variable of the
+#   AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is
+#   sometimes necessary in order to link with F77 libraries. Users will also
+#   need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same
+#   reason.
+#
+#   The user may also use --with-lapack=<lib> in order to use some specific
+#   LAPACK library <lib>. In order to link successfully, however, be aware
+#   that you will probably need to use the same Fortran compiler (which can
+#   be set via the F77 env. var.) as was used to compile the LAPACK and BLAS
+#   libraries.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a LAPACK library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_LAPACK.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu>
+#
+#   This program 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 program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
+
+AU_ALIAS([ACX_LAPACK], [AX_LAPACK])
+AC_DEFUN([AX_LAPACK], [
+AC_REQUIRE([AX_BLAS])
+ax_lapack_ok=no
+
+AC_ARG_WITH(lapack,
+        [AS_HELP_STRING([--with-lapack=<lib>], [use LAPACK library <lib>])])
+case $with_lapack in
+        yes | "") ;;
+        no) ax_lapack_ok=disable ;;
+        -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;;
+        *) LAPACK_LIBS="-l$with_lapack" ;;
+esac
+
+# Get fortran linker name of LAPACK function to check for.
+AC_F77_FUNC(cheev)
+
+# We cannot use LAPACK if BLAS is not found
+if test "x$ax_blas_ok" != xyes; then
+        ax_lapack_ok=noblas
+        LAPACK_LIBS=""
+fi
+
+# First, check LAPACK_LIBS environment variable
+if test "x$LAPACK_LIBS" != x; then
+        save_LIBS="$LIBS"; LIBS="$LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
+        AC_MSG_CHECKING([for $cheev in $LAPACK_LIBS])
+        AC_TRY_LINK_FUNC($cheev, [ax_lapack_ok=yes], [LAPACK_LIBS=""])
+        AC_MSG_RESULT($ax_lapack_ok)
+        LIBS="$save_LIBS"
+        if test $ax_lapack_ok = no; then
+                LAPACK_LIBS=""
+        fi
+fi
+
+# LAPACK linked to by default?  (is sometimes included in BLAS lib)
+if test $ax_lapack_ok = no; then
+        save_LIBS="$LIBS"; LIBS="$LIBS $BLAS_LIBS $FLIBS"
+        AC_CHECK_FUNC($cheev, [ax_lapack_ok=yes])
+        LIBS="$save_LIBS"
+fi
+
+# Generic LAPACK library?
+for lapack in lapack lapack_rs6k; do
+        if test $ax_lapack_ok = no; then
+                save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+                AC_CHECK_LIB($lapack, $cheev,
+                    [ax_lapack_ok=yes; LAPACK_LIBS="-l$lapack"], [], [$FLIBS])
+                LIBS="$save_LIBS"
+        fi
+done
+
+AC_SUBST(LAPACK_LIBS)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_lapack_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_LAPACK,1,[Define if you have LAPACK library.]),[$1])
+        :
+else
+        ax_lapack_ok=no
+        $2
+fi
+])dnl AX_LAPACK