[src] update fürst test_calcInt1

git-svn-id: https://drops.fb12.tu-berlin.de/svn/bacc/trunk@65 26120e32-c555-405d-b3e1-1f783fb42516

diff --git a/src/meshSave/Iso320_1.mat b/src/meshSave/Iso320_1.mat
new file mode 100644 (file)
index 0000000..c6984d8
Binary files /dev/null and b/src/meshSave/Iso320_1.mat differ

diff --git a/src/meshSave/Iso320_2.mat b/src/meshSave/Iso320_2.mat
new file mode 100644 (file)
index 0000000..03bb063
Binary files /dev/null and b/src/meshSave/Iso320_2.mat differ

diff --git a/src/meshSave/Iso320_3.mat b/src/meshSave/Iso320_3.mat
new file mode 100644 (file)
index 0000000..53caa52
Binary files /dev/null and b/src/meshSave/Iso320_3.mat differ

diff --git a/src/meshSave/Iso320_4.mat b/src/meshSave/Iso320_4.mat
new file mode 100644 (file)
index 0000000..3ad8967
Binary files /dev/null and b/src/meshSave/Iso320_4.mat differ

diff --git a/src/meshSave/Iso320_5.mat b/src/meshSave/Iso320_5.mat
new file mode 100644 (file)
index 0000000..8d5e632
Binary files /dev/null and b/src/meshSave/Iso320_5.mat differ

diff --git a/src/meshSave/anIso320_1.mat b/src/meshSave/anIso320_1.mat
new file mode 100644 (file)
index 0000000..40119e5
Binary files /dev/null and b/src/meshSave/anIso320_1.mat differ

diff --git a/src/meshSave/anIso320_2.mat b/src/meshSave/anIso320_2.mat
new file mode 100644 (file)
index 0000000..0ede8b8
Binary files /dev/null and b/src/meshSave/anIso320_2.mat differ

diff --git a/src/meshSave/anIso320_3.mat b/src/meshSave/anIso320_3.mat
new file mode 100644 (file)
index 0000000..25eb052
Binary files /dev/null and b/src/meshSave/anIso320_3.mat differ

diff --git a/src/meshSave/anIso320_4.mat b/src/meshSave/anIso320_4.mat
new file mode 100644 (file)
index 0000000..beaa16c
Binary files /dev/null and b/src/meshSave/anIso320_4.mat differ

diff --git a/src/t.mat b/src/t.mat
new file mode 100644 (file)
index 0000000..9808609
Binary files /dev/null and b/src/t.mat differ

diff --git a/src/test_calcInt1.m b/src/test_calcInt1.m
index 89515a50fc6c2ff1892dbea5b9a756c095272002..ad6da4796c99965fc5b3a21471245e308b6121c8 100644 (file)
--- a/src/test_calcInt1.m
+++ b/src/test_calcInt1.m
@@ -1 +1 @@
-\r\rcoo = @(h,diff)[0 0 0;1 0 0; 1 1 0;0 1  0; 0 0 0 ; 0+h 0 0; 0+h h 0 ; 0 h 0]+[zeros(4,3);repmat(diff,4,1)];\relements=[1 2 3 4;5 6 7 8];\rneigh = zeros(2,8);\rdat = [];\r\rdiff = [2 0 0];\r\r%% Laage Übersicht\rfigure(1)\rh = 1;\rcoordinates=coo(h,diff)\rcurrent = coordinates(elements(1,[1:4,1])',:);\rfill3(current(:,1),current(:,2),current(:,3),'g');\rhold on\rcurrent = coordinates(elements(2,[1:4,1])',:);\rfill3(current(:,1),current(:,2),current(:,3),'b');\r\rh = h/2;\rcoordinates=coo(h,diff);\rcurrent = coordinates(elements(2,[1:4,1])',:);\rfill3(current(:,1),current(:,2),current(:,3),'y');\rhold off\rlegend('Element1(h)','Element2(h)','Element2(h/2)');\rtitle('Laage der Elemente');\r\r%% Integrale bei kleiner werdenden Elementen\r\rh = 2;\rfor I = 1:50\r\r  h = h/2;\r  coordinates=coo(h,diff);\r  \r  A0 = mex_build_AU(coordinates,elements,0,0);\r  A2 = mex_build_AU(coordinates,elements,1,2);\r  A1 = mex_build_AU(coordinates,elements,1,1);\r  I\r  dat(I,1:4) = [h A0(1,2) A2(1,2) A1(1,2)];\r    dat(dat<0)=0;\rend\r\rfigure(2)\rloglog(dat(:,1),abs(dat(:,2)),dat(:,1),abs(dat(:,3)),dat(:,1),abs(dat(:,4)));\r\rlegend('Analytisch','Quad Element','Element vertauschen','location','southeast');\rxlabel('Elementgroesse (kürzeste Seite)');\rylabel('Integral');\rtitle('Integral bei kleiner werdenden Element');\r\r%% Netzverfeinerung ab einem Wert\r\rh =  (1/2)^25;\rcoordinates=coo(h,diff);\r\rA_loadMesh(coordinates,elements,neigh);\rdatA=[];\rfor I = 1:5\r  datA(I,:) = A_stepIso(1,[0 1 3 2],1,0);\r  I\rend\rfigure(3)\rloglog(datA(2:end,1),datA(2:end,3),datA(2:end,1),datA(2:end,6),datA(2:end,1),datA(2:end,12),datA(2:end,1),datA(2:end,9))\r\rlegend('Analytisch','Element vertauschen','Quad Element','Quad Achse','location','northeast');\rxlabel('Anzahl der Elemente');\rylabel('mu Schaetzer');\rtitle('mu Schaetzer mit "schlechtem" Startnetz');\r\rfigure(4)\rloglog(datA(:,1),datA(:,4),datA(:,1),datA(:,7),datA(:,1),datA(:,13),datA(:,1),datA(:,10))\r\rlegend('Analytisch','Element vertauschen','Quad Element','Quad Achse','location','southeast');\rxlabel('Anzahl der Elemente');\rylabel('EnergieNorm ^2 ');\rtitle('EnergieNorm ^2 mit "schlechtem" Startnetz');\r\rdatA\r
\ No newline at end of file
+\r\rcoo = @(h,diff)[0 0 0;1 0 0; 1 1 0;0 1  0; 0 0 0 ; 0+h 0 0; 0+h h 0 ; 0 h 0]+[zeros(4,3);repmat(diff,4,1)];\relements=[1 2 3 4;5 6 7 8];\rneigh = zeros(2,8);\rdat = [];\r\rdiff = [2 0 0];\r\r%% Laage Übersicht\rfigure(1)\rh = 1;\rcoordinates=coo(h,diff)\rcurrent = coordinates(elements(1,[1:4,1])',:);\rfill3(current(:,1),current(:,2),current(:,3),'g');\rhold on\rcurrent = coordinates(elements(2,[1:4,1])',:);\rfill3(current(:,1),current(:,2),current(:,3),'b');\r\rh = h/2;\rcoordinates=coo(h,diff);\rcurrent = coordinates(elements(2,[1:4,1])',:);\rfill3(current(:,1),current(:,2),current(:,3),'y');\rhold off\rlegend('Element1(h)','Element2(h)','Element2(h/2)');\rtitle('Laage der Elemente');\r\r%% Integrale bei kleiner werdenden Elementen\r\rh = 2;\rfor I = 1:50\r\r  h = h/2;\r  coordinates=coo(h,diff);\r  \r  A0 = mex_build_AU(coordinates,elements,0,0);\r  A2 = mex_build_AU(coordinates,elements,1,2);\r  A1 = mex_build_AU(coordinates,elements,1,1);\r  I\r  dat(I,1:4) = [h A0(1,2) A2(1,2) A1(1,2)];\r    dat(dat<0)=0;\rend\r\rfigure(2)\rloglog(dat(:,1),abs(dat(:,2)),dat(:,1),abs(dat(:,3)),dat(:,1),abs(dat(:,4)));\r\rlegend('Analytisch','Quad Element','Element vertauschen','location','southeast');\rxlabel('Elementgroesse (kürzeste Seite)');\rylabel('Integral');\rtitle('Integral bei kleiner werdenden Element');\r\r%% Netzverfeinerung ab einem Wert\r\rh =  (1/2)^25;\rcoordinates=coo(h,diff);\r\rA_loadMesh(coordinates,elements,neigh);\rdatA=[];\rfor I = 1:5\r  datA(I,:) = A_stepIso(5,[0 1 3 2]);\r%   datA(I,:) = A_stepAniso(6,[0 1 3 2],1,0);\r  I\rend\rfigure(3)\rloglog(datA(2:end,1),datA(2:end,3),datA(2:end,1),datA(2:end,6),datA(2:end,1),datA(2:end,12),datA(2:end,1),datA(2:end,9))\r\rlegend('Analytisch','Element vertauschen','Quad Element','Quad Achse','location','northeast');\rxlabel('Anzahl der Elemente');\rylabel('mu Schaetzer');\rtitle('mu Schaetzer mit "schlechtem" Startnetz');\r\rfigure(4)\rloglog(datA(:,1),datA(:,4),datA(:,1),datA(:,7),datA(:,1),datA(:,13),datA(:,1),datA(:,10))\r\rlegend('Analytisch','Element vertauschen','Quad Element','Quad Achse','location','southeast');\rxlabel('Anzahl der Elemente');\rylabel('EnergieNorm ^2 ');\rtitle('EnergieNorm ^2 mit "schlechtem" Startnetz');\r\rdatA\r
\ No newline at end of file