Commit d50be0ee authored by carambula's avatar carambula

Fix ambiguity complains in autodiff with g++-4.2.1; disable extended solver...

Fix ambiguity complains in autodiff with g++-4.2.1; disable extended solver tests that require matrix collections
parent 0b000d86
......@@ -14,3 +14,5 @@ Source/Solver/solver_k3biilu2/k3d.cpp
Source/Solver/solver_k3biilu2/k3d.h
.vscode/*
.DS_Store
#ifndef _VECTOR_H
#define _VECTOR_H
#ifndef _VECTORS_H
#define _VECTORS_H
#include "inmost.h"
#include "coord.h"
......
......@@ -231,16 +231,16 @@ namespace INMOST
rMatrix Value(const Storage & e) const
{
rMatrix ret = Arg.Value(e);
for(INMOST_DATA_ENUM_TYPE k = 0; k < ret.Rows(); ++k)
for(INMOST_DATA_ENUM_TYPE l = 0; l < ret.Cols(); ++l)
for(INMOST_DATA_ENUM_TYPE k = 0; k < ret.Rows(); ++k)
for(INMOST_DATA_ENUM_TYPE l = 0; l < ret.Cols(); ++l)
ret(k,l) = get_table(ret(k,l),Table);
return ret;
}
vMatrix Variable(const Storage & e) const
{
vMatrix ret = Arg.Variable(e);
for(INMOST_DATA_ENUM_TYPE k = 0; k < ret.Rows(); ++k)
for(INMOST_DATA_ENUM_TYPE l = 0; l < ret.Cols(); ++l)
for(INMOST_DATA_ENUM_TYPE k = 0; k < ret.Rows(); ++k)
for(INMOST_DATA_ENUM_TYPE l = 0; l < ret.Cols(); ++l)
ret(k,l) = get_table(ret(k,l),Table);
return ret;
}
......
......@@ -84,7 +84,7 @@
#define NOMINMAX
#include <mpi.h>
#if !defined(MSMPI_VER) && !defined(MPIO_INCLUDE) && defined(USE_MPI_FILE) && !defined(OMPI_PROVIDE_MPI_FILE_INTERFACE)
#include <mpio.h> //some versions of MPI doesn't include that
//#include <mpio.h> //some versions of MPI doesn't include that
#endif
#endif
......
This diff is collapsed.
......@@ -4,13 +4,13 @@ endif(USE_MESH)
if(USE_AUTODIFF)
add_subdirectory(autodiff_test000)
#add_subdirectory(autodiff_test001)
add_subdirectory(autodiff_test001)
add_subdirectory(autodiff_test002)
endif(USE_AUTODIFF)
if(USE_SOLVER)
add_subdirectory(solver_test000)
add_subdirectory(solver_test001)
#add_subdirectory(solver_test001)
add_subdirectory(solver_test002)
add_subdirectory(solver_test003)
endif(USE_SOLVER)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment