[sourcegen] Handle custom code

Cantera · Jan 5, 2025 · 38bef3d · 38bef3d
1 parent 4a7f97f
commit 38bef3d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/interfaces/sourcegen/sourcegen/_data/ctsol_auto.yaml b/interfaces/sourcegen/sourcegen/_data/ctsol_auto.yaml
@@ -23,7 +23,17 @@ recipes:
 - name: thermo
 - name: kinetics
 - name: transport
-- name: setTransport  # currently disabled in CLib's config.yaml
+- name: setTransportModel
+  code: |-
+    try {
+        auto obj = SolutionCabinet::at(handle);
+        TransportCabinet::del(
+            TransportCabinet::index(*(obj->transport()), handle));
+        obj->setTransportModel(model);
+        return TransportCabinet::add(obj->transport(), handle);
+    } catch (...) {
+        return handleAllExceptions(-2, ERR);
+    }
 - name: nAdjacent
 - name: adjacent
   implements: Solution::adjacent(size_t)

diff --git a/interfaces/sourcegen/sourcegen/clib/_CLibSourceGenerator.py b/interfaces/sourcegen/sourcegen/clib/_CLibSourceGenerator.py
@@ -297,7 +297,12 @@ def _scaffold_body(self, c_func: CFunc, recipe: Recipe) -> tuple[str, set[str]]:
         args, bases = self._reverse_crosswalk(c_func, recipe.base)
         args["what"] = recipe.what
 
-        if recipe.what == "noop":
+        if recipe.code:
+            # override auto-generated code
+            template = loader.from_string(self._templates["clib-custom-code"])
+            args["lines"] = recipe.code.strip(" \n").split("\n")
+
+        elif recipe.what == "noop":
             template = loader.from_string(self._templates["clib-noop"])
 
         elif recipe.what == "function":
@@ -383,10 +388,6 @@ def merge_params(implements, cxx_func: CFunc) -> tuple[list[Param], int]:
         args = []
         brief = ""
 
-        if recipe.code:
-            _LOGGER.warning("Custom code is currently not implemented: "
-                            "continuing with auto-generated code.")
-
         if recipe.implements:
             if not quiet:
                 _LOGGER.debug(f"   generating {func_name!r} -> {recipe.implements}")

diff --git a/interfaces/sourcegen/sourcegen/clib/config.yaml b/interfaces/sourcegen/sourcegen/clib/config.yaml
@@ -7,8 +7,8 @@
 ignore_files: []
 
 # Ignore these specific functions:
-ignore_funcs:
-  ctsol_auto.yaml: [setTransport]
+ignore_funcs: {}
+  # ctsol_auto.yaml: [setTransport]
 
 # Cabinets with associated includes
 includes:

diff --git a/interfaces/sourcegen/sourcegen/clib/templates.yaml b/interfaces/sourcegen/sourcegen/clib/templates.yaml
@@ -250,6 +250,14 @@ clib-noop: |-
   // no-op
   return 0;
 
+clib-custom-code: |-
+  // {{ what }}: {{ cxx_implements }}
+  // ********** custom code begin **********
+  {% for line in lines %}
+  {{ line }}
+  {% endfor -%}
+  // *********** custom code end ***********
+
 clib-implementation: |-
   {{ declaration }}
   {