update python wrapper

NCAR · Apr 24, 2024 · e302328 · e302328
1 parent 3aad428
commit e302328
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -2,7 +2,6 @@ pybind11_add_module(musica_python
   wrapper.cpp
   ${PROJECT_SOURCE_DIR}/src/micm/micm.cpp
   ${PROJECT_SOURCE_DIR}/src/component_versions.c
-  ${PROJECT_SOURCE_DIR}/src/error.cpp
   ${PROJECT_SOURCE_DIR}/src/util.cpp
   ${CMAKE_BINARY_DIR}/version.c
 )

diff --git a/python/wrapper.cpp b/python/wrapper.cpp
@@ -15,7 +15,8 @@ PYBIND11_MODULE(musica, m)
 
     m.def("create_micm", [](const char *config_path)
           {
-        MICM* micm = create_micm(config_path);
+        Error error;
+        MICM* micm = create_micm(config_path, &error);
         return micm; });
 
     m.def("delete_micm", &delete_micm);
@@ -36,9 +37,11 @@ PYBIND11_MODULE(musica, m)
             }
         }
 
+        Error error;
         micm_solve(micm, time_step, temperature, pressure, 
             concentrations_cpp.size(), concentrations_cpp.data(), 
-            custom_rate_parameters_cpp.size(), custom_rate_parameters_cpp.data());
+            custom_rate_parameters_cpp.size(), custom_rate_parameters_cpp.data(),
+            &error);
 
          // Update the concentrations list after solving
         for (size_t i = 0; i < concentrations_cpp.size(); ++i) {
@@ -48,11 +51,13 @@ PYBIND11_MODULE(musica, m)
 
     m.def(
         "species_ordering", [](MICM *micm)
-        { return micm->get_species_ordering(); },
+        {   Error error;
+            return micm->get_species_ordering(&error); },
         "Return map of get_species_ordering rates");
 
     m.def(
         "user_defined_reaction_rates", [](MICM *micm)
-        { return micm->get_user_defined_reaction_rates_ordering(); },
+        {   Error error;
+            return micm->get_user_defined_reaction_rates_ordering(&error); },
         "Return map of reaction rates");
 }