[data] Quadratur vergleich 29

diff --git a/src/meshSave/2222t05n05_2DQuad_20.mat b/src/meshSave/2222t05n05_2DQuad_20.mat
index 6ddd9ef660be0b585944164621947f7ba313fe64..1ad21f42e64a13e4e9d561ac0b54b09614ba5bf1 100644 (file)
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 3bc8d3888ae66c3ddd8a0839e8d6b854cb2895cf..78085038c8721ceb2d2163470fc65f745a91d26a 100644 (file)
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 4a8867c7599ce168ba933f37eb9431fa78938ecb..332915a65ed0193562de4af9ae4e4ced40599409 100644 (file)
--- 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;\r
        case 4: // Analytisch oder Qy[1]x2\r
                ctypeP = cParO4;\r
-//             ctypeO = cOrtO4;\r
-               ctypeO = cOrtO2;\r
+               ctypeO = cOrtO4;\r
+//             ctypeO = cOrtO2;\r
                break;\r
        case 0: // Distanz der Elemente\r
                ctypeP = distT_par;\r

diff --git a/src/recompute_time.m b/src/recompute_time.m
index a833855640c5db2ec780e17417a115b99320a4c7..f230cfc9882d8a3569e8e3b140d5404b28e07ac9 100644 (file)
--- 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 f867581553c16942d54b04415f0cb4438d12c585..cfc8dfc26fecdae527c4429e4c176a05ed427d1b 100644 (file)
--- 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