[clib] Create domain_type3 to interface with Domain1D::type

Cantera · Mar 18, 2023 · ee28caa · ee28caa
1 parent 8eb0639
commit ee28caa
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/include/cantera/clib/ctonedim.h b/include/cantera/clib/ctonedim.h
@@ -17,6 +17,7 @@ extern "C" {
     CANTERA_CAPI int ct_clearOneDim();
     CANTERA_CAPI int domain_del(int i);
     CANTERA_CAPI int domain_type(int i);
+    CANTERA_CAPI int domain_type3(int i, size_t lennm, char* nm);
     CANTERA_CAPI size_t domain_index(int i);
     CANTERA_CAPI size_t domain_nComponents(int i);
     CANTERA_CAPI size_t domain_nPoints(int i);
@@ -70,6 +71,7 @@ extern "C" {
     CANTERA_CAPI int sim1D_setProfile(int i, int dom, int comp,
                                       size_t np, const double* pos, size_t nv, const double* v);
     CANTERA_CAPI int sim1D_setFlatProfile(int i, int dom, int comp, double v);
+    CANTERA_CAPI int sim1D_show(int i, const char* fname);
     CANTERA_CAPI int sim1D_showSolution(int i, const char* fname);
     CANTERA_CAPI int sim1D_setTimeStep(int i, double stepsize, size_t ns, const int* nsteps);
     CANTERA_CAPI int sim1D_getInitialSoln(int i);

diff --git a/src/clib/ctonedim.cpp b/src/clib/ctonedim.cpp
@@ -63,6 +63,15 @@ extern "C" {
         }
     }
 
+    int domain_type3(int i, size_t lennm, char* nm)
+    {
+        try {
+            return static_cast<int>(copyString(DomainCabinet::item(i).type(), nm, lennm));
+        } catch (...) {
+            return handleAllExceptions(-1, ERR);
+        }
+    }
+
     size_t domain_index(int i)
     {
         try {
@@ -525,6 +534,22 @@ extern "C" {
         }
     }
 
+    int sim1D_show(int i, const char* fname)
+    {
+        try {
+            string fn = string(fname);
+            if (fn == "-") {
+                SimCabinet::item(i).show();
+            } else {
+                ofstream fout(fname);
+                SimCabinet::item(i).show(fout);
+            }
+            return 0;
+        } catch (...) {
+            return handleAllExceptions(-1, ERR);
+        }
+    }
+
     int sim1D_showSolution(int i, const char* fname)
     {
         try {