Merge pull request #18 from LLNL/prom_dg_advection

PROM DG advection
LLNL · Oct 30, 2023 · 0c0ca7c · 0c0ca7c
2 parents 258f178 + d85a461
commit 0c0ca7c
Show file tree

Hide file tree

Showing 3 changed files with 633 additions and 19 deletions.
diff --git a/bindings/pylibROM/linalg/pyBasisReader.cpp b/bindings/pylibROM/linalg/pyBasisReader.cpp
@@ -16,21 +16,51 @@ void init_BasisReader(pybind11::module_ &m) {
             py::arg("base_file_name"),
             py::arg("file_format") = Database::formats::HDF5
         )
-        .def("isNewBasis",(bool (BasisReader::*)(double)) &BasisReader::isNewBasis)
-        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double)) &BasisReader::getSpatialBasis)
-        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double,int)) &BasisReader::getSpatialBasis)
-        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double,int,int)) &BasisReader::getSpatialBasis)
-        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double,double)) &BasisReader::getSpatialBasis)
-        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double)) &BasisReader::getTemporalBasis)
-        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double,int)) &BasisReader::getTemporalBasis)
-        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double,int,int)) &BasisReader::getTemporalBasis)
-        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double,double)) &BasisReader::getTemporalBasis)
-        .def("getSingularValues",(Vector* (BasisReader::*)(double)) &BasisReader::getSingularValues)
-        .def("getSingularValues",(Vector* (BasisReader::*)(double,double)) &BasisReader::getSingularValues)
-        .def("getDim", (int (BasisReader::*)(const std::string,double)) &BasisReader::getDim)
-        .def("getNumSamples", (int (BasisReader::*)(const std::string,double)) &BasisReader::getNumSamples) 
-        .def("getSnapshotMatrix",(Matrix* (BasisReader::*)(double)) &BasisReader::getSnapshotMatrix)
-        .def("getSnapshotMatrix",(Matrix* (BasisReader::*)(double,int)) &BasisReader::getSnapshotMatrix)
-        .def("getSnapshotMatrix",(Matrix* (BasisReader::*)(double,int,int)) &BasisReader::getSnapshotMatrix)
+        .def("isNewBasis",(bool (BasisReader::*)(double)) &BasisReader::isNewBasis,
+            py::arg("time"))
+        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double)) &BasisReader::getSpatialBasis,
+            py::arg("time"))
+        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double,int)) &BasisReader::getSpatialBasis,
+            py::arg("time"),
+            py::arg("n"))
+        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double,int,int)) &BasisReader::getSpatialBasis,
+            py::arg("time"),
+            py::arg("start_col"),
+            py::arg("end_col"))
+        .def("getSpatialBasis",(Matrix* (BasisReader::*)(double,double)) &BasisReader::getSpatialBasis,
+            py::arg("time"),
+            py::arg("ef").noconvert())
+        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double)) &BasisReader::getTemporalBasis,
+            py::arg("time"))
+        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double,int)) &BasisReader::getTemporalBasis,
+            py::arg("time"),
+            py::arg("n"))
+        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double,int,int)) &BasisReader::getTemporalBasis,
+            py::arg("time"),
+            py::arg("start_col"),
+            py::arg("end_col"))
+        .def("getTemporalBasis",(Matrix* (BasisReader::*)(double,double)) &BasisReader::getTemporalBasis,
+            py::arg("time"),
+            py::arg("ef").noconvert())
+        .def("getSingularValues",(Vector* (BasisReader::*)(double)) &BasisReader::getSingularValues,
+            py::arg("time"))
+        .def("getSingularValues",(Vector* (BasisReader::*)(double,double)) &BasisReader::getSingularValues,
+            py::arg("time"),
+            py::arg("ef"))
+        .def("getDim", (int (BasisReader::*)(const std::string,double)) &BasisReader::getDim,
+            py::arg("kind"),
+            py::arg("time"))
+        .def("getNumSamples", (int (BasisReader::*)(const std::string,double)) &BasisReader::getNumSamples,
+            py::arg("kind"),
+            py::arg("time"))
+        .def("getSnapshotMatrix",(Matrix* (BasisReader::*)(double)) &BasisReader::getSnapshotMatrix,
+            py::arg("time"))
+        .def("getSnapshotMatrix",(Matrix* (BasisReader::*)(double,int)) &BasisReader::getSnapshotMatrix,
+            py::arg("time"),
+            py::arg("n"))
+        .def("getSnapshotMatrix",(Matrix* (BasisReader::*)(double,int,int)) &BasisReader::getSnapshotMatrix,
+            py::arg("time"),
+            py::arg("start_col"),
+            py::arg("end_col"))
         .def("__del__", [](BasisReader& self) { self.~BasisReader(); }); // Destructor
 }