From b35f135ba66df7e7ab9ce9310da62317571c0a76 Mon Sep 17 00:00:00 2001 From: soufyanR1 Date: Wed, 9 Oct 2024 20:41:12 +0200 Subject: [PATCH 1/6] Expose AtmosphereModel environment (untested) --- .../expose_environment.cpp | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp index 1a047cc0..1df55892 100644 --- a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp +++ b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp @@ -154,6 +154,42 @@ void expose_environment(py::module &m) { .export_values(); + py::class_>( + m, "AtmosphereModel", + get_docstring("AtmosphereModel").c_str() ) + .def("get_density", &ta::AtmosphereModel::getDensity, + py::arg( "altitude" ), + py::arg( "longitude" ), + py::arg( "latitude" ), + py::arg( "time" ), + get_docstring("AtmosphereModel.get_density").c_str() ) + .def("get_pressure", &ta::AtmosphereModel::getPressure, + py::arg( "altitude" ), + py::arg( "longitude" ), + py::arg( "latitude" ), + py::arg( "time" ), + get_docstring("AtmosphereModel.get_pressure").c_str() ) + .def("get_temperature", &ta::AtmosphereModel::getTemperature, + py::arg( "altitude" ), + py::arg( "longitude" ), + py::arg( "latitude" ), + py::arg( "time" ), + get_docstring("AtmosphereModel.get_temperature").c_str() ) + .def("get_speed_of_sound", &ta::AtmosphereModel::getSpeedOfSound, + py::arg( "altitude" ), + py::arg( "longitude" ), + py::arg( "latitude" ), + py::arg( "time" ), + get_docstring("AtmosphereModel.get_speed_of_sound").c_str() ) + .def("get_number_density", &ta::AtmosphereModel::getNumberDensity, + py::arg( "species" ), + py::arg( "altitude" ), + py::arg( "longitude" ), + py::arg( "latitude" ), + py::arg( "time" ), + get_docstring("AtmosphereModel.get_number_density").c_str() ); + py::class_>(m, "AerodynamicCoefficientInterface" ) .def_property_readonly("reference_area", &ta::AerodynamicCoefficientInterface::getReferenceArea ) From 3c5689cdcca780c0efd30b9e7db8823742e8e5c4 Mon Sep 17 00:00:00 2001 From: soufyanR1 Date: Wed, 9 Oct 2024 20:42:20 +0200 Subject: [PATCH 2/6] Possible fix to expose GravityFieldModel (untested) --- .../kernel/expose_numerical_simulation/expose_environment.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp index 1df55892..dcb1213c 100644 --- a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp +++ b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp @@ -606,7 +606,8 @@ void expose_environment(py::module &m) { */ py::class_>(m, "GravityFieldModel") + std::shared_ptr>(m, "GravityFieldModel", + get_docstring("GravityFieldModel").c_str() ) .def(py::init< const double, const std::function>(), From b352a11eafb40a08888f6388b1a5012398871a5c Mon Sep 17 00:00:00 2001 From: soufyanR1 Date: Wed, 9 Oct 2024 20:46:25 +0200 Subject: [PATCH 3/6] Possible fix to expose BodyShapeModel (untested) --- .../kernel/expose_numerical_simulation/expose_environment.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp index dcb1213c..638dfca8 100644 --- a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp +++ b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp @@ -641,7 +641,8 @@ void expose_environment(py::module &m) { */ py::class_>(m, "ShapeModel") + std::shared_ptr>(m, "ShapeModel", + get_docstring("AerodynamicCoefficientInterface").c_str() ) .def("get_average_radius", &tba::BodyShapeModel::getAverageRadius) .def_property_readonly("average_radius", &tba::BodyShapeModel::getAverageRadius); From 2465b18e05198d5469f9a1932c4467e603794d63 Mon Sep 17 00:00:00 2001 From: soufyanR1 Date: Wed, 9 Oct 2024 20:54:58 +0200 Subject: [PATCH 4/6] Possible fix to expose AerodynamicsReferenceFrameAngles (untested) --- .../kernel/expose_numerical_simulation/expose_environment.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp index 638dfca8..ee01314e 100644 --- a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp +++ b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp @@ -312,7 +312,8 @@ void expose_environment(py::module &m) { ************** FLIGHT CONDITIONS AND ASSOCIATED FUNCTIONALITY ****************** */ - py::enum_(m, "AerodynamicsReferenceFrameAngles") + py::enum_(m, "AerodynamicsReferenceFrameAngles", + get_docstring("AerodynamicsReferenceFrameAngles").c_str()) .value("latitude_angle", trf::AerodynamicsReferenceFrameAngles::latitude_angle) .value("longitude_angle", trf::AerodynamicsReferenceFrameAngles::longitude_angle) .value("heading_angle", trf::AerodynamicsReferenceFrameAngles::heading_angle) From 9a51746cfade4406011b7344980e4182d51d524e Mon Sep 17 00:00:00 2001 From: soufyanR1 Date: Wed, 9 Oct 2024 21:14:33 +0200 Subject: [PATCH 5/6] Possible fix to expose GroundStation (untested) --- .../kernel/expose_numerical_simulation/expose_environment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp index ee01314e..a3a095bf 100644 --- a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp +++ b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp @@ -665,7 +665,7 @@ void expose_environment(py::module &m) { .def_property_readonly("rotation_matrix_body_fixed_to_topocentric", &tgs::GroundStationState::getRotationMatrixFromBodyFixedToTopocentricFrame ); py::class_>(m, "GroundStation") + std::shared_ptr>(m, "GroundStation", get_docstring("GroundStation").c_str()) .def_property_readonly("pointing_angles_calculator", &tgs::GroundStation::getPointingAnglesCalculator ) .def_property_readonly("station_state", &tgs::GroundStation::getNominalStationState ); From 0f073b72d67a0c84a9436e816d0a33688faa2071 Mon Sep 17 00:00:00 2001 From: DominicDirkx Date: Mon, 14 Oct 2024 13:19:57 +0200 Subject: [PATCH 6/6] Update expose_environment.cpp --- .../kernel/expose_numerical_simulation/expose_environment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp index a3a095bf..25e09c49 100644 --- a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp +++ b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp @@ -643,7 +643,7 @@ void expose_environment(py::module &m) { py::class_>(m, "ShapeModel", - get_docstring("AerodynamicCoefficientInterface").c_str() ) + get_docstring("ShapeModel").c_str() ) .def("get_average_radius", &tba::BodyShapeModel::getAverageRadius) .def_property_readonly("average_radius", &tba::BodyShapeModel::getAverageRadius);