[src]A_plots angepasst an mehrere Funktionen

diff --git a/src/A_plots.m b/src/A_plots.m
index 96897089ecc2610f920cd4ecaf69ccfb1f0d8195..ae0219cddde9cfc1c659ee261c2bdfd6f0fd3fdf 100644 (file)
--- a/src/A_plots.m
+++ b/src/A_plots.m
@@ -10,7 +10,7 @@ leg1 = {};
 leg2 = {};
 sym = {};
 
-rows = 9;
+rows = 8;
 
 
 for i = 1:length(files)
@@ -91,7 +91,7 @@ shift = shift+shift/10;
 % shift2 = shift2+shift2/10;
 % error*(eta(l)-shift2)/error(l)
 
-loglog(X(:,[2+(0:rows-6)]+rows*i),[G_D(:,2+rows*i) ...
+loglog(X(:,[2+(0:rows-5)]+rows*i),[G_D(:,2+rows*i) ...
     G_D(:,2+1+rows*i)...*(G_D(k,2)-shift)/G_D(k,3)...*G_D(1,2)/G_D(1,2+1+rows*i) ...
 ...    sqrt(abs(sol - G_D(:,2+2+rows*i)))...*G_D(1,2)/sqrt(abs(sol - G_D(1,2+2+rows*i)))...
     sqrt(abs(sol - G_D(:,2+2+rows*i)))...*(G_D(k,2)-shift)/G_D(k,3)...
@@ -99,7 +99,7 @@ loglog(X(:,[2+(0:rows-6)]+rows*i),[G_D(:,2+rows*i) ...
     ],sym{i+1});
 hold on
 for i = 1:step-1
-loglog(X(:,[2+(0:rows-2)]+rows*i),[G_D(:,2+rows*i) ...
+loglog(X(:,[2+(0:rows-5)]+rows*i),[G_D(:,2+rows*i) ...
     G_D(:,2+1+rows*i)...*G_D(1,2)/G_D(1,2+1+rows*i) ...
     sqrt(abs(sol - G_D(:,2+2+rows*i)))...*G_D(1,2)/sqrt(abs(sol - G_D(1,2+2+rows*i)))...
     G_D(:,2+3+rows*i)...*G_D(1,2)/G_D(1,2+3+rows*i) ...
@@ -127,7 +127,7 @@ for i = 1:step-1
 end
 loglog(X(:,1),repmat(sol,size(X,1),1),'r-.')
 hold off
-ylim([min(min(G_D(:,[4+(0:step-1)*4]))) 1.005*max(max(G_D(:,[4+(0:step-1)*4])))])
+ylim([min(min(G_D(:,[4+(0:step-1)*rows]))) 1.005*max(max(G_D(:,[4+(0:step-1)*rows])))])
 title('Energie Norm')
 xlabel('Elemente');
 ylabel('eNorm^2');
@@ -139,14 +139,18 @@ print('-r600','-depsc',[printt '_norm.eps'])
 %% Plotte HMIN HMAX
 figure(6)
 i=0;
-loglog(X(:,1:3+rows*i),[...
+loglog(X(:,(1:3)+rows*i),[...
     G_D(:,2+4+rows*i)...
     G_D(:,2+5+rows*i)...
     G_D(:,2+6+rows*i)...
     ],sym{i+1});
 hold on
 for i = 1:step-1
-    loglog(X(:,2+i*rows),G_D(:,2+2+i*rows),sym{i+1});
+loglog(X(:,(1:3)+rows*i),[...
+    G_D(:,2+4+rows*i)...
+    G_D(:,2+5+rows*i)...
+    G_D(:,2+6+rows*i)...
+    ],sym{i+1});
 end
 loglog(X(:,1),[7*X(:,1).^(-1/2),3*X(:,1).^(-1/4),2*X(:,1).^(-3/4)],'-.')
 hold off

diff --git a/src/A_step.m b/src/A_step.m
index 5fe689372015b75547922605739da77893b915e9..096c33b334e039a3542d7f5240f06ca6aee47d75 100644 (file)
--- a/src/A_step.m
+++ b/src/A_step.m
@@ -92,7 +92,7 @@ time = zeros(1,3);
 %     xe = x'*A*x;
     xe = b'*x;
     
-    eta = xe_fine-xe;
+    eta = abs(xe_fine-xe);
     
    save_A{i} = A_fine;
    save_x{i} = x_fine;