From 47346659d50091c44f4a0641ca0b5fb31091c0d4 Mon Sep 17 00:00:00 2001
From: Nicolas Marsic <nicolas.marsic@gmail.com>
Date: Fri, 15 Jun 2012 14:59:01 +0000
Subject: [PATCH] Auto mapping part 2
---
FunctionSpace/LocalFunctionSpace.cpp | 2 +-
FunctionSpace/LocalFunctionSpace.h | 1 +
FunctionSpace/LocalFunctionSpaceScalar.cpp | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/FunctionSpace/LocalFunctionSpace.cpp b/FunctionSpace/LocalFunctionSpace.cpp
index 014ffc4b76..1632674890 100644
--- a/FunctionSpace/LocalFunctionSpace.cpp
+++ b/FunctionSpace/LocalFunctionSpace.cpp
@@ -28,7 +28,7 @@ void LocalFunctionSpace::selectTransform(int form){
break;
default:
- throw Exception ("Unknow %d-form", form);
+ throw Exception ("Unknown '%d-form'", form);
break;
}
}
diff --git a/FunctionSpace/LocalFunctionSpace.h b/FunctionSpace/LocalFunctionSpace.h
index 38b6fc0495..ce136fa71a 100644
--- a/FunctionSpace/LocalFunctionSpace.h
+++ b/FunctionSpace/LocalFunctionSpace.h
@@ -112,6 +112,7 @@ inline fullVector<double> LocalFunctionSpace::form1(const Jacobian& jac,
double v,
double w){
return jac.grad(u, v);
+ //! @todo Missing Orientation !!
}
#endif
diff --git a/FunctionSpace/LocalFunctionSpaceScalar.cpp b/FunctionSpace/LocalFunctionSpaceScalar.cpp
index 873ac6136e..677e5c2a33 100644
--- a/FunctionSpace/LocalFunctionSpaceScalar.cpp
+++ b/FunctionSpace/LocalFunctionSpaceScalar.cpp
@@ -32,10 +32,14 @@ double LocalFunctionSpaceScalar::interpolate
if(coef.size() < size)
throw Exception("Not enough coeficients for interpolation");
- double res = 0;
+ fullVector<double> uvw = jac->invMap(x, y);
+ double res = 0;
+
for(int i = 0; i < size; ++i){
+ //transform(*jac, uvw(0), uvw(1), 0);
+ //! @todo Interpolation rule ...
}
return res;
--
GitLab