changeset 558:54c775c3348a feature/grids/laplace_refactor

Clean up use of the sign in boundary and interface routines
author Jonatan Werpers <jonatan@werpers.com>
date Tue, 29 Aug 2017 12:48:30 +0200
parents 2a856a589510
children 6132c52bf923
files +scheme/LaplaceCurvilinear.m
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/+scheme/LaplaceCurvilinear.m	Tue Aug 29 12:32:57 2017 +0200
+++ b/+scheme/LaplaceCurvilinear.m	Tue Aug 29 12:48:30 2017 +0200
@@ -235,7 +235,7 @@
                     A_n = spdiag(a_n);
                     A_t = spdiag(a_t);
 
-                    F = (s * A_n * d_n' + s * A_t*d_t')';
+                    F = s*(A_n*d_n' + A_t*d_t')';
 
                     u = obj;
 
@@ -256,11 +256,11 @@
                 case {'N','n','neumann'}
                     A_n = spdiag(a_n);
                     A_t = spdiag(a_t);
-                    d = (A_n * d_n' + A_t*d_t')';
+                    d = s*(A_n * d_n' + A_t*d_t')';
 
-                    tau1 = -s;
+                    tau1 = -1;
                     tau2 = 0;
-                    tau = obj.a * obj.Ji*(tau1*e + tau2*d);
+                    tau = s*obj.a*obj.Ji*(tau1*e + tau2*d);
 
                     closure = halfnorm_inv*tau*d';
                     penalty = -halfnorm_inv*tau;
@@ -299,8 +299,8 @@
             A_n_v = spdiag(a_n_v);
             A_t_v = spdiag(a_t_v);
 
-            F_u = (s_u * A_n_u * d_n_u' + s_u * A_t_u*d_t_u')';
-            F_v = (s_v * A_n_v * d_n_v' + s_v * A_t_v*d_t_v')';
+            F_u = s_u*(A_n_u * d_n_u' + A_t_u*d_t_u')';
+            F_v = s_v*(A_n_v * d_n_v' + A_t_v*d_t_v')';
 
             u = obj;
             v = neighbour_scheme;