[src] A_plots : nutzt fast nur Ferraz Werte

[src] 3DFichCUbe finaly fixed
[src] mex_build_V + slpRectangle remove Debug and activate Parallel
[src] test_sol wieder voll funktionstüchtig

diff --git a/src/A_plots.m b/src/A_plots.m
index 9609ee2ad38ffd176207e1c685a309176940bbdd..84a2918344b5d4f627325a5d1b247ed00112f03f 100644 (file)
--- a/src/A_plots.m
+++ b/src/A_plots.m
@@ -94,16 +94,19 @@ else
 
 % G_D(end,4)
      
-if(strcmp(t0, '(3DFichCube)'))
-  sol = 16.2265;  %Ferraz-Leite
+if(strcmp(t0, '(3DFichCube)') || strcmp(t0, '(3DFichCube2)'))
+  sol = 16.2265;  % Ferraz-Leite Paper
+%   sol = 50;
 elseif(strcmp(t0, '(2DQuad)'))
   sol = 4.609193;
 elseif(strcmp(t0, '(2DLShape)'))
-  sol = 8.28466;
-elseif(strcmp(t0, '(3DCube)'))
+%   sol = 8.28457; % Ferraz-Leite Dipl.
+  sol = 8.28466; % Ferraz-Leite Paper
+elseif(strcmp(t0, '(3DCube)') || strcmp(t0, '(3DCube2)'))
   sol = 8.303;
 elseif(strcmp(t0, '(3DCube3)'))
-  sol = 1.0379;
+%   sol = 1.0379;
+  sol = 16.604703 % Ferraz-Leite Dipl.
 end
 
 % G_D

diff --git a/src/exmpl_3DFichCube.mat b/src/exmpl_3DFichCube.mat
index db13ae0a694228001d5c9b0a6d036cbc2029e7d5..18d64078819916778e56c8b100e9c82791952fc0 100644 (file)
Binary files a/src/exmpl_3DFichCube.mat and b/src/exmpl_3DFichCube.mat differ

diff --git a/src/mex_build_V.cpp b/src/mex_build_V.cpp
index 3e2dbfebea4a03cc663e0762e3270eff3b58265a..8ffde9e655954d59882509f64af8173c6a9f3d53 100644 (file)
--- a/src/mex_build_V.cpp
+++ b/src/mex_build_V.cpp
@@ -26,7 +26,7 @@
 /***************************************************************************/\r
 \r
 #define DEBUG 1\r
-//#define PARALLEL\r
+#define PARALLEL\r
 \r
 //#include <iostream>\r
 #include <cmath>\r
@@ -413,12 +413,12 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 \r
                                        sub(d, y[0], x[0]);\r
 \r
-                                       if(j==1 && k==0){\r
-                                               mexPrintf("[%d %d](%f,%f)(%f,%f)+(%f,%f,%f)", j, k,\r
-                                                               (xa[rxa]), (xb[rxb]), (ya[rya]),\r
-                                                               (yb[ryb]), d[rxa], d[rxb], d[rx]);\r
-                                               mexPrintf("{%d,%d;%d,%d}\n",rxa,rxb,rya,rxb);\r
-                                       }\r
+//                                     if(j==1 && k==0){\r
+//                                             mexPrintf("[%d %d](%f,%f)(%f,%f)+(%f,%f,%f)", j, k,\r
+//                                                             (xa[rxa]), (xb[rxb]), (ya[rya]),\r
+//                                                             (yb[ryb]), d[rxa], d[rxb], d[rx]);\r
+//                                             mexPrintf("{%d,%d;%d,%d}\n",rxa,rxb,rya,rxb);\r
+//                                     }\r
 \r
 #if DEBUG >= 5\r
 #pragma omp critical\r

diff --git a/src/slpRectangle.cpp b/src/slpRectangle.cpp
index 04a0c8ab5f7fde33b18bac963f2dd1214e998abe..efdd77b1267f094c1ad81b10ed3372e157d3aa6b 100644 (file)
--- a/src/slpRectangle.cpp
+++ b/src/slpRectangle.cpp
@@ -508,8 +508,10 @@ double cOrtO2(double b, double d, double t, double v, double d1, double d2,
        //kurze Achse nach vorn\r
 //     switch_dim(b, d, t, v, d1, d2);\r
 \r
-       if (zeta[0] * zeta[0] * (t * t + v * v) < dist2_ort(b,d,t,v,d1,d2,d3))\r
+       if (zeta[0] * zeta[0] * (t * t + v * v) < dist2_ort(b,d,t,v,d1,d2,d3)){\r
+//             mexPrintf("Was used!\n");\r
                return intQ4<f_ort>(b, d, t, v, d1, d2, d3);\r
+       }\r
 \r
        return intA4<F_ort>(b, d, t, v, d1, d2, d3);\r
 }\r

diff --git a/src/test_sol.m b/src/test_sol.m
index 3ac6e88ae03b4a295ba36716f9af6122a900b719..b61f8eebaf4d2162dcd1ecae3e43d1b99d55aacd 100644 (file)
--- a/src/test_sol.m
+++ b/src/test_sol.m
@@ -8,21 +8,23 @@ mex mex_build_V.cpp slpRectangle.cpp CFLAGS="\$CFLAGS  -fopenmp" CXXFLAGS="\$CXX
 
 % Test ausführen
 
-%Anzahl der Schritte oder wenn groeßer als 30 der Elemente
+%Anzahl der Schritte oder wenn groeßer als 40 der Elemente
 steps = 500;
 
 %Art der Berechnungen
-type = [1];
+type = [1 2];
 zeta = { [2 2 2] [2 2 2]};
 
 
 %% Quad adaptiv anisotrop
 %Datei
-file = 'exmpl_3DCube';
+file = 'exmpl_3DFichCube';
+% file = 'exmpl_3DCube';
+% file = 'exmpl_2DQuad';
 %Adaptiv
-theta = 0.7;
+theta = 0.5;
 %Anisotrop
-nu = 0.2;
+nu = 0.5;
 tic
 [a b fileo]=compute(file, steps, zeta, type, theta, nu, 0);