From: Peter Schaefer <schaeferpm@gmail.com>
Date: Thu, 25 Apr 2013 06:50:27 +0000 (+0200)
Subject: [data] Quadratur vergleich 29
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=85732a92bf9a2e3c9650597f80e0891bb6387ded;p=bacc.git

[data] Quadratur vergleich 29
---

diff --git a/src/meshSave/2222t05n05_2DQuad_20.mat b/src/meshSave/2222t05n05_2DQuad_20.mat
index 6ddd9ef..1ad21f4 100644
Binary files a/src/meshSave/2222t05n05_2DQuad_20.mat and b/src/meshSave/2222t05n05_2DQuad_20.mat differ
diff --git a/src/meshSave/2222t05n05_2DQuad_29.mat b/src/meshSave/2222t05n05_2DQuad_29.mat
index 3bc8d38..7808503 100644
Binary files a/src/meshSave/2222t05n05_2DQuad_29.mat and b/src/meshSave/2222t05n05_2DQuad_29.mat differ
diff --git a/src/mex_build_V.cpp b/src/mex_build_V.cpp
index 4a8867c..332915a 100644
--- a/src/mex_build_V.cpp
+++ b/src/mex_build_V.cpp
@@ -308,8 +308,8 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 		break;
 	case 4: // Analytisch oder Qy[1]x2
 		ctypeP = cParO4;
-//		ctypeO = cOrtO4;
-		ctypeO = cOrtO2;
+		ctypeO = cOrtO4;
+//		ctypeO = cOrtO2;
 		break;
 	case 0: // Distanz der Elemente
 		ctypeP = distT_par;
diff --git a/src/recompute_time.m b/src/recompute_time.m
index a833855..f230cfc 100644
--- a/src/recompute_time.m
+++ b/src/recompute_time.m
@@ -7,7 +7,7 @@ function recompute_time(filein,zeta)
 %     zeta = {[2 2 2] [2 2 2] [2 2 2]};
    
 for j=1:40
-  
+	disp(j);
     if(exist([filein num2str(j) '.mat'], 'file') ~= 2)
        break
     end
@@ -30,10 +30,10 @@ for j=1:40
 
   end
 %   time
-  data(1:j,[3+11+(0:step-1)*rows])
+%   data(1:j,[3+11+(0:step-1)*rows])
   data(1:j,[3+11+(0:step-1)*rows]) = time;
-  data(1:j,[3+11+(0:step-1)*rows])
+%   data(1:j,[3+11+(0:step-1)*rows])
   save([filein num2str(j)],'data','-append');
 end
 
-end
\ No newline at end of file
+end
diff --git a/src/test_sol.m b/src/test_sol.m
index f867581..cfc8dfc 100644
--- a/src/test_sol.m
+++ b/src/test_sol.m
@@ -10,19 +10,21 @@ mex mex_build_V.cpp slpRectangle.cpp CFLAGS="\$CFLAGS -O2  -fopenmp" CXXFLAGS="\
 % Test ausführen
 
 %Anzahl der Schritte oder wenn groeßer als 40 der Elemente
-steps = 4;
+steps = 10^4;
 
 %Art der Berechnungen
-type = [1];
-zeta = { [2 2 2] [2 2 2] [2 2 2]};
+type = [2 2 2 2];
+zeta = { [0 2 2] [1 2 2] [2 2 2] [3 2 2]};
 
 
 %% Quad adaptiv anisotrop
 %Datei
-file = 'exmpl_3DFichCube';
+% file = 'exmpl_3DFichCube';
 % file = 'exmpl_3DCube';
-% file = 'exmpl_2DQuad';
+file = 'exmpl_2DQuad';
 % file = 'meshSave/132t05n05_2DQuad_30';
+% file = 'meshSave/1432t05n05_3DFichCube_20';
+
 %Adaptiv
 theta = 0.5;
 %Anisotrop