From 7e990ddd3da69ee48e2bb6a5828e4573263295d7 Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Tue, 31 Jul 2012 13:06:24 +0200 Subject: [PATCH] neuer Sol Test --- doc/doc.pdf | Bin 353281 -> 353285 bytes doc/doc.tex | 4 +--- doc/fig/exmpl3_nei_part.tex | 2 +- src/export_mesh.m | 3 ++- src/test_sol.m | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/doc.pdf b/doc/doc.pdf index fe015fbef86854e1ecdb20d92628ae4dc03454f2..3114cd0e3a8c2230bc86686aa4fa7ee12fa7da58 100644 GIT binary patch delta 7797 zcmai22~(DuU%U+y%#Gqz#uzgIA*q?5$ns581I@69Wd`<({eyEtlQU{vtg+ z%B{80bVs1!u9NAfKJ>V1EjMb`t;#(!;5KHT{;hLq^|k4G0>?YiH=SB9N4F~}mKL2) z%Kxm|&!$Y>;Bu==C)qb)?7pvWry(ck#!lp#Y}j}&liB%+b)xl8O>-Qs8ebSLD>`31 zv#m28e9D0>6u5clv7rLl3M~IKW*rdtIvFycE-;?`q-8F&bY@l zSCPrjCp3t8vbxGzvr_NP9XLEOQOx(sZfnttDkMz7 zkj$Ly*wMU0X~k6~6KRRIaQ8XUX{(n7s{M~AGA4C**ZsA2FJrygCJkpD3#*8=*Q3{@ zxdpAN&>bUcFTZ;*=(xVENb(95v~)7sW|A)O1zbR z@c4%p3f@vSc-qCt6Q22_*;R+@wOmINQ-{n%WpxTw#GaJ6$#nLhR+g0yt@X`s`vg`F z(oaSWE)$ezh$jq?clSv+u3cDntKvGaJl9IF*9IcqAphPG^kf zxlL_y7Dv`)xT{KkYAiI7NVMB{Qf53)XYQQ8OeR@dypdeEdhxvTHRoCHGDNW5z6iIP zA^NmUc17p<-Sm;%2Uf*LC+|B{kgDJ_JAR6G>1}Loo3YQS!7}6G%Iq4QJ45C)tYgnbD~mb?UROELJvr-*o7tlmeZlvd{GCKU-}e}qA8Lum z7Vo*Qmx*@P#%QttYv-*iIH#4QAM{fHNN4|39d5&CekYkSqC(G1@mbOQaoaAO|-&#{US&ph@!}l$3?VFfm zYIjtoORamyU&AKrlo`jEw;_^V_K^?!6AcqyMjx|&(|f*A-Dym+t;YW5JUu4)_?zdF zpT_M-7~^OlwSUPw+5KqR-kvkB!>(_+{^&d}pxaO@YB0cc>#7QUKb5_P{fVqztfL8C zdL=x&JEml`Q+8)_`^7c|w(BC>=};!QaO9msIu0w`+z!3qwNCDI=uh8OJqcScbz%6* zdXclmGYZD3pE1i6qnjd6X<%`Zb=@MTpZYBk)!OKC$}Bsnyi(0`^5!I@LiWiQZ1YLS zfz_phJC%+Nd>pXe8ZD*}$%}aItvct_?e5-!`g=xKEQXE9{^35$x|x^Puo3LFLSnye zeTdZu?4F2yp{j!BNtO2az0btYIY~PFy(_aBZwfSNR*5{~zkT>?#VWaWCQa|sfKSHw zp*yR0%HA?vpueWPxV5TR)&G^ori@(OORL9v+-ynTz|-CtdEx!jiTTlIoV#jwPI1sO zxABgwL7zz}re6{rT%aa-fqorkq{!xnXPBw*#bzuDOG?4|7< zCYYSotoD#wmMXFyiP(<$#Q!;a&~}k=kX}m9o_JC!uFf((?@@ft+OKDqC0m2t-5vnSp@{&Q)?i@&;1)uu%gYS~VUy|!veqU@3b z%I{lUbxc3*EK6&e)tEJSjh+>7w?=Y>SX^$NdYu|xH{E+6tM=Sx?0E2~J;VqF`IysA zLk3Bnss>L&QlBQ)uXoAxl~_K3kcux`6fS$hUo%T!A>RM_idT8_gz0{T#G%sR5!IS? zMFG}#J11kI%cTzM7^Tim88>t(OJiv>d;FH`rlc#cdn{ZCXCzl_?2g!!Jre@Th~`z# z(q_mj2L8G2YSG+8`CI94ODAp#eQRg4^;K(d(S_QeOZ_gaS%Pz*J5gNyT>ISJ3iBdq zg^I~k-Eimz#ml_x_!zCH6?$q9Jw>`!-oIFePmand&8_ykKk$aRG-_Bbs)hcmy!0Yl z60YEQZ{7XikO|92(jU~vIs_YyPDodFzW1sv-v5J?#o+AO4L;$2%8ECz?}w^_?+!A( za_7f2SLk*4|L@w0_*0`cZGO;ip(3r<=*K*inB?y9fETow6|s6X{9(z-QmqiDq-`tX z3Tka*#H$zX_bRgV-0-5W)aQtl*ust+{L*o@XvN;C4kc4M-1DX+hMaBXi)Y=?a83#v z)QLQ&loK^R-Bt5lxWn_!&t+?nEoTg;uDn?E{F17>gjrX^Q{QMuT4QZYcU84R*e$)x z58-xBzQ!xFyH4$YllaEuhQvJA^d(~+L|-j3vOZnjQ(aS$UT3Y=hHHL4KeIhY%X(UE z@TWcOG&{LR&z(nCwD#?r~++eD{YN%Y1j&%fwagSV%NPtk2MY{xIi# z&sT}ka`pVjdzF%;6Ov@ z@_g*guUAg)O1$HzS$4(w?p`scMsOOhD7ZfrDPN^_poANuD6TA)VP89 zHzVfReQ0Bqj>)vGHJQ@zhgnswimL042WO^!4cQq!sa)iQiO*-}p`z%8)mq8w{_;v6 zBg3tFikw>F%aocbV&?{{Xz0z5^(c%S3|l^=939fgq_nJ?7LZB@=AC~RlD1MMJ66%B z<4LS8T{LxRpg(ff-P?TB!RNDk9yr}uWproPo{S5hZ;oT{J{_FkH*Y?S{ErB;GN~y_p|5%U&&XHfD2P0VT5cmHHovN$ zdCT{E@kP?RdAmc+)*jp4wqKKO8B1;bcoZqz)%ZE7BmH%%t`}P~&0(5aqzayYh90BJ zxSBK$cN(S`VSW#-mM42{XvtHKdc0-X%owl3p{}Vz<$qU93Nms(aO`%WaI#$=I#CT-x;0nIlhZT2vca2{9q`S#gqWt*wj`q!?F9+%2uOO)Q_zhCk|)FyRI z)zoe83U0{H3LQ3cnbbJy^JcS8AA=vYUq2nVsE{+R2gk453-4ry0Ak-9~6e6e-b}50H8E8nsIx~QhsGwNbf(7KvzrA%e z7j{uWrm)Kw3=6wBBCxjj_BL7A(1KoJ!wBYBf|nF3h_mDwj3;qTMEGcK(3BCjI8IU& zBj^ymqY%zJlFt`Rx8luKq&Tk#niPZzUoo6lID-r7em@FFNrBotuoxfX48t&7ux{RO zXG962pm-h+7Y9VWUdYp)Mgtdw`~Qz4IEE82Mo=UrFt+Bov%eXDQCyD+66G+2lPDja z7-I+yB?Ll4V-Xbi`;8xgrVURX#1paMtp-h^4bN7efUI%w@Hw+$G=dk%+47!>i!ud+ zcDxW#F5?8Bj|(F0c^+a6C3t4f(-}`f^dbZ)jEa^6&%+yss6$AEK+#`4L@0u!VT?pb z3W_#Dq8Ls?V+j%iV(fL`>981g4n7}Z6Rb~jLx)o&JTI_gIP;+h%JBz9sPAjAKlA}M zieivHgc!$3f@C<05ERNMVJ9gJ z`k*l6SIr8gh@mvZGz&ls&R9b1Hxq(81>Owyn+!wq;ZqNICVt}_Ks7=9!Sh3e6pho6 zxP%9Y>oHA|TssQo2#%)U8wmjk=%>T%_xlo|Kq}zS5BT~wPXC690;9Qh3@646Msqd8 zFc_>4mZE6_RwjcH9Q898INcEa0HYy&fTM`O7y?8{!EAvI3WffS{~z?z2+2`D4WtP# z3@`>-7@<*w!yt_kzrpy(&-vJI2 z@r0q^dJ6c1EDRkg6hDMv;5&i+ znF_yWLI9F*9e@EE;B^LU^*uhDP1)r**pn*NX85B;VIQYn1O6 S8Jxhu2bzqww#6b#ng0WKwy);^ delta 7753 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 diff --git a/doc/doc.tex b/doc/doc.tex index 63c53e1..c7a11b7 100644 --- a/doc/doc.tex +++ b/doc/doc.tex @@ -540,8 +540,6 @@ so so oder so... \section{Implementierung} - - \subsection{Datenstruktur} Für die Implementierung in \Matlab~und C++ wollen wollen wir eine einheitliche Datenstruktur einführen. Die für die Triangulierung $\mathcal{T}_{\ell} = \{T_1\ldots T_M\}$ benötigen Knoten $\mathcal{K}_{\ell} = \{C_1\ldots C_N\}$ stellen wir in einer $ N \times 3$ Matrix dar. Dabei enthält die $j$-te Zeile die Koordinaten des Knoten $C_j$ im $\R^3$. @@ -564,7 +562,7 @@ Offensichtlich ist $i \notin N_i$. Wir wollen uns aber noch genauer eine geeigne (Siehe Abb.:\ref{exmpl3:nei:part}) \begin{figure}[ht] \caption{Nachbarschaftsrelationen Element 4 aus Abb.\ref{exmpl3}} -\label{exmpl3:nei:part} +% \label{exmpl3:nei:part} \centering \subfloat[Lage]{\includegraphics{fig/Net_Neigh}} \subfloat[Nachbarn]{\input{fig/exmpl3_nei_part}} diff --git a/doc/fig/exmpl3_nei_part.tex b/doc/fig/exmpl3_nei_part.tex index a1cc1a3..0c6e09d 100644 --- a/doc/fig/exmpl3_nei_part.tex +++ b/doc/fig/exmpl3_nei_part.tex @@ -3,4 +3,4 @@ Index & n1 & n2 & n3 & n4 & n5 & n6 & n7 & n8\\ 4 & 9 & 7 & 12 & 0 & 0 & 0 & 14 & 0 \end{tabular} -\label{exmpl3:nei} +\label{exmpl3:nei:part} diff --git a/src/export_mesh.m b/src/export_mesh.m index 67227f7..6284cd8 100644 --- a/src/export_mesh.m +++ b/src/export_mesh.m @@ -1,7 +1,8 @@ function export_mesh(coo, ele, nei, f2s, file) -plotShape(coo,ele,'db');view(2); +plotShape(coo,ele,'db'); print('-r600','-depsc',['../doc/fig/' file '_ref.eps']) +system(['epstopdf ../doc/fig/' file '_ref.eps']) %% Koordinaten fid = fopen(['../doc/fig/' file '_coo.tex'],'w'); diff --git a/src/test_sol.m b/src/test_sol.m index 57add5a..891fc67 100644 --- a/src/test_sol.m +++ b/src/test_sol.m @@ -10,10 +10,10 @@ mex mex_build_V.cpp slpRectangle.cpp steps = 30; %Art der Berechnungen -type = [1 3]; +type = [1]; %LShape adaptiv anisotrop -compute('exmpl_2DQuad', steps, 0.7, type, 0.5, 0.5, 0, 'testAA_') +compute('exmpl_2DQuad', steps, 0.7, type, 0.5, 0, 0, 'testAA_') % compute('exmpl_2DQuad', steps, 0.7, type, 0.5, 0.5, 1, 'testAAvcon_') % %LShape adaptiv isotrop -- 2.47.3