Hide RestartConfig as private member of Schedule class

This commit is contained in:
Joakim Hove
2021-03-07 09:28:09 +01:00
parent 091c7b21cd
commit b5183b1d76
6 changed files with 32 additions and 23 deletions

View File

@@ -88,10 +88,6 @@ namespace {
}
const RestartConfig& restart(const Schedule& sch) {
return sch.restart();
}
const ScheduleState& getitem(const Schedule& sch, std::size_t index) {
return sch[index];
}
@@ -117,7 +113,6 @@ void python::common::export_Schedule(py::module& module) {
.def_property_readonly( "start", &get_start_time )
.def_property_readonly( "end", &get_end_time )
.def_property_readonly( "timesteps", &get_timesteps )
.def_property_readonly("restart", &restart)
.def("__len__", &Schedule::size)
.def("__getitem__", &getitem)
.def( "shut_well", &Schedule::shut_well)
@@ -128,9 +123,4 @@ void python::common::export_Schedule(py::module& module) {
.def( "get_well", &get_well)
.def( "__contains__", &has_well );
py::class_< RestartConfig >( module, "RestartConfig")
.def( "getKeyword", &RestartConfig::getKeyword )
.def( "getFirstRestartStep", &RestartConfig::getFirstRestartStep )
.def( "getWriteRestartFile", &RestartConfig::getWriteRestartFile, py::arg("reportStep"), py::arg("log") = true);
}

View File

@@ -68,12 +68,6 @@ class TestSchedule(unittest.TestCase):
prod = sch.get_well("PROD", 10)
self.assertEqual(prod.status(), "SHUT")
def test_restart(self):
deck = Parser().parse(test_path('spe3/SPE3CASE1.DATA'))
state = EclipseState(deck)
sch = Schedule( deck, state )
rst = sch.restart
def test_well_names(self):
deck = Parser().parse(test_path('spe3/SPE3CASE1.DATA'))