[matlab] Replace magic number domain types

interfaces/matlab/toolbox/1D/@Domain1D/domainType.m

@@ -1,12 +1,10 @@
-function i = domainType(d)
+function v = domainType(d)
 % DOMAINTYPE  Get the type of domain.
-% i = domainType(d)
+% v = domainType(d)
 % :param d:
 %     Instance of class :mat:func:`Domain1D`
 % :return:
-%     This function returns an integer flag denoting the domain
-%     type.
+%     This function returns a string describing the domain type.
 %
 
-i = domain_methods(d.dom_id, 12);
-
+v = domain_methods(d.dom_id, 12);

interfaces/matlab/toolbox/1D/@Domain1D/isFlow.m

@@ -7,11 +7,6 @@
 %     1 if the domain is a flow domain, and 0 otherwise.
 %
 
-t = domainType(d);
-
-% See Domain1D.h for definitions of constants
-if t < 100
-    a = 1;
-else
-    a = 0;
+v = domainType(d);
+a = int8(strcmp(v, 'free-flow') || strcmp(v, 'stagnation-flow'));
 end

interfaces/matlab/toolbox/1D/@Domain1D/isInlet.m

@@ -7,9 +7,5 @@
 %     1 if the domain is an inlet, and 0 otherwise.
 %
 
-t = domainType(d);
-if t == 104
-  a = 1;
-else
-  a = 0;
+a = int8(strcmp(domainType(d), 'inlet'));
 end

interfaces/matlab/toolbox/1D/@Domain1D/isSurface.m

@@ -7,9 +7,5 @@
 %     1 if the domain is a surface, and 0 otherwise.
 %
 
-t = domainType(d);
-if t == 102
-    a = 1;
-else
-    a = 0;
+a = int8(strcmp(domainType(d), 'surface'));
 end

src/matlab/onedimmethods.cpp

@@ -99,6 +99,16 @@ void onedimmethods(int nlhs, mxArray* plhs[],
             reportError();
         }
         return;
+    } else if (job == 12) {
+        checkNArgs(3, nrhs);
+        int buflen = domain_type3(dom, 0, 0);
+        char* output_buf = (char*)mxCalloc(buflen, sizeof(char));
+        int iok = domain_type3(dom, buflen, output_buf);
+        if (iok < 0) {
+            reportError();
+        }
+        plhs[0] = mxCreateString(output_buf);
+        return;
     } else if (job < 40) {
         // methods
         int k;
@@ -112,10 +122,6 @@ void onedimmethods(int nlhs, mxArray* plhs[],
             checkNArgs(3, nrhs);
             vv = (double) domain_nComponents(dom);
             break;
-        case 12:
-            checkNArgs(3, nrhs);
-            vv = domain_type(dom);
-            break;
         case 13:
             checkNArgs(3, nrhs);
             vv = (double) domain_index(dom);
@@ -302,7 +308,7 @@ void onedimmethods(int nlhs, mxArray* plhs[],
         case 103:
             checkNArgs(4, nrhs);
             fname = getString(prhs[3]);
-            iok = sim1D_showSolution(dom, fname);
+            iok = sim1D_show(dom, fname);
             break;
         case 104:
             checkNArgs(5, nrhs);