Improve comments; Fix static method

haohanyang · Nov 26, 2024 · 9ad87ba · 9ad87ba
1 parent 8c56fb3
commit 9ad87ba
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 140 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # PHREEQC
 
-Python bindings of [PHREEQC Version 3](https://www.usgs.gov/software/phreeqc-version-3)
+Python bindings of [IPHREEQC](https://www.usgs.gov/software/phreeqc-version-3)
 
 ## Install
 ```

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,8 +5,8 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "phreeqc"
-version = "0.2.0"
-description="Python bindings for PHREEQC Version 3"
+version = "0.2.1"
+description="Python bindings for IPHREEQC"
 readme = "README.md"
 authors = [
   {name = "Haohan Yang"}

diff --git a/src/main.cpp b/src/main.cpp
@@ -10,13 +10,14 @@ namespace py = pybind11;
 class _Phreeqc : public IPhreeqc
 {
 public:
-    void _AccumulateLine(const char *line)
+    bool _AccumulateLine(const char *line)
     {
         auto result = AccumulateLine(line);
         if (result == VR_OUTOFMEMORY)
         {
-            throw std::bad_alloc();
+            return false;
         }
+        return true;
     }
 
     bool _SetCurrentSelectedOutputUserNumber(int n)
@@ -133,7 +134,7 @@ PYBIND11_MODULE(_iphreeqc, m)
         .def("get_selected_output_string_line_count", &_Phreeqc::GetSelectedOutputStringLineCount)
         .def("get_selected_output_string_on", &_Phreeqc::GetSelectedOutputStringOn)
         .def("_get_selected_output_value", &_Phreeqc::_GetSelectedOutputValue)
-        .def("get_version_string", &_Phreeqc::GetVersionString)
+        .def_static("get_version_string", &_Phreeqc::GetVersionString)
         .def("get_warning_string", &_Phreeqc::GetWarningString)
         .def("get_warning_string_line", &_Phreeqc::GetWarningStringLine)
         .def("get_warning_string_line_count", &_Phreeqc::GetWarningStringLineCount)