[doc] lstling keywords updated

diff --git a/doc/doc.pdf b/doc/doc.pdf
index 5970c0c4e79ff72fcef6b0914b9b03105b3c31c2..484fbe8e586eee5b9b3265e3f0f002b94dd2bf65 100644 (file)
Binary files a/doc/doc.pdf and b/doc/doc.pdf differ

diff --git a/doc/doc.tex b/doc/doc.tex
index 0cc8ed33bbbc89ec9873195268fa5502cccc9882..8df83edb0ea73482de0b34110429a192a27634a2 100644 (file)
--- a/doc/doc.tex
+++ b/doc/doc.tex
@@ -21,16 +21,24 @@
   
 \usepackage{lstings}   %Code Einbinden (Private)
   
-\lstdefinelanguage{oC++}[ANSI]{C++}{
-  morekeywords=[2]{pow,sqrt,fabs,log,asinh,atan,arsinh,cos,sin},       %lib Functions
-  morekeywords=[3]{quad,gauss_nodes,HILBERT3D_LAPLACE_SLPRECTANGLE_HPP_GUARD_},        %Globals
-  morekeywords=[4]{sign,max,min,switch_site,switch_dim ,dist,dist2,dist_s2,dist_s,
-                   f_A,g_QY,g_AY,G_QY1Y2,G_AY2X2},     %own Functions
+\lstdefinelanguage{oC++}[]{C++}{
+%   morekeywords=[1]{omp,parallel,schedule,critical,end},
+  morekeywords=[2]{pow,sqrt,fabs,log,asinh,atan,arsinh,cos,sin,omp_get_thread_num,omp_get_max_threads,
+                   mexFunction,mexErrMsgTxt,mxCreateDoubleMatrix,mxGetPr,mxGetM,mxGetN,mexPrintf},     %lib Functions
+  morekeywords=[3]{quad,gauss_nodes,gauss_size,HILBERT3D_LAPLACE_SLPRECTANGLE_HPP_GUARD_,GAUSS_NODES,DEBUG,PARALLEL,
+                   MINSIZE_PER_WORKER,MAX_WORKER},     %Globals
+  morekeywords=[4]{add,sub,set,dimOfThird,getSCorner,distT,dimOfVec,
+                   sign,max,min,switch_site,switch_dim ,dist,dist2,dist_s2,dist_s,
+                   f_A,g_QY,g_AY,G_QY1Y2,G_AY2X2,G_AY1Y2,Gs_AX2Y1Y2,
+                   F_par,F_ort,apply0Int4,apply0Int2,
+                   calcParIntA,calcParIntQX1X2,calcParIntQY1X1,calcParIntQY1,calcParIntQ,calcOrtIntA,calcOrtIntQX1X2,calcOrtIntQ,
+                   cParO1,cOrtO1,cParO2,cOrtO2,cParO3,cOrtO3,cParO4,cOrtO4},   %own Functions
 }
 \lstdefinelanguage{oM}[]{Matlab}{
+  morekeywords=[1]{assert,repmat,mod,regexprep},
   morekeywords=[2]{},  %lib Functions
-  morekeywords=[3]{G_D},       %Globals
-  morekeywords=[4]{compute},   %own Functions
+  morekeywords=[3]{G_D,G_C,G_E,G_N,G_T,G_S},   %Globals
+  morekeywords=[4]{compute,plotShape,plotMark,export_exmpl,export_gauss,export_mesh,mark,gauss,refineQuad,areaQuad,mex_build_V,t2str}, %own Functions
 }
 
 \definecolor{gray}{gray}{.8}

diff --git a/src/compute.m b/src/compute.m
index d83bc0d80db505b7a705a1d64d1ab498f60c8ad4..3c66e88728d96552801364f0672d15e2aee5ffb2 100644 (file)
--- a/src/compute.m
+++ b/src/compute.m
@@ -1,10 +1,10 @@
-function [data er fileo] = compute(file,times,zeta,type,theta,nu,vcon)
+function [data er fileo] = compute(file,times,zeta,typ,theta,nu,vcon)
 % [data er] = compute(file,times,zeta,type,theta,nu,vcon,out)
 % Fuehrt times Verfeinerungsschritte aus
 %
 % file - StartNetz
 % times - wie oft Verfeinert werden soll
-% zeta & type - Bestimmen die Art der Matrix Berechnung
+% zeta & typ - Bestimmen die Art der Matrix Berechnung
 % theta - adaptiv?
 % nu - isotrop?
 % vcon - Vorkonditionierung der Matrix? 1 oder 0
@@ -43,10 +43,10 @@ for j = 1:times
   dataS = size(elements,1);
   
   %Alle MatrixBrechenungsArten mit dem selben Netz berechnen
-  for i = 1:length(type)
+  for i = 1:length(typ)
     disp([num2str(size(elements,1)) ' : ' t2str(toc) ' ->' num2str(i)])
     %Matrix aufbauen -> MEX
-    V_fine = mex_build_V(coo_fine,ele_fine,zeta,type(i));
+    V_fine = mex_build_V(coo_fine,ele_fine,zeta,typ(i));
     
     %Testet auf Fehlerhafte Eintraege (NaN +/-Inf)
     [r c] = find(isnan(V_fine)~=isinf(V_fine));
@@ -76,7 +76,7 @@ for j = 1:times
     tmu = hmin.* b .* sum((x_fine(f2s)'-repmat(sum(x_fine(f2s)',1)/4,4,1)).^2)' /4;
     
     %Fehlerschaetzer 2 aufbauen
-    V = mex_build_V(coordinates,elements,zeta,type(i));
+    V = mex_build_V(coordinates,elements,zeta,typ(i));
     
     if(~vcon)
         x = V\b;
@@ -176,7 +176,7 @@ for j = 1:times
     
     
     dataS = [dataS ...
-        type(i) ... berechnet mit Typ
+        typ(i) ... berechnet mit Typ
         sqrt(sum(tmu))... tilde mu
         sqrt(eta) ... eta
         xe ... error (kappa 2)
@@ -255,7 +255,7 @@ for j = 1:times
   
   %ErgebnisWerte Speichern
   data(size(data,1)+1,1:length(dataS)) = dataS;
-  typeN = int2str(type);
+  typeN = int2str(typ);
   fileo = [typeN(typeN~=' ')...
     't' regexprep(num2str(theta,2),'\.','')...
     'n' regexprep(num2str(nu,2),'\.','') '_'...