[src] markierungs Bug durch umbenennung behoben

[src] assert Zeta ausgeschaltet

diff --git a/src/A_plots.m b/src/A_plots.m
index a612e6caca26955a43c97121d0d76f4f46cefebf..96897089ecc2610f920cd4ecaf69ccfb1f0d8195 100644 (file)
--- a/src/A_plots.m
+++ b/src/A_plots.m
@@ -16,6 +16,7 @@ rows = 9;
 for i = 1:length(files)
    
    load(files{i});
+   data
       
    [m n] = size(data);
    step = round(n/rows);

diff --git a/src/A_run.m b/src/A_run.m
index 1476eef66ec098966108753edda155722c766ff3..2b68d73774ed049e23cfcb47f6ffa4767a9e874f 100644 (file)
--- a/src/A_run.m
+++ b/src/A_run.m
@@ -1,18 +1,18 @@
-function A_run(file,times,zeta,type,eta,eps,out)
-% A_AnIso(file,times,mu,type,eta,eps,out)
+function A_run(file,times,zeta,type,theta,nu,out)
+% A_AnIso(file,times,zeta,type,theta,nu,out)
 % file - starting mesh
 % times - how often
 % zeta - Zulaessigkeitsbed
 % type - art des Tests
-% eta - alle verfeinern oder nur wichtige? 
-% eps - wie verfeinern iso or aniso
+% theta - alle verfeinern oder nur wichtige? 
+% nu - wie verfeinern iso oder aniso
 % out - Dateiname der Ausgabe
 %
 % P. Schaefer
 
 %Parameter testen
-assert(length(zeta)==max(type)-1||length(zeta)==1,...
-  'Pleas set right type and mu parameters');
+% assert(length(zeta)==max(type)-1||length(zeta)==1,...
+%   'Pleas set right type and zeta parameters');
 
 %Netz laden
 A_loadMeshF(file)
@@ -36,7 +36,7 @@ for i = 1:times
  end
  
  % Ein kompletter Verfeinerungschritt
- A_step(zeta,type,eta,eps,out);
+ A_step(zeta,type,theta,nu,out);
  
  %Zeit Speichern
  usedTime = G_T(end,:);

diff --git a/src/A_step.m b/src/A_step.m
index 520155e2e897d6e912ffbd2a19c0dfd521f16012..5fe689372015b75547922605739da77893b915e9 100644 (file)
--- a/src/A_step.m
+++ b/src/A_step.m
@@ -1,4 +1,4 @@
-function [data time er] = A_step(zeta,type,eta,eps,varargin)
+function [data time er] = A_step(zeta,type,theta,nu,varargin)
 % [data time er] = A_step(zeta,type,eta,eps [, out])
 % Führt einen Verfeinerungsschritt aus
 %
@@ -21,13 +21,13 @@ assert(~isempty(G_E) && ~isempty(G_C) && ~isempty(G_N),...
   'Please use A_loadMesh first')
 
 %Steuerungs Parameter prüfen
-assert(length(zeta)==max(type)-1||length(zeta)==1,...
-  'Pleas set right type and zeta parameters')
+% assert(length(zeta)==max(type)-1||length(zeta)==1,...
+%   'Pleas set right type and zeta parameters')
 
 %Steuerungsparameter korrigieren
-if(length(zeta)==1)
-  zeta = repmat(zeta,max(type)-1,1);
-end
+% if(length(zeta)==1)
+%   zeta = repmat(zeta,max(type)-1,1);
+% end
 
 %Vektor für Zeitmessung anlegen
 time = zeros(1,3);
@@ -109,7 +109,7 @@ time = zeros(1,3);
 %   marked(find(sum((G_N(:,1:4)==0),2))) = 2;
 
   % Markieren mit gewählten Parametern
-  marked = mark(x_fine(f2s)',tmu,eta,eps);
+  marked = mark(x_fine(f2s)',tmu,theta,nu);
   
   % Bunt Plotten!
 %   figure(1)

diff --git a/src/meshSave/testAA_1_26.mat b/src/meshSave/testAA_1_26.mat
index 9580085b8fd134967fb8f40952eb3793ae2b41d7..94ee7d58fd1e1656ae69a9261ae93ec37f36c0f6 100644 (file)
Binary files a/src/meshSave/testAA_1_26.mat and b/src/meshSave/testAA_1_26.mat differ

diff --git a/src/meshSave/testAA_1_28.mat b/src/meshSave/testAA_1_28.mat
index b2e7e1103b75bb9437cbd47cbd67f344d7d15415..e38c3be20aba371c39782a86ea29400a911988bb 100644 (file)
Binary files a/src/meshSave/testAA_1_28.mat and b/src/meshSave/testAA_1_28.mat differ

diff --git a/src/slpRectangle.cpp b/src/slpRectangle.cpp
index 20481794ddede02e93b21c5711159a0b9ba0f2cf..4937d0476489d0168d72310984cc985087c9e639 100644 (file)
--- a/src/slpRectangle.cpp
+++ b/src/slpRectangle.cpp
@@ -438,16 +438,16 @@ double calcOrtIntQX1X2(double b, double d, double t, double v, double d1,
 }\r
 \r
 double calcParIntO0(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
        return calcParIntA(b, d, t, v, d1, d2, d3);\r
 }\r
 double calcOrtIntO0(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
        return calcOrtIntA(b, d, t, v, d1, d2, d3);\r
 }\r
 \r
 double calcParIntO1(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
 \r
        //Elmente anordnen\r
        if (b * b + d * d > t * t + v * v) {\r
@@ -469,7 +469,7 @@ double calcParIntO1(double b, double d, double t, double v, double d1,
 }\r
 \r
 double calcOrtIntO1(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
 \r
        //Elmente anordnen\r
        if (b * b + d * d > t * t + v * v) {\r
@@ -491,7 +491,7 @@ double calcOrtIntO1(double b, double d, double t, double v, double d1,
 }\r
 \r
 double calcParIntO2(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
 \r
        //Elmente anordnen\r
        if (b * b + d * d > t * t + v * v) {\r
@@ -509,7 +509,7 @@ double calcParIntO2(double b, double d, double t, double v, double d1,
                d3 = -d3;\r
        }\r
 \r
-//     if ((b * b + d * d) * eta < d1 * d1 + d2 * d2 + d3 * d3) {\r
+//     if ((b * b + d * d) * zeta < d1 * d1 + d2 * d2 + d3 * d3) {\r
        return calcParIntQX1X2(b, d, t, v, d1, d2, d3);\r
 //     } else {\r
 //             cout << "2error";\r
@@ -519,7 +519,7 @@ double calcParIntO2(double b, double d, double t, double v, double d1,
 }\r
 \r
 double calcOrtIntO2(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
 \r
        //Elmente anordnen\r
        if (d > t) {\r
@@ -537,7 +537,7 @@ double calcOrtIntO2(double b, double d, double t, double v, double d1,
                d3 = -d3;\r
        }\r
 \r
-       if ((b * b + d * d) * eta <= d1 * d1 + d2 * d2 + d3 * d3) {\r
+       if ((b * b + d * d) * zeta <= d1 * d1 + d2 * d2 + d3 * d3) {\r
                return calcOrtIntQX1X2(b, d, t, v, d1, d2, d3);\r
        } else {\r
        //      cout << "2error";\r
@@ -546,7 +546,7 @@ double calcOrtIntO2(double b, double d, double t, double v, double d1,
 }\r
 \r
 double calcParIntO3(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
 \r
        //Achsen vertauschen\r
        if (b * b + t * t > d * d + v * v) {\r
@@ -564,7 +564,7 @@ double calcParIntO3(double b, double d, double t, double v, double d1,
                d2 = tmp;\r
        }\r
 \r
-//     if ((min(b, t) * eta <= d1) && (min(d, v) * eta <= d2) ) {\r
+//     if ((min(b, t) * zeta <= d1) && (min(d, v) * zeta <= d2) ) {\r
        return calcParIntQY1X1(b, d, t, v, d1, d2, d3);\r
 //     } else {\r
 //             cout << "3error";\r
@@ -574,9 +574,9 @@ double calcParIntO3(double b, double d, double t, double v, double d1,
 }\r
 \r
 double calcOrtIntO3(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double eta) {\r
+               double d2, double d3, double zeta) {\r
 \r
-       if (max(b, t) * eta > d1) {\r
+       if (max(b, t) * zeta > d1) {\r
                return 0;\r
        } else {\r
                return calcOrtIntA(b, d, t, v, d1, d2, d3);\r
@@ -584,7 +584,7 @@ double calcOrtIntO3(double b, double d, double t, double v, double d1,
 }\r
 \r
 double cParO0(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double* eta) {\r
+               double d2, double d3, double* zeta) {\r
        double tmp = 0;\r
 \r
        // kleine Seite nach vorn\r
@@ -603,8 +603,7 @@ double cParO0(double b, double d, double t, double v, double d1,
                d2 = -d2;\r
        }\r
 \r
-       if ((t * t + v * v) * eta[0] < d1 * d1 + d2 * d2 + d3 * d3) {\r
-//             cout << "E";\r
+       if ((t * t + v * v) * zeta[0] < d1 * d1 + d2 * d2 + d3 * d3) {\r
                return calcParIntQ(b, d, t, v, d1, d2, d3);\r
        } else {\r
                return calcParIntA(b, d, t, v, d1, d2, d3);\r
@@ -614,12 +613,12 @@ double cParO0(double b, double d, double t, double v, double d1,
 }\r
 \r
 double cParO1(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double* eta) {\r
+               double d2, double d3, double* zeta) {\r
        return calcParIntA(b, d, t, v, d1, d2, d3);\r
 }\r
 \r
 double cParO2(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double* eta) {\r
+               double d2, double d3, double* zeta) {\r
 \r
        double tmp = 0;\r
 \r
@@ -639,7 +638,7 @@ double cParO2(double b, double d, double t, double v, double d1,
                d2 = -d2;\r
        }\r
 \r
-       if ((b * b + d * d)  < eta[0]* (d1 * d1 + d2 * d2 + d3 * d3)) {\r
+       if ((b * b + d * d)  < zeta[0]* (d1 * d1 + d2 * d2 + d3 * d3)) {\r
 //             cout << "E";\r
                return calcParIntQX1X2(b, d, t, v, d1, d2, d3);\r
        } else {\r
@@ -650,7 +649,7 @@ double cParO2(double b, double d, double t, double v, double d1,
 }\r
 \r
 double cParO3(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double* eta) {\r
+               double d2, double d3, double* zeta) {\r
 \r
        double tmp = 0;\r
 \r
@@ -670,7 +669,7 @@ double cParO3(double b, double d, double t, double v, double d1,
                d2 = -d2;\r
        }\r
 \r
-       if ((b * b + d * d)  < eta[0] * (d1 * d1 + d2 * d2 + d3 * d3)) {\r
+       if ((b * b + d * d)  < zeta[0] * (d1 * d1 + d2 * d2 + d3 * d3)) {\r
 \r
                //kleinere Achse nach vorn\r
                if (b * b + t * t > d * d + v * v) {\r
@@ -688,7 +687,7 @@ double cParO3(double b, double d, double t, double v, double d1,
                        d2 = tmp;\r
                }\r
 \r
-               if (min(b, t)  <= eta[1] * d1) {\r
+               if (min(b, t)  <= zeta[1] * d1) {\r
 //                     cout << "A";\r
                        return calcParIntQY1X1(b, d, t, v, d1, d2, d3);\r
                } else {\r

diff --git a/src/test_sol.m b/src/test_sol.m
index 23a1fa7ad0ed165a6d2fd09bde923739bb59a852..03fc933b156d2c5cef25b1f3a7ccb1cfade0bba8 100644 (file)
--- a/src/test_sol.m
+++ b/src/test_sol.m
@@ -7,10 +7,10 @@ mex mex_build_V.cpp slpRectangle.cpp
 % Test ausführen
 
 %Anzahl der Schritte
-steps = 33;
+steps = 5;
 
 %LShape adaptiv anisotrop
-A_run('exmpl_2DQuad', steps, 0.7, [ 1], 0.5, 0.5, 'testAA_')
+A_run('exmpl_2DQuad', steps, 0.7, [1], 0.5, 0.5, 'testAA_')
 
 %LShape adaptiv isotrop
 % A_run('exmpl_2DLShape', steps, 0, 0.5, 0, 0, 'testAI_')