From e0927f1c3ee56abb2d697378d2d34fed0df237f7 Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Wed, 18 Apr 2012 15:30:26 +0200 Subject: [PATCH] =?utf8?q?[src]=20kappa2=20[src]=20VaterSohn=20globaler=20?= =?utf8?q?Fl=C3=A4cheninhalt=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- doc/doc.pdf | Bin 332621 -> 332843 bytes doc/doc.tex | 3 ++- src/A_plots.m | 8 +++++--- src/A_step.m | 11 ++++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/doc/doc.pdf b/doc/doc.pdf index 5f9edd12531d941832268c01652762e707b63b29..34dcdaa8c4e97af06ed0cea4fa2b660aeb4820ad 100644 GIT binary patch delta 6983 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 delta 6747 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 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) -- 2.47.3