Mercurial > repos > public > sbplib

diff +scheme/Hypsyst3d.m @ 350:5d5652fe826a feature/hypsyst

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A commit before I try resolving the performance issues
author Ylva Rydin <ylva.rydin@telia.com>
date Wed, 02 Nov 2016 00:02:01 +0100
parents cd6a29ab3746
children 9b3d7fc61a36
line wrap: on
line diff
--- a/+scheme/Hypsyst3d.m	Thu Oct 13 09:34:30 2016 +0200
+++ b/+scheme/Hypsyst3d.m	Wed Nov 02 00:02:01 2016 +0100
@@ -10,6 +10,7 @@
         
         D % non-stabalized scheme operator
         A, B, C, E
+        Aevaluated,Bevaluated,Cevaluated, Eevaluated
         
         H % Discrete norm
         % Norms in the x, y and z directions
@@ -61,10 +62,10 @@
             obj.Xz=kr(obj.x,ones(m_y,1));
             obj.Yz=kr(ones(m_z,1),obj.y);
             
-            Aevaluated = obj.evaluateCoefficientMatrix(A, obj.X, obj.Y,obj.Z);
-            Bevaluated = obj.evaluateCoefficientMatrix(B, obj.X, obj.Y,obj.Z);
-            Cevaluated = obj.evaluateCoefficientMatrix(C, obj.X, obj.Y,obj.Z);
-            Eevaluated = obj.evaluateCoefficientMatrix(E, obj.X, obj.Y,obj.Z);
+            obj.Aevaluated = obj.evaluateCoefficientMatrix(A, obj.X, obj.Y,obj.Z);
+            obj.Bevaluated = obj.evaluateCoefficientMatrix(B, obj.X, obj.Y,obj.Z);
+            obj.Cevaluated = obj.evaluateCoefficientMatrix(C, obj.X, obj.Y,obj.Z);
+            obj.Eevaluated = obj.evaluateCoefficientMatrix(E, obj.X, obj.Y,obj.Z);
             
             obj.n = length(A(obj.params,0,0,0));
             
@@ -82,7 +83,7 @@
             D1_y = kr(I_n, I_x, ops_y.D1,I_z);
             obj.Hyi = kr(I_n, I_x, ops_y.HI,I_z);
             D1_z = kr(I_n, I_x, I_y,ops_z.D1);
-            obj.Hzi = kr(I_n, I_x,I_y, ops_y.HI);
+            obj.Hzi = kr(I_n, I_x,I_y, ops_z.HI);
             
             obj.e_w = kr(I_n, ops_x.e_l, I_y,I_z);
             obj.e_e = kr(I_n, ops_x.e_r, I_y,I_z);
@@ -95,7 +96,7 @@
             obj.h=[ops_x.h ops_y.h ops_x.h];
             obj.order=order;
             
-            obj.D=-Aevaluated*D1_x-Bevaluated*D1_y-Cevaluated*D1_z-Eevaluated;
+            obj.D=-obj.Aevaluated*D1_x-obj.Bevaluated*D1_y-obj.Cevaluated*D1_z-obj.Eevaluated;
         end
         
         % Closure functions return the opertors applied to the own doamin to close the boundary