From: Peter Schaefer <peter.schaefer@tuwien.ac.at>
Date: Thu, 29 Mar 2012 16:01:51 +0000 (+0200)
Subject: [src] eta wird anders berechnet
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=26df7b041dc591529d5199d04e688a5f6a3d13cf;p=bacc.git

[src] eta wird anders berechnet
[src] error = phi - phi_h/2
---

diff --git a/doc/doc.pdf b/doc/doc.pdf
index add9a02..cf94a25 100644
Binary files a/doc/doc.pdf and b/doc/doc.pdf differ
diff --git a/doc/doc.tex b/doc/doc.tex
index 3d663ab..1029755 100644
--- a/doc/doc.tex
+++ b/doc/doc.tex
@@ -631,7 +631,7 @@ Zum Plotten (\ref{exmplAA_2DQuad})werden noch folgende Schritte ausgeführt
  \item Berechne Galerkinlösung $\phi_{l}^{(i)} \in P^0(\T_l^{(i)})$
 %  \item $\enorm{\phi^{(i)}_{l/2}}$
 %  \item $\enorm{\phi^{(i)}_l}$
- \item $error =  \sqrt{\enorm{\phi}^2 - \enorm{\phi_l^{(i)}}^2}$
+ \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)}}$
 
diff --git a/src/A_step.m b/src/A_step.m
index 038d47f..520155e 100644
--- a/src/A_step.m
+++ b/src/A_step.m
@@ -80,22 +80,26 @@ time = zeros(1,3);
     xd_fine = xo_fine'-x_fine;
     
     % |||h/2 -h|||
-    eta = xd_fine'*A_fine*xd_fine;
+%     eta = xd_fine'*A_fine*xd_fine;
     
     % \tilde \mu ( h/2 -h + L_2 )
     mu = hmin.*b.*sum((x_fine(f2s)'-repmat(x',4,1)).^2)'/4;
 
 
     %Energienorm^2 Berechnen |||h||| & |||h/2|||
-    xe_fine = x_fine'*A_fine*x_fine;
-    xe = x'*A*x;
+%     xe_fine = x_fine'*A_fine*x_fine;
+    xe_fine = b_fine'*x_fine;
+%     xe = x'*A*x;
+    xe = b'*x;
+    
+    eta = xe_fine-xe;
     
    save_A{i} = A_fine;
    save_x{i} = x_fine;
     
     
     
-    data = [data type(i) sqrt(sum(tmu)) sqrt(eta) xe_fine sqrt(sum(mu))...
+    data = [data type(i) sqrt(sum(tmu)) sqrt(eta) xe sqrt(sum(mu))...
         min(hmin)/max(hmax) min(hmax)/max(hmax) min(hmin./hmax)];
   end
   time(2) = toc;