From: Peter Schaefer <peter.schaefer@tuwien.ac.at>
Date: Thu, 29 Mar 2012 17:09:19 +0000 (+0200)
Subject: [src] markierungs Bug durch umbenennung behoben
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=8536fb179debdbf31911f2c7fdf28f9e2d6964fb;p=bacc.git

[src] markierungs Bug durch umbenennung behoben
[src] assert Zeta ausgeschaltet
---

diff --git a/src/A_plots.m b/src/A_plots.m
index a612e6c..9689708 100644
--- 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 1476eef..2b68d73 100644
--- 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 520155e..5fe6893 100644
--- 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 9580085..94ee7d5 100644
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 b2e7e11..e38c3be 100644
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 2048179..4937d04 100644
--- a/src/slpRectangle.cpp
+++ b/src/slpRectangle.cpp
@@ -438,16 +438,16 @@ double calcOrtIntQX1X2(double b, double d, double t, double v, double d1,
 }
 
 double calcParIntO0(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 	return calcParIntA(b, d, t, v, d1, d2, d3);
 }
 double calcOrtIntO0(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 	return calcOrtIntA(b, d, t, v, d1, d2, d3);
 }
 
 double calcParIntO1(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 
 	//Elmente anordnen
 	if (b * b + d * d > t * t + v * v) {
@@ -469,7 +469,7 @@ double calcParIntO1(double b, double d, double t, double v, double d1,
 }
 
 double calcOrtIntO1(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 
 	//Elmente anordnen
 	if (b * b + d * d > t * t + v * v) {
@@ -491,7 +491,7 @@ double calcOrtIntO1(double b, double d, double t, double v, double d1,
 }
 
 double calcParIntO2(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 
 	//Elmente anordnen
 	if (b * b + d * d > t * t + v * v) {
@@ -509,7 +509,7 @@ double calcParIntO2(double b, double d, double t, double v, double d1,
 		d3 = -d3;
 	}
 
-//	if ((b * b + d * d) * eta < d1 * d1 + d2 * d2 + d3 * d3) {
+//	if ((b * b + d * d) * zeta < d1 * d1 + d2 * d2 + d3 * d3) {
 	return calcParIntQX1X2(b, d, t, v, d1, d2, d3);
 //	} else {
 //		cout << "2error";
@@ -519,7 +519,7 @@ double calcParIntO2(double b, double d, double t, double v, double d1,
 }
 
 double calcOrtIntO2(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 
 	//Elmente anordnen
 	if (d > t) {
@@ -537,7 +537,7 @@ double calcOrtIntO2(double b, double d, double t, double v, double d1,
 		d3 = -d3;
 	}
 
-	if ((b * b + d * d) * eta <= d1 * d1 + d2 * d2 + d3 * d3) {
+	if ((b * b + d * d) * zeta <= d1 * d1 + d2 * d2 + d3 * d3) {
 		return calcOrtIntQX1X2(b, d, t, v, d1, d2, d3);
 	} else {
 	//	cout << "2error";
@@ -546,7 +546,7 @@ double calcOrtIntO2(double b, double d, double t, double v, double d1,
 }
 
 double calcParIntO3(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 
 	//Achsen vertauschen
 	if (b * b + t * t > d * d + v * v) {
@@ -564,7 +564,7 @@ double calcParIntO3(double b, double d, double t, double v, double d1,
 		d2 = tmp;
 	}
 
-//	if ((min(b, t) * eta <= d1) && (min(d, v) * eta <= d2) ) {
+//	if ((min(b, t) * zeta <= d1) && (min(d, v) * zeta <= d2) ) {
 	return calcParIntQY1X1(b, d, t, v, d1, d2, d3);
 //	} else {
 //		cout << "3error";
@@ -574,9 +574,9 @@ double calcParIntO3(double b, double d, double t, double v, double d1,
 }
 
 double calcOrtIntO3(double b, double d, double t, double v, double d1,
-		double d2, double d3, double eta) {
+		double d2, double d3, double zeta) {
 
-	if (max(b, t) * eta > d1) {
+	if (max(b, t) * zeta > d1) {
 		return 0;
 	} else {
 		return calcOrtIntA(b, d, t, v, d1, d2, d3);
@@ -584,7 +584,7 @@ double calcOrtIntO3(double b, double d, double t, double v, double d1,
 }
 
 double cParO0(double b, double d, double t, double v, double d1,
-		double d2, double d3, double* eta) {
+		double d2, double d3, double* zeta) {
 	double tmp = 0;
 
 	// kleine Seite nach vorn
@@ -603,8 +603,7 @@ double cParO0(double b, double d, double t, double v, double d1,
 		d2 = -d2;
 	}
 
-	if ((t * t + v * v) * eta[0] < d1 * d1 + d2 * d2 + d3 * d3) {
-//		cout << "E";
+	if ((t * t + v * v) * zeta[0] < d1 * d1 + d2 * d2 + d3 * d3) {
 		return calcParIntQ(b, d, t, v, d1, d2, d3);
 	} else {
 		return calcParIntA(b, d, t, v, d1, d2, d3);
@@ -614,12 +613,12 @@ double cParO0(double b, double d, double t, double v, double d1,
 }
 
 double cParO1(double b, double d, double t, double v, double d1,
-		double d2, double d3, double* eta) {
+		double d2, double d3, double* zeta) {
 	return calcParIntA(b, d, t, v, d1, d2, d3);
 }
 
 double cParO2(double b, double d, double t, double v, double d1,
-		double d2, double d3, double* eta) {
+		double d2, double d3, double* zeta) {
 
 	double tmp = 0;
 
@@ -639,7 +638,7 @@ double cParO2(double b, double d, double t, double v, double d1,
 		d2 = -d2;
 	}
 
-	if ((b * b + d * d)  < eta[0]* (d1 * d1 + d2 * d2 + d3 * d3)) {
+	if ((b * b + d * d)  < zeta[0]* (d1 * d1 + d2 * d2 + d3 * d3)) {
 //		cout << "E";
 		return calcParIntQX1X2(b, d, t, v, d1, d2, d3);
 	} else {
@@ -650,7 +649,7 @@ double cParO2(double b, double d, double t, double v, double d1,
 }
 
 double cParO3(double b, double d, double t, double v, double d1,
-		double d2, double d3, double* eta) {
+		double d2, double d3, double* zeta) {
 
 	double tmp = 0;
 
@@ -670,7 +669,7 @@ double cParO3(double b, double d, double t, double v, double d1,
 		d2 = -d2;
 	}
 
-	if ((b * b + d * d)  < eta[0] * (d1 * d1 + d2 * d2 + d3 * d3)) {
+	if ((b * b + d * d)  < zeta[0] * (d1 * d1 + d2 * d2 + d3 * d3)) {
 
 		//kleinere Achse nach vorn
 		if (b * b + t * t > d * d + v * v) {
@@ -688,7 +687,7 @@ double cParO3(double b, double d, double t, double v, double d1,
 			d2 = tmp;
 		}
 
-		if (min(b, t)  <= eta[1] * d1) {
+		if (min(b, t)  <= zeta[1] * d1) {
 //			cout << "A";
 			return calcParIntQY1X1(b, d, t, v, d1, d2, d3);
 		} else {
diff --git a/src/test_sol.m b/src/test_sol.m
index 23a1fa7..03fc933 100644
--- 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_')