[src] alte automatische Funktionen komplett entfernt

[src] standard analytisch für Automaitsche funktionen erstellt und eingerichtet

diff --git a/src/mex_build_V.cpp b/src/mex_build_V.cpp
index cb20cc4d2621af49a8d96963f3239642104ce0e1..a479a0db126d3d00725366452c12b2d720451729 100644 (file)
--- a/src/mex_build_V.cpp
+++ b/src/mex_build_V.cpp
@@ -129,19 +129,19 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
        switch (type) {\r
        default:        // Voll Analytisch\r
                ctypeP = cParO1;\r
-               ctypeO = NULL;\r
+               ctypeO = cOrtO1;\r
                break;\r
        case 2:         // Analytisch oder Qadratur\r
                ctypeP = cParO2;\r
-               ctypeO = NULL;\r
+               ctypeO = cOrtO1;\r
                break;\r
        case 3:         // Analytisch oder Qx1x2\r
                ctypeP = cParO3;\r
-               ctypeO = NULL;\r
+               ctypeO = cOrtO1;\r
                break;\r
        case 4:\r
                ctypeP = cParO4;\r
-               ctypeO = NULL;\r
+               ctypeO = cOrtO1;\r
                break;\r
        }\r
 \r

diff --git a/src/slpRectangle.cpp b/src/slpRectangle.cpp
index 421052fd074bdcee26bcc9dee5ac6201d4094af9..d4a509ac2057dba0844054663a08306f70232088 100644 (file)
--- a/src/slpRectangle.cpp
+++ b/src/slpRectangle.cpp
@@ -495,156 +495,14 @@ double calcOrtIntQX1X2(double b, double d, double t, double v, double d1,
 \r
 }\r
 \r
-double calcParIntO0(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double zeta) {\r
-       return calcParIntA(b, d, t, v, d1, d2, d3);\r
-}\r
-\r
-double calcOrtIntO0(double b, double d, double t, double v, double d1,\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 zeta) {\r
-\r
-       //Elmente anordnen\r
-       if (b * b + d * d > t * t + v * v) {\r
-               double tmp = 0;\r
-\r
-               tmp = b;\r
-               b = t;\r
-               t = tmp;\r
-               tmp = d;\r
-               d = v;\r
-               v = tmp;\r
-\r
-               d1 = -d1;\r
-               d2 = -d2;\r
-               d3 = -d3;\r
-       }\r
-\r
+double cParO1(double b, double d, double t, double v, double d1, double d2,\r
+               double d3, double* zeta) {\r
        return calcParIntA(b, d, t, v, d1, d2, d3);\r
 }\r
 \r
-double calcOrtIntO1(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double zeta) {\r
-\r
-       //Elmente anordnen\r
-       if (b * b + d * d > t * t + v * v) {\r
-               double tmp = 0;\r
-\r
-               tmp = b;\r
-               b = v;\r
-               v = tmp;\r
-               tmp = d;\r
-               d = t;\r
-               t = tmp;\r
-\r
-               d1 = -d1;\r
-               d2 = -d2;\r
-               d3 = -d3;\r
-       }\r
-\r
-       return calcOrtIntA(b, d, t, v, d1, d2, d3);\r
-}\r
-\r
-double calcParIntO2(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double zeta) {\r
-\r
-       //Elmente anordnen\r
-       if (b * b + d * d > t * t + v * v) {\r
-               double tmp = 0;\r
-\r
-               tmp = b;\r
-               b = t;\r
-               t = tmp;\r
-               tmp = d;\r
-               d = v;\r
-               v = tmp;\r
-\r
-               d1 = -d1;\r
-               d2 = -d2;\r
-               d3 = -d3;\r
-       }\r
-\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
-//             return calcParIntA(b, d, t, v, d1, d2, d3);\r
-//     }\r
-\r
-}\r
-\r
-double calcOrtIntO2(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double zeta) {\r
-\r
-       //Elmente anordnen\r
-       if (d > t) {\r
-               double tmp = 0;\r
-\r
-               tmp = b;\r
-               b = v;\r
-               v = tmp;\r
-               tmp = d;\r
-               d = t;\r
-               t = tmp;\r
-\r
-               d1 = -d1;\r
-               d2 = -d2;\r
-               d3 = -d3;\r
-       }\r
-\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
-               return calcOrtIntA(b, d, t, v, d1, d2, d3);\r
-       }\r
-}\r
-\r
-double calcParIntO3(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double zeta) {\r
-\r
-       //Achsen vertauschen\r
-       if (b * b + t * t > d * d + v * v) {\r
-               double tmp = 0;\r
-\r
-               tmp = b;\r
-               b = d;\r
-               d = tmp;\r
-               tmp = t;\r
-               t = v;\r
-               v = tmp;\r
-\r
-               tmp = d1;\r
-               d1 = d2;\r
-               d2 = tmp;\r
-       }\r
-\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
-//             return calcParIntA(b, d, t, v, d1, d2, d3);\r
-//     }\r
-\r
-}\r
-\r
-double calcOrtIntO3(double b, double d, double t, double v, double d1,\r
-               double d2, double d3, double zeta) {\r
-\r
-       if (max(b, t) * zeta > d1) {\r
-               return 0;\r
-       } else {\r
-               return calcOrtIntA(b, d, t, v, d1, d2, d3);\r
-       }\r
-}\r
-\r
-double cParO1(double b, double d, double t, double v, double d1, double d2,\r
+double cOrtO1(double b, double d, double t, double v, double d1, double d2,\r
                double d3, double* zeta) {\r
-       return calcParIntA(b, d, t, v, d1, d2, d3);\r
+       return calcOrtIntA(b, d, t, v, d1, d2, d3);\r
 }\r
 \r
 double cParO2(double b, double d, double t, double v, double d1, double d2,\r

diff --git a/src/slpRectangle.hpp b/src/slpRectangle.hpp
index 3dd7a1a8f7ca3d0334560b40d5182d2eda8a85ad..4995bd2839232ff612318fa485b6e8cc7d0c2b41 100644 (file)
--- a/src/slpRectangle.hpp
+++ b/src/slpRectangle.hpp
@@ -42,6 +42,7 @@ double calcOrtIntQX1X2(double, double, double, double, double, double, double);
 
 //Voll Analytisch
 double cParO1(double, double, double, double, double, double, double, double*);
+double cOrtO1(double, double, double, double, double, double, double, double*);
 //A oder Q
 double cParO2(double, double, double, double, double, double, double, double*);
 //A oder Qx1x2