diff --git a/CMakeLists.txt b/CMakeLists.txt index 00be27a97..77029d579 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -320,9 +320,9 @@ ENDIF () ## Versioning -IF (DEFINED PROJECT_VERSION_STRING AND EXISTS "${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utilities/Version.cpp.in") +IF (DEFINED PROJECT_VERSION_STRING AND EXISTS "${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utility/Version.cpp.in") - CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utilities/Version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/${PROJECT_PATH}/Utilities/Version.cpp" @ONLY) + CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utility/Version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/${PROJECT_PATH}/Utility/Version.cpp" @ONLY) ENDIF () diff --git a/README.md b/README.md index 49d82e58a..fc8bcfb58 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ Documentation is available here: The library exhibits the following structure: ```txt -├── Units +├── Unit │ ├── Length │ ├── Mass │ ├── Time @@ -142,10 +142,10 @@ The library exhibits the following structure: │ ├── Coordinate Reference System (CRS) │ └── Universal Transverse Mercator (UTM) └── Environment - ├── Constants + ├── Constant ├── Object │ └── Celestial - ├── Ephemerides + ├── Ephemeris │ ├── Analytical │ ├── Tabulated │ └── SPICE (JPL) @@ -183,11 +183,11 @@ The following table shows the availabe data source settings: | Environment Variable | Default Value | | ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------ | | `OSTK_PHYSICS_DATA_LOCAL_REPOSITORY` | `./.open-space-toolkit/physics/data` [Bulk setting. Overridden by specific repository settings below.] | -| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDERS_IERS_MANAGER_MODE` | `Automatic` | -| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDERS_IERS_MANAGER_LOCAL_REPOSITORY` | `./.open-space-toolkit/physics/data/coordinate/frame/providers/iers` | -| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDERS_IERS_MANAGER_LOCAL_REPOSITORY_LOCK_TIMEOUT` | `60` | -| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIDES_SPICE_ENGINE_MODE` | `Automatic` | -| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIDES_SPICE_MANAGER_LOCAL_REPOSITORY` | `./.open-space-toolkit/physics/data/environment/ephemerides/spice` | +| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDER_IERS_MANAGER_MODE` | `Automatic` | +| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDER_IERS_MANAGER_LOCAL_REPOSITORY` | `./.open-space-toolkit/physics/data/coordinate/frame/provider/iers` | +| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDER_IERS_MANAGER_LOCAL_REPOSITORY_LOCK_TIMEOUT` | `60` | +| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIS_SPICE_ENGINE_MODE` | `Automatic` | +| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIS_SPICE_MANAGER_LOCAL_REPOSITORY` | `./.open-space-toolkit/physics/data/environment/ephemeris/spice` | | `OSTK_PHYSICS_ENVIRONMENT_GRAVITATIONAL_EARTH_MANAGER_MODE` | `Automatic` | | `OSTK_PHYSICS_ENVIRONMENT_GRAVITATIONAL_EARTH_MANAGER_LOCAL_REPOSITORY` | `./.open-space-toolkit/physics/data/environment/gravitational/earth` | | `OSTK_PHYSICS_ENVIRONMENT_GRAVITATIONAL_EARTH_MANAGER_LOCAL_REPOSITORY_LOCK_TIMEOUT` | `60` | diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy.cxx b/bindings/python/src/OpenSpaceToolkitPhysicsPy.cxx index f97b45f16..26a1b1a3d 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy.cxx +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy.cxx @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include -#include -#include +#include +#include +#include #include #include #include @@ -12,7 +12,7 @@ #include #include #include -#include +#include PYBIND11_MODULE(OpenSpaceToolkitPhysicsPy, m) { @@ -33,7 +33,7 @@ PYBIND11_MODULE(OpenSpaceToolkitPhysicsPy, m) #endif // Add python submodules to OpenSpaceToolkitPhysicsPy - OpenSpaceToolkitPhysicsPy_Units(m); + OpenSpaceToolkitPhysicsPy_Unit(m); OpenSpaceToolkitPhysicsPy_Time(m); OpenSpaceToolkitPhysicsPy_Coordinate(m); OpenSpaceToolkitPhysicsPy_Environment(m); diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame.cpp index 2b6a8fdf0..c5c509e4c 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame.cpp @@ -3,7 +3,6 @@ #include #include -#include inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame(pybind11::module& aModule) { @@ -67,5 +66,4 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame(pybind11::module& aModule frame.attr("__path__") = "ostk.physics.coordinate.frame"; OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider(frame); - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers(frame); } diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider.cpp index 9ee18c1cd..805f77b38 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider.cpp @@ -2,6 +2,11 @@ #include +#include +#include +#include +#include + inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider(pybind11::module& aModule) { using namespace pybind11; @@ -18,6 +23,18 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider(pybind11::module ; + // Create "provider" python submodule + auto provider = aModule.def_submodule("provider"); + + // Add __path__ attribute for "provider" submodule + provider.attr("__path__") = "ostk.physics.coordinate.frame.provider"; + + // Add objects to python "provider" submodules + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Static(provider); + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Dynamic(provider); + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS(provider); + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU(provider); + // register_ptr_to_python>() ; // implicitly_convertible, Shared>() ; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/Dynamic.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Dynamic.cpp similarity index 90% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/Dynamic.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Dynamic.cpp index a68ad8b3e..ef1a9031e 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/Dynamic.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Dynamic.cpp @@ -1,10 +1,10 @@ /// Apache License 2.0 -#include +#include #include #include -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_Dynamic(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Dynamic(pybind11::module& aModule) { using namespace pybind11; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IAU.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU.cpp similarity index 51% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IAU.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU.cpp index dcf81d06a..b76a991d8 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IAU.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU.cpp @@ -1,15 +1,15 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IAU(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU(pybind11::module& aModule) { // Create "IAU" python submodule auto IAU = aModule.def_submodule("iau"); // Add __path__ attribute for "IAU" submodule - IAU.attr("__path__") = "ostk.physics.coordinate.frame.providers.iau"; + IAU.attr("__path__") = "ostk.physics.coordinate.frame.provider.iau"; // Add objects to python "IAU" submodules - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IAU_Theory(IAU); + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU_Theory(IAU); } diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IAU/Theory.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU/Theory.cpp similarity index 50% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IAU/Theory.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU/Theory.cpp index 1c2c368f9..10d30af40 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IAU/Theory.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU/Theory.cpp @@ -1,12 +1,12 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IAU_Theory(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU_Theory(pybind11::module& aModule) { using namespace pybind11; - using ostk::physics::coord::frame::providers::iau::Theory; + using ostk::physics::coord::frame::provider::iau::Theory; enum_(aModule, "Theory") diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS.cpp new file mode 100644 index 000000000..c966027b7 --- /dev/null +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS.cpp @@ -0,0 +1,19 @@ +/// Apache License 2.0 + +#include +#include +#include + +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS(pybind11::module& aModule) +{ + // Create "iers" python submodule + auto iers = aModule.def_submodule("iers"); + + // Add __path__ attribute for "iers" submodule + iers.attr("__path__") = "ostk.physics.coordinate.frame.provider.iers"; + + // Add objects to python "iers" submodules + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Manager(iers); + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_BulletinA(iers); + OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Finals2000A(iers); +} diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/BulletinA.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/BulletinA.cpp similarity index 93% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/BulletinA.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/BulletinA.cpp index feb82d53a..18c86bf49 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/BulletinA.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/BulletinA.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_BulletinA(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_BulletinA(pybind11::module& aModule) { using namespace pybind11; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/Finals2000A.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Finals2000A.cpp similarity index 92% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/Finals2000A.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Finals2000A.cpp index 9f782e818..3e701fcd8 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/Finals2000A.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Finals2000A.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_Finals2000A(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Finals2000A(pybind11::module& aModule) { using namespace pybind11; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/Manager.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Manager.cpp similarity index 90% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/Manager.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Manager.cpp index c68795059..ceeaa46a0 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS/Manager.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Manager.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_Manager(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Manager(pybind11::module& aModule) { using namespace pybind11; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/Static.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Static.cpp similarity index 73% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/Static.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Static.cpp index a1fe49dd1..6e247796f 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/Static.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Static.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_Static(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Static(pybind11::module& aModule) { using namespace pybind11; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers.cpp deleted file mode 100644 index d4d4875e2..000000000 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/// Apache License 2.0 - -#include -#include -#include -#include - -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers(pybind11::module& aModule) -{ - // Create "providers" python submodule - auto providers = aModule.def_submodule("providers"); - - // Add __path__ attribute for "providers" submodule - providers.attr("__path__") = "ostk.physics.coordinate.frame.providers"; - - // Add objects to python "providers" submodules - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_Static(providers); - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_Dynamic(providers); - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS(providers); - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IAU(providers); -} diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS.cpp deleted file mode 100644 index 0e6b42223..000000000 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/// Apache License 2.0 - -#include -#include -#include - -inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS(pybind11::module& aModule) -{ - // Create "iers" python submodule - auto iers = aModule.def_submodule("iers"); - - // Add __path__ attribute for "iers" submodule - iers.attr("__path__") = "ostk.physics.coordinate.frame.providers.iers"; - - // Add objects to python "iers" submodules - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_Manager(iers); - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_BulletinA(iers); - OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_Finals2000A(iers); -} diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/AER.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/AER.cpp index 8950e6148..b3e34543e 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/AER.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/AER.cpp @@ -6,8 +6,8 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Spherical_AER(pybind11::module& { using namespace pybind11; - using ostk::physics::units::Length; - using ostk::physics::units::Angle; + using ostk::physics::unit::Length; + using ostk::physics::unit::Angle; using ostk::physics::coord::Position; using ostk::physics::coord::spherical::AER; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/LLA.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/LLA.cpp index 60e83046f..1a29d293c 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/LLA.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/LLA.cpp @@ -6,8 +6,8 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Spherical_LLA(pybind11::module& { using namespace pybind11; - using ostk::physics::units::Length; - using ostk::physics::units::Angle; + using ostk::physics::unit::Length; + using ostk::physics::unit::Angle; using ostk::physics::coord::spherical::LLA; class_(aModule, "LLA") diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment.cpp index 0779fa763..a1e18013e 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment.cpp @@ -6,7 +6,6 @@ #include #include #include -#include inline void OpenSpaceToolkitPhysicsPy_Environment(pybind11::module& aModule) { @@ -63,7 +62,6 @@ inline void OpenSpaceToolkitPhysicsPy_Environment(pybind11::module& aModule) environment.attr("__path__") = "ostk.physics.environment"; OpenSpaceToolkitPhysicsPy_Environment_Object(environment); - OpenSpaceToolkitPhysicsPy_Environment_Objects(environment); OpenSpaceToolkitPhysicsPy_Environment_Gravitational(environment); OpenSpaceToolkitPhysicsPy_Environment_Magnetic(environment); OpenSpaceToolkitPhysicsPy_Environment_Atmospheric(environment); diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth.cpp index 3798dbcf9..ddfe4f4cb 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth.cpp @@ -21,7 +21,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth(pybind11::mo using EarthGravityModel = ostk::physics::environment::gravitational::Earth; using ostk::physics::environment::object::Celestial; - using ostk::physics::units::Length; + using ostk::physics::unit::Length; using ostk::physics::time::Instant; using ostk::physics::coord::Position; using ostk::physics::coord::spherical::LLA; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth/NRLMSISE00.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth/NRLMSISE00.cpp index 4b14ead53..96659aaf1 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth/NRLMSISE00.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth/NRLMSISE00.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth_NRLMSISE00(pybind11::module& aModule) { @@ -11,7 +11,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth_NRLMSISE00(p using ostk::core::type::Shared; using ostk::core::type::Real; - using ostk::physics::units::Length; + using ostk::physics::unit::Length; using ostk::physics::time::Instant; using ostk::physics::coord::Frame; using ostk::physics::coord::spherical::LLA; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Model.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Model.cpp index 6c92b2261..5df75bc79 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Model.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Model.cpp @@ -9,8 +9,8 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Gravitational_Model(pybind11:: using ostk::core::type::Real; using ostk::core::type::Shared; - using ostk::physics::units::Derived; - using ostk::physics::units::Length; + using ostk::physics::unit::Derived; + using ostk::physics::unit::Length; using ostk::physics::environment::gravitational::Model; { diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Earth.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Earth.cpp index 622f719b6..3759f66bb 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Earth.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Earth.cpp @@ -12,7 +12,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Magnetic_Earth(pybind11::modul using ostk::core::filesystem::Directory; using ostk::core::type::Shared; - using ostk::physics::units::Derived; + using ostk::physics::unit::Derived; using ostk::physics::environment::magnetic::Earth; using ostk::physics::environment::magnetic::earth::Manager; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object.cpp index c64f45ca7..3a7aa724f 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object.cpp @@ -2,6 +2,7 @@ #include +#include #include inline void OpenSpaceToolkitPhysicsPy_Environment_Object(pybind11::module& aModule) @@ -50,4 +51,5 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Object(pybind11::module& aModu // Add elements to object OpenSpaceToolkitPhysicsPy_Environment_Object_Geometry(object); + OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial(object); } diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/Celestial.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial.cpp similarity index 84% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/Celestial.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial.cpp index d10541785..4519d1ad7 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/Celestial.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial.cpp @@ -1,8 +1,12 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_Celestial(pybind11::module& aModule) +#include +#include +#include + +inline void OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial(pybind11::module& aModule) { using namespace pybind11; @@ -11,8 +15,8 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_Celestial(pybind11::mo using ostk::core::type::String; using ostk::physics::time::Instant; - using ostk::physics::units::Length; - using ostk::physics::units::Derived; + using ostk::physics::unit::Length; + using ostk::physics::unit::Derived; using ostk::physics::environment::Ephemeris; using ostk::physics::environment::Object; using ostk::physics::environment::object::Celestial; @@ -139,4 +143,15 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_Celestial(pybind11::mo // register_ptr_to_python>() ; // implicitly_convertible, Shared>() ; + + // Create "celestial" python submodule + auto celestial = aModule.def_submodule("celestial"); + + // Add __path__ attribute for "celestial" submodule + celestial.attr("__path__") = "ostk.physics.environment.object.celestial"; + + // Add objects to python "celestial" submodules + OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial_Earth(celestial); + OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial_Moon(celestial); + OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial_Sun(celestial); } diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Earth.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Earth.cpp similarity index 91% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Earth.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Earth.cpp index a2ff76988..5525012ca 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Earth.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Earth.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Earth(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial_Earth(pybind11::module& aModule) { using namespace pybind11; @@ -10,12 +10,12 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Earth( using ostk::core::type::Real; using ostk::core::type::Shared; - using ostk::physics::units::Length; - using ostk::physics::units::Derived; + using ostk::physics::unit::Length; + using ostk::physics::unit::Derived; using ostk::physics::coord::Frame; using ostk::physics::time::Instant; using ostk::physics::environment::Ephemeris; - using ostk::physics::environment::ephemerides::Analytical; + using ostk::physics::environment::ephemeris::Analytical; using ostk::physics::environment::object::Celestial; using ostk::physics::environment::object::celestial::Earth; using EarthGravitationalModel = ostk::physics::environment::gravitational::Earth; diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Moon.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Moon.cpp similarity index 84% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Moon.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Moon.cpp index 17557ecd3..f58feb760 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Moon.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Moon.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Moon(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial_Moon(pybind11::module& aModule) { using namespace pybind11; @@ -37,6 +37,6 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Moon(p auto moon = aModule.def_submodule("moon"); // Add __path__ attribute for "moon" submodule - moon.attr("__path__") = "ostk.physics.environment.objects.celestial_bodies.moon"; + moon.attr("__path__") = "ostk.physics.environment.object.celestial.moon"; } } diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Sun.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Sun.cpp similarity index 79% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Sun.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Sun.cpp index 062a53044..fd5218af3 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies/Sun.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial/Sun.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Sun(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial_Sun(pybind11::module& aModule) { using namespace pybind11; @@ -37,6 +37,6 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Sun(py auto sun = aModule.def_submodule("sun"); // Add __path__ attribute for "moon" submodule - sun.attr("__path__") = "ostk.physics.environment.objects.celestial_bodies.sun"; + sun.attr("__path__") = "ostk.physics.environment.object.celestial.sun"; } } diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects.cpp deleted file mode 100644 index 3d37cfefc..000000000 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/// Apache License 2.0 - -#include -#include - -inline void OpenSpaceToolkitPhysicsPy_Environment_Objects(pybind11::module& aModule) -{ - // Create "objects" python submodule - auto objects = aModule.def_submodule("objects"); - - // Add __path__ attribute for "objects" submodule - objects.attr("__path__") = "ostk.physics.environment.objects"; - - // Add objects to python "objects" submodules - OpenSpaceToolkitPhysicsPy_Environment_Objects_Celestial(objects); - OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies(objects); -} diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies.cpp deleted file mode 100644 index 1e58db344..000000000 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/// Apache License 2.0 - -#include -#include -#include - -inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies(pybind11::module& aModule) -{ - // Create "celestial_bodies" python submodule - auto celestial_bodies = aModule.def_submodule("celestial_bodies"); - - // Add __path__ attribute for "celestial_bodies" submodule - celestial_bodies.attr("__path__") = "ostk.physics.environment.objects.celestial_bodies"; - - // Add objects to python "celestial_bodies" submodules - OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Earth(celestial_bodies); - OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Moon(celestial_bodies); - OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Sun(celestial_bodies); -} diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit.cpp new file mode 100644 index 000000000..d9ec3dc05 --- /dev/null +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit.cpp @@ -0,0 +1,25 @@ +/// Apache License 2.0 + +#include +#include +#include +#include +#include +#include + +inline void OpenSpaceToolkitPhysicsPy_Unit(pybind11::module& aModule) +{ + // Create "unit" python submodule + auto unit = aModule.def_submodule("unit"); + + // Add __path__ attribute for "unit" submodule + unit.attr("__path__") = "ostk.physics.unit"; + + // Add objects to python "unit" submodules + OpenSpaceToolkitPhysicsPy_Unit_Length(unit); + OpenSpaceToolkitPhysicsPy_Unit_Mass(unit); + OpenSpaceToolkitPhysicsPy_Unit_Time(unit); + OpenSpaceToolkitPhysicsPy_Unit_ElectricCurrent(unit); + OpenSpaceToolkitPhysicsPy_Unit_Derived(unit); + OpenSpaceToolkitPhysicsPy_Unit_Derived_Angle(unit); +} diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Derived.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Derived.cpp similarity index 91% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Derived.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Derived.cpp index 16fd2226b..608bc5d17 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Derived.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Derived.cpp @@ -1,20 +1,20 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Units_Derived(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Unit_Derived(pybind11::module& aModule) { using namespace pybind11; using ostk::core::type::Integer; using ostk::core::type::Real; - using ostk::physics::units::Length; - using ostk::physics::units::Mass; - using ostk::physics::units::Time; - using ostk::physics::units::ElectricCurrent; - using ostk::physics::units::Angle; - using ostk::physics::units::Derived; + using ostk::physics::unit::Length; + using ostk::physics::unit::Mass; + using ostk::physics::unit::Time; + using ostk::physics::unit::ElectricCurrent; + using ostk::physics::unit::Angle; + using ostk::physics::unit::Derived; class_ derived_class(aModule, "Derived"); diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Derived/Angle.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Derived/Angle.cpp similarity index 93% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Derived/Angle.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Derived/Angle.cpp index 063656621..883d525a4 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Derived/Angle.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Derived/Angle.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Units_Derived_Angle(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Unit_Derived_Angle(pybind11::module& aModule) { using namespace pybind11; @@ -12,7 +12,7 @@ inline void OpenSpaceToolkitPhysicsPy_Units_Derived_Angle(pybind11::module& aMod using ostk::mathematics::object::Vector2d; using ostk::mathematics::object::Vector3d; - using ostk::physics::units::Angle; + using ostk::physics::unit::Angle; class_ angle(aModule, "Angle"); @@ -151,6 +151,6 @@ inline void OpenSpaceToolkitPhysicsPy_Units_Derived_Angle(pybind11::module& aMod ; - implicitly_convertible(); - implicitly_convertible(); + implicitly_convertible(); + implicitly_convertible(); } diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/ElectricCurrent.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/ElectricCurrent.cpp similarity index 92% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/ElectricCurrent.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/ElectricCurrent.cpp index 3ca7dd5f4..fae467db3 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/ElectricCurrent.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/ElectricCurrent.cpp @@ -2,16 +2,16 @@ #include -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Units_ElectricCurrent(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Unit_ElectricCurrent(pybind11::module& aModule) { using namespace pybind11; using ostk::core::type::Integer; using ostk::core::type::Real; - using ostk::physics::units::ElectricCurrent; + using ostk::physics::unit::ElectricCurrent; class_ elec_current(aModule, "ElectricCurrent"); diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Length.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Length.cpp similarity index 95% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Length.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Length.cpp index fe585e39c..322a9ebac 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Length.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Length.cpp @@ -2,16 +2,16 @@ #include -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Units_Length(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Unit_Length(pybind11::module& aModule) { using namespace pybind11; using ostk::core::type::Integer; using ostk::core::type::Real; - using ostk::physics::units::Length; + using ostk::physics::unit::Length; class_ length(aModule, "Length"); diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Mass.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Mass.cpp similarity index 88% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Mass.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Mass.cpp index 3ebc608b7..be251c7fe 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Mass.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Mass.cpp @@ -1,8 +1,8 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Units_Mass(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Unit_Mass(pybind11::module& aModule) { using namespace pybind11; @@ -10,7 +10,7 @@ inline void OpenSpaceToolkitPhysicsPy_Units_Mass(pybind11::module& aModule) using ostk::core::type::Real; using ostk::core::type::String; - using ostk::physics::units::Mass; + using ostk::physics::unit::Mass; class_ mass(aModule, "Mass"); diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Time.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Time.cpp similarity index 92% rename from bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Time.cpp rename to bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Time.cpp index 41b3a3fa0..ccc507088 100644 --- a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Time.cpp +++ b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Time.cpp @@ -1,15 +1,15 @@ /// Apache License 2.0 -#include +#include -inline void OpenSpaceToolkitPhysicsPy_Units_Time(pybind11::module& aModule) +inline void OpenSpaceToolkitPhysicsPy_Unit_Time(pybind11::module& aModule) { using namespace pybind11; using ostk::core::type::Integer; using ostk::core::type::Real; - using ostk::physics::units::Time; + using ostk::physics::unit::Time; class_