From: Peter Schaefer <peter.schaefer@tuwien.ac.at>
Date: Wed, 18 Apr 2012 13:30:26 +0000 (+0200)
Subject: [src] kappa2
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=e0927f1c3ee56abb2d697378d2d34fed0df237f7;p=bacc.git

[src] kappa2
[src] VaterSohn globaler Flächeninhalt test
---

diff --git a/doc/doc.pdf b/doc/doc.pdf
index 5f9edd1..34dcdaa 100644
Binary files a/doc/doc.pdf and b/doc/doc.pdf differ
diff --git a/doc/doc.tex b/doc/doc.tex
index 1981c41..b47a27f 100644
--- a/doc/doc.tex
+++ b/doc/doc.tex
@@ -646,7 +646,8 @@ Zum Plotten (\ref{exmplAA_2DQuad})werden noch folgende Schritte ausgeführt
  \item $error =  \sqrt{\enorm{\phi}^2 - \enorm{\phi_{l}^{(i)}}^2}$
  \item $\mu_{l,i} = \norm{\varrho^{1/2}(\phi_{l/2}^{(i)} - \phi_{l}^{(i)} )}$
  \item $\eta_{l,i} = \enorm{\phi_{l/2}^{(i)} - \phi_{l}^{(i)}}$
- \item $\kappa_{l,i} =$
+ \item $\kappa_{l,i} = \sqrt{\enorm{\phi_{l/2}^{(i)}}-\enorm{\phi_{l/2}^{(i-1)}}}$
+ \item $\kappa2_{l,i} = \sqrt{\enorm{\phi_{l}^{(i)}}-\enorm{\phi_{l}^{(i-1)}}}$
 \end{itemize}
 
 \begin{figure}[ht]
diff --git a/src/A_plots.m b/src/A_plots.m
index b15d60b..e3e8bfb 100644
--- a/src/A_plots.m
+++ b/src/A_plots.m
@@ -50,6 +50,7 @@ for i = 1:length(files)
           ['error ' l0 l1{i}]...
           ['\mu ' l0 l1{i}]...
           ['\kappa ' l0 l1{i}]...
+          ['\kappa2 ' l0 l1{i}]...
           }';
       leg1 = {leg1{:}...
           [ l0 l1{i}]...
@@ -98,22 +99,23 @@ i=0;
 % shift2 = shift2+shift2/10;
 % error*(eta(l)-shift2)/error(l)
 
-loglog(repmat(X(:,i+1),1,6),[G_D(:,2+rows*i) ...
+loglog(repmat(X(:,i+1),1,7),[G_D(:,2+rows*i) ...
     G_D(:,2+8+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)...
     G_D(:,2+3+rows*i)...*G_D(1,2)/G_D(1,2+3+rows*i) ...
     [ 0; sqrt(G_D(2:end,2+9+rows*i)-G_D(1:end-1,2+9+rows*i))]...
+    [ 0; sqrt(G_D(2:end,2+2+rows*i)-G_D(1:end-1,2+2+rows*i))]...
     ],type2sym{i+1});
 hold on
 for i = 1:step-1
-loglog(repmat(X(:,i+1),1,6),[G_D(:,2+rows*i) ...
+loglog(repmat(X(:,i+1),1,7),[G_D(:,2+rows*i) ...
     G_D(:,2+8+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) ...
     [ 0; sqrt(G_D(2:end,2+9+rows*i)-G_D(1:end-1,2+9+rows*i))]...
+    [ 0; sqrt(G_D(2:end,2+2+rows*i)-G_D(1:end-1,2+2+rows*i))]...
     ],type2sym{i+1});
     
 end
diff --git a/src/A_step.m b/src/A_step.m
index daee5b5..d3daf1c 100644
--- a/src/A_step.m
+++ b/src/A_step.m
@@ -39,7 +39,7 @@ time = zeros(1,3);
   time(1) = toc;
 
   %Flaecheninhalte Berechnen (rhs)
-  b_fine = areaQuad(sit_fine);
+  b_fine = areaQuad(sit_fine);b_fine = areaQuad(sit_fine);
   
   b = areaQuad(G_S);
   hmin = 2.^-max(G_S,[],2);
@@ -166,10 +166,19 @@ time = zeros(1,3);
   
   tic
   er = [];
+
+  
+  old_C = G_C;
+  old_E = G_E;
+  old_S = G_S;
   
   %Netz Verfeinern, wie durch marked bestimmt
   [G_C, G_E, G_N, f, G_S, er] = refineQuad(G_C,G_E,G_N,G_S,marked);
   
+  %Vater Sohn test
+  assert(sum(areaQuad(old_S))==sum(areaQuad(G_S)),'Gesamtinhalt Fehlerhaft')
+  
+  
   time(3) = toc;
 %   if(~isempty(er))
 %     figure(10)