Skip to content
Snippets Groups Projects
Commit d6360a04 authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

Work without numpy

For some reason, when numpy is used, I can't use ctrl-c to stop
the program.  But numpy is not really used anyway, so let's get
rid of it.

[[Imported from SVN: r9861]]
parent d3aa699d
No related branches found
No related tags found
No related merge requests found
......@@ -97,7 +97,7 @@ public:
{
Python::runStream()
<< std::endl << "def orientationDirichletValues(x):"
<< std::endl << " rotation = numpy.array([[1,0,0], [0, 1, 0], [0, 0, 1]])"
<< std::endl << " rotation = [[1,0,0], [0, 1, 0], [0, 0, 1]]"
<< std::endl << " return rotation";
}
......@@ -130,7 +130,7 @@ public:
<< std::endl << " center = [0, 0, 0]"
<< std::endl << " center[1] = upper[1]/2.0"
<< std::endl << " rotation = numpy.array([[1,0,0], [0, math.cos(angle), -math.sin(angle)], [0, math.sin(angle), math.cos(angle)]])"
<< std::endl << " rotation = [[1,0,0], [0, math.cos(angle), -math.sin(angle)], [0, math.sin(angle), math.cos(angle)]]"
<< std::endl << " inEmbedded = [x[0]-center[0], x[1]-center[1], 0-center[2]]"
......@@ -149,7 +149,7 @@ public:
<< std::endl << " angle = " << totalAngle_ << " * x[0]/upper[0];"
<< std::endl << " angle *= " << homotopy_
<< std::endl << " rotation = numpy.array([[1,0,0], [0, math.cos(angle), -math.sin(angle)], [0, math.sin(angle), math.cos(angle)]])"
<< std::endl << " rotation = [[1,0,0], [0, math.cos(angle), -math.sin(angle)], [0, math.sin(angle), math.cos(angle)]]"
<< std::endl << " return rotation";
}
......@@ -185,7 +185,6 @@ int main (int argc, char *argv[]) try
Python::start();
Python::Reference main = Python::import("__main__");
Python::run("import math");
Python::run("import numpy");
//feenableexcept(FE_INVALID);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment