[src] fix im Code

[doc] fix beim Code anzeigen
dateirechte angepasst

diff --git a/doc/lstings.sty b/doc/lstings.sty
old mode 100755 (executable)
new mode 100644 (file)
index 507c089..4ada06d
--- a/doc/lstings.sty
+++ b/doc/lstings.sty
@@ -27,7 +27,7 @@
 
 
 \lstset{ %
-  basicstyle=\small\ttfamily,
+  basicstyle=\footnotesize\ttfamily,
   numbers=left,                   
   numberstyle=\tiny\color{lst_gray},
 %   stepnumber=2,                                                    
@@ -40,8 +40,8 @@
 %   rulecolor=\color{black},        
   tabsize=2,                      
 %   captionpos=b,                   
-%   breaklines=true,                
-%   breakatwhitespace=false,
+  breaklines=true,                
+  breakatwhitespace=true,
 %   title=\lstname,
 %   identifierstyle=\color{red},  %
 %   morekeywords=[4]{int,double,void}, %Typen
@@ -74,11 +74,12 @@
 
 \lstdefinelanguage{M}[]{Matlab}{
   morecomment=[l]{...},
-  morekeywords=[1]{assert,repmat,mod,regexprep,...},
+  morekeywords=[1]{assert,repmat,mod,regexprep,zeros,ones,ismember,scatter3,ylim,xlim,zlim},
   morekeywords=[2]{},  %lib Functions
-  morekeywords=[3]{G_D,G_C,G_E,G_N,G_T,G_S},   %Globals
+  morekeywords=[3]{G_ref_E,G_ref_C,G_ref_N,G_ref_S,G_ref_f2s,G_ref_t,G_ref_tD,G_ref_f2sT,G_D,G_C,G_E,G_N,G_T,G_S},     %Globals
   morekeywords=[4]{},  %Typen
-  morekeywords=[5]{compute,plotShape,plotMark,export_exmpl,export_gauss,export_mesh,mark,gauss,refineQuad,areaQuad,mex_build_V,t2str}, %own Functions
+  morekeywords=[5]{compute,plotShape,plotMark,export_exmpl,export_gauss,export_mesh,mark,
+                   gauss,refineQuad,areaQuad,mex_build_V,t2str,quadNorm},      %own Functions
 }
 
-\lstset{defaultdialect=[MY]C++}
+\lstset{defaultdialect=[MY]C++}
\ No newline at end of file

diff --git a/res/OpenMP3.1-CCard.pdf b/res/OpenMP3.1-CCard.pdf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/ebner2012.pdf b/res/ebner2012.pdf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/feischl2010.pdf b/res/feischl2010.pdf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/kemetmueller2012.pdf b/res/kemetmueller2012.pdf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/mayr2010.pdf b/res/mayr2010.pdf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/mex_build_V.cpp b/src/mex_build_V.cpp
index d7a985e55ef5076f7e98565fac7b7374dce046c6..ad82c3c3df4b7e18449923e9b8b3c503364d595f 100644 (file)
--- a/src/mex_build_V.cpp
+++ b/src/mex_build_V.cpp
@@ -163,7 +163,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
        double * E = mxGetPr(prhs[1]);\r
 \r
        int type = (int) *(mxGetPr(prhs[3]));\r
-       double * zeta = {0};\r
+       double * zeta = { 0 };\r
 \r
 #if DEBUG >= 4\r
        mexPrintf("ZetaM:%d\nZetaN:%d\n",mxGetM(prhs[2]),mxGetN(prhs[2]));\r
@@ -254,7 +254,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 #ifdef PARALLEL\r
 //#pragma omp parallel p\r
        {\r
-#pragma omp parallel for schedule(static,1) private(i,j,k,tmp,x,y,xa,xb,ya,yb,d,dt,rx, rxa, rxb, ry, rya, ryb,lastRow,firstRow) shared(C,E,ctypeO,ctypeP,em,targetSize,actualNumberOfThreads)\r
+#pragma omp parallel for schedule(static,1) private(i,j,k,tmp,x,y,xa,xb,ya,yb,d,dt,rx,rxa,rxb,ry,rya,ryb,lastRow,firstRow) shared(C,E,ctypeO,ctypeP,em,targetSize,actualNumberOfThreads)\r
 \r
 #endif\r
                for (i = 0; i < actualNumberOfThreads; ++i) {\r

diff --git a/src/refineQuad.m b/src/refineQuad.m
index 4377583eb45c0c0e63a175e38b879ac4bbae1795..5f0b5b1e6f5a0ff7fb75ff46b890a36613361bfc 100644 (file)
--- a/src/refineQuad.m
+++ b/src/refineQuad.m
@@ -1,4 +1,4 @@
-function [coo,ele,nei,f2s,sit,err] = refineQuad(coordinates,elements,neigh,sites,type)
+function [coo,ele,nei,f2s,sit,err] = refineQuad(coordinates,elements,neigh,sites,typ)
 %
 %  [coordinates,elements,fa2so] = refineQuad(coordinates,elements,type)
 %
@@ -18,11 +18,11 @@ function [coo,ele,nei,f2s,sit,err] = refineQuad(coordinates,elements,neigh,sites
 err = [];
 
 %Type wenn nur ein Wert: aufblaehen
-if([1 1] == size(type))
-    type = repmat(type, size(elements,1),1);
+if([1 1] == size(typ))
+    typ = repmat(typ, size(elements,1),1);
 end
 
-assert(size(elements,1)==size(neigh,1)&&size(elements,1)==length(type),...
+assert(size(elements,1)==size(neigh,1)&&size(elements,1)==length(typ),...
   'Dimensionen passen nicht');
 
 
@@ -41,12 +41,12 @@ G_ref_E = elements;
 G_ref_C = coordinates;
 G_ref_N = neigh;
 G_ref_S = sites;
-G_ref_t = type;
+G_ref_t = typ;
 G_ref_f2s = repmat([1:size(elements,1)]',1,4);
 G_ref_tD = ones(size(elements,1),1);
 
 %Parameter Freigeben (Speicher...)
-clear elements coordinates neigh type
+clear elements coordinates neigh typ
 
 % figure(11)
 % plotShape(G_ref_C,G_ref_E,'s',G_ref_t);