From 200528d2336810aa3af31070bd9347bdbd4b7504 Mon Sep 17 00:00:00 2001 From: Vishwa Shah Date: Thu, 8 Feb 2024 14:29:52 -0800 Subject: [PATCH] refactor!: rename plural to singular (#200) * refactor!: rename from plural to singular to align with the rest of the repo * refactor!: finish refactoring remaining * chore: suggestions to propagate the ephemerides->ephemeris change (#201) * refactor: rename moar * refactor: update test * Apply suggestions from code review Co-authored-by: kyle-cochran * refactor: suggestions for naming MR (#202) * refactor: suggestions for naming MR * fix: hardcoded IERS remote path must reflect what is in OSTk Data * fix: last failing test --------- Co-authored-by: kyle-cochran --- CMakeLists.txt | 4 +- README.md | 16 +- .../python/src/OpenSpaceToolkitPhysicsPy.cxx | 10 +- .../Coordinate/Frame.cpp | 2 - .../Coordinate/Frame/Provider.cpp | 17 +++ .../Frame/{Providers => Provider}/Dynamic.cpp | 4 +- .../Frame/{Providers => Provider}/IAU.cpp | 8 +- .../{Providers => Provider}/IAU/Theory.cpp | 6 +- .../Coordinate/Frame/Provider/IERS.cpp | 19 +++ .../IERS/BulletinA.cpp | 4 +- .../IERS/Finals2000A.cpp | 4 +- .../{Providers => Provider}/IERS/Manager.cpp | 4 +- .../Frame/{Providers => Provider}/Static.cpp | 4 +- .../Coordinate/Frame/Providers.cpp | 21 --- .../Coordinate/Frame/Providers/IERS.cpp | 19 --- .../Coordinate/Spherical/AER.cpp | 4 +- .../Coordinate/Spherical/LLA.cpp | 4 +- .../OpenSpaceToolkitPhysicsPy/Environment.cpp | 2 - .../Environment/Atmospheric/Earth.cpp | 2 +- .../Atmospheric/Earth/NRLMSISE00.cpp | 4 +- .../Environment/Gravitational/Model.cpp | 4 +- .../Environment/Magnetic/Earth.cpp | 2 +- .../Environment/Object.cpp | 2 + .../{Objects => Object}/Celestial.cpp | 23 ++- .../Celestial}/Earth.cpp | 10 +- .../Celestial}/Moon.cpp | 6 +- .../Celestial}/Sun.cpp | 6 +- .../Environment/Objects.cpp | 17 --- .../Environment/Objects/CelestialBodies.cpp | 19 --- .../src/OpenSpaceToolkitPhysicsPy/Unit.cpp | 25 ++++ .../{Units => Unit}/Derived.cpp | 16 +- .../{Units => Unit}/Derived/Angle.cpp | 10 +- .../{Units => Unit}/ElectricCurrent.cpp | 6 +- .../{Units => Unit}/Length.cpp | 6 +- .../{Units => Unit}/Mass.cpp | 6 +- .../{Units => Unit}/Time.cpp | 6 +- .../src/OpenSpaceToolkitPhysicsPy/Units.cpp | 25 ---- .../{Utilities => Utility}/ArrayCasting.hpp | 0 .../DateTimeCasting.hpp | 0 .../IterableConverter.hpp | 4 +- .../{Utilities => Utility}/ShiftToString.hpp | 0 .../frame/{providers => provider}/__init__.py | 0 .../{providers => provider}/iers/__init__.py | 0 .../{providers => provider}/iers/conftest.py | 4 +- .../iers/data/finals2000A.data | 0 .../iers/data/ser7.dat | 0 .../iers/test_bulletin_a.py | 2 +- .../iers/test_finals_2000a.py | 2 +- .../iers/test_manager.py | 10 +- .../test/coordinate/spherical/test_aer.py | 4 +- .../test/coordinate/spherical/test_lla.py | 2 +- bindings/python/test/coordinate/test_frame.py | 4 +- .../python/test/coordinate/test_position.py | 2 +- .../environment/atmospheric/earth/conftest.py | 2 +- .../atmospheric/earth/test_exponential.py | 4 +- .../atmospheric/earth/test_nrlmsise00.py | 4 +- .../environment/atmospheric/test_earth.py | 6 +- .../test/environment/magnetic/test_earth.py | 2 +- .../celestial/__init__ .py | 0 .../celestial/test_earth.py | 2 +- .../celestial/test_moon.py | 2 +- .../{objects => object}/celestial/test_sun.py | 2 +- .../{objects => object}/test_celestial.py | 2 +- bindings/python/test/test_import.py | 4 +- bindings/python/test/time/test_duration.py | 2 +- .../{environment/objects => unit}/__init__.py | 0 .../test/{units => unit/derived}/__init__.py | 0 .../{units => unit}/derived/test_angle.py | 2 +- .../test/{units => unit}/test_derived.py | 20 +-- .../python/test/unit/test_electric_current.py | 5 + .../test/{units => unit}/test_length.py | 32 ++-- .../python/test/{units => unit}/test_mass.py | 24 +-- .../python/test/{units => unit}/test_time.py | 8 +- .../python/test/units/derived/__init__.py | 1 - .../test/units/test_electric_current.py | 5 - .../Physics/Coordinate/Frame.hpp | 4 +- .../Frame/{Providers => Provider}/CIRF.hpp | 4 +- .../Frame/{Providers => Provider}/Dynamic.hpp | 4 +- .../Frame/{Providers => Provider}/GCRF.hpp | 4 +- .../{Providers => Provider}/IAU/Theory.hpp | 8 +- .../Frame/{Providers => Provider}/ICRF.hpp | 4 +- .../IERS/BulletinA.hpp | 4 +- .../IERS/BulletinB.hpp | 4 +- .../IERS/Finals2000A.hpp | 4 +- .../{Providers => Provider}/IERS/Manager.hpp | 28 ++-- .../Frame/{Providers => Provider}/ITRF.hpp | 4 +- .../Frame/{Providers => Provider}/J2000.hpp | 8 +- .../Frame/{Providers => Provider}/MOD.hpp | 4 +- .../Frame/{Providers => Provider}/Static.hpp | 4 +- .../Frame/{Providers => Provider}/TEME.hpp | 4 +- .../Frame/{Providers => Provider}/TIRF.hpp | 4 +- .../Frame/{Providers => Provider}/TOD.hpp | 8 +- .../Frame/{Utilities.hpp => Utility.hpp} | 8 +- .../Physics/Coordinate/Position.hpp | 4 +- .../Physics/Coordinate/Spherical/AER.hpp | 8 +- .../Physics/Coordinate/Spherical/LLA.hpp | 8 +- .../Physics/Coordinate/Velocity.hpp | 4 +- .../Physics/Data/Manifest.hpp | 2 +- .../Data/{Providers => Provider}/Nadir.hpp | 10 +- .../Data/{Utilities.hpp => Utility.hpp} | 4 +- .../OpenSpaceToolkit/Physics/Environment.hpp | 2 +- .../Physics/Environment/Atmospheric/Earth.hpp | 8 +- .../Atmospheric/Earth/Exponential.hpp | 4 +- .../Atmospheric/Earth/NRLMSISE00.hpp | 6 +- .../{Constants.hpp => Constant.hpp} | 0 .../{Ephemerides => Ephemeris}/Analytical.hpp | 8 +- .../{Ephemerides => Ephemeris}/SPICE.hpp | 8 +- .../SPICE/Engine.hpp | 22 +-- .../SPICE/Kernel.hpp | 10 +- .../SPICE/Manager.hpp | 22 +-- .../Environment/Gravitational/Model.hpp | 10 +- .../Environment/Gravitational/Moon.hpp | 4 +- .../Environment/Gravitational/Spherical.hpp | 4 +- .../Physics/Environment/Gravitational/Sun.hpp | 4 +- .../Physics/Environment/Magnetic/Dipole.hpp | 4 +- .../Physics/Environment/Magnetic/Earth.hpp | 4 +- .../{Objects => Object}/Celestial.hpp | 16 +- .../Celestial}/Earth.hpp | 18 +-- .../Celestial}/Moon.hpp | 14 +- .../Celestial}/Sun.hpp | 14 +- .../{Utilities => Utility}/Eclipse.hpp | 4 +- .../Physics/Time/Duration.hpp | 4 +- .../OpenSpaceToolkit/Physics/Time/Instant.hpp | 2 +- include/OpenSpaceToolkit/Physics/Unit.hpp | 20 +-- .../Physics/{Units => Unit}/Derived.hpp | 20 +-- .../Physics/{Units => Unit}/Derived/Angle.hpp | 10 +- .../{Units => Unit}/ElectricCurrent.hpp | 10 +- .../Physics/{Units => Unit}/Length.hpp | 10 +- .../Physics/{Units => Unit}/Mass.hpp | 10 +- .../Physics/{Units => Unit}/Time.hpp | 10 +- .../Physics/{Units => Unit}/Unit.hpp | 8 +- include/OpenSpaceToolkit/Physics/Units.hpp | 12 -- .../Physics/Coordinate/Frame.cpp | 18 +-- .../Frame/{Providers => Provider}/CIRF.cpp | 4 +- .../Frame/{Providers => Provider}/Dynamic.cpp | 2 +- .../Frame/{Providers => Provider}/GCRF.cpp | 2 +- .../{Providers => Provider}/IAU/Theory.cpp | 6 +- .../Frame/{Providers => Provider}/ICRF.cpp | 2 +- .../IERS/BulletinA.cpp | 4 +- .../IERS/Finals2000A.cpp | 4 +- .../{Providers => Provider}/IERS/Manager.cpp | 20 +-- .../Frame/{Providers => Provider}/ITRF.cpp | 6 +- .../Frame/{Providers => Provider}/J2000.cpp | 2 +- .../Frame/{Providers => Provider}/MOD.cpp | 8 +- .../Frame/{Providers => Provider}/Static.cpp | 2 +- .../Frame/{Providers => Provider}/TEME.cpp | 8 +- .../Frame/{Providers => Provider}/TIRF.cpp | 4 +- .../Frame/{Providers => Provider}/TOD.cpp | 2 +- .../Frame/{Utilities.cpp => Utility.cpp} | 2 +- .../Physics/Coordinate/Velocity.cpp | 4 +- .../Physics/Data/Manifest.cpp | 2 +- .../Data/{Providers => Provider}/Nadir.cpp | 6 +- .../Data/{Utilities.cpp => Utility.cpp} | 2 +- src/OpenSpaceToolkit/Physics/Environment.cpp | 8 +- .../Physics/Environment/Atmospheric/Earth.cpp | 4 +- .../Atmospheric/Earth/Exponential.cpp | 4 +- .../Atmospheric/Earth/NRLMSISE00.cpp | 4 +- .../{Ephemerides => Ephemeris}/Analytical.cpp | 6 +- .../{Ephemerides => Ephemeris}/SPICE.cpp | 10 +- .../SPICE/Engine.cpp | 14 +- .../SPICE/Kernel.cpp | 6 +- .../SPICE/Manager.cpp | 12 +- .../Environment/Gravitational/Earth.cpp | 8 +- .../Environment/Gravitational/Moon.cpp | 2 +- .../Environment/Gravitational/Spherical.cpp | 8 +- .../Physics/Environment/Gravitational/Sun.cpp | 2 +- .../Physics/Environment/Magnetic/Dipole.cpp | 8 +- .../{Objects => Object}/Celestial.cpp | 12 +- .../Celestial}/Earth.cpp | 2 +- .../Celestial}/Moon.cpp | 8 +- .../Celestial}/Sun.cpp | 8 +- .../{Utilities => Utilitity}/Eclipse.cpp | 2 +- .../Physics/Time/Duration.cpp | 18 +-- src/OpenSpaceToolkit/Physics/Unit.cpp | 42 +++--- .../Physics/{Units => Unit}/Derived.cpp | 10 +- .../Physics/{Units => Unit}/Derived/Angle.cpp | 34 +++-- .../{Units => Unit}/ElectricCurrent.cpp | 10 +- .../Physics/{Units => Unit}/Length.cpp | 12 +- .../Physics/{Units => Unit}/Mass.cpp | 10 +- .../Physics/{Units => Unit}/Time.cpp | 10 +- .../Physics/{Units => Unit}/Unit.cpp | 6 +- .../Physics/Coordinate/Frame.test.cpp | 10 +- .../{Providers => Provider}/IAU.test.cpp | 6 +- .../IERS/BulletinA.test.cpp | 38 ++--- .../IERS/BulletinA/ser7.dat | 0 .../IERS/Finals2000A/finals2000A.data | 0 .../IERS/Manager.test.cpp | 82 +++++------ .../GetPolarMotionAt/Pole Wander 1.csv | 0 .../GetPolarMotionAt/Pole Wander 2.csv | 0 .../GetPolarMotionAt/Pole Wander 3.csv | 0 .../Scenario/Scenario STK ScenarioWB.wsp | 8 +- .../Scenario/Scenario STK ScenarioWB.wsptb | Bin .../GetPolarMotionAt/Scenario/Scenario.sc | 0 .../GetPolarMotionAt/Scenario/Scenario.sc3 | 0 .../Scenario/ScenarioTimelinePrefs.xml | 0 .../IERS/Manager/GetUt1MinusUtcAt/DUT1 1.csv | 0 .../IERS/Manager/GetUt1MinusUtcAt/DUT1 2.csv | 0 .../IERS/Manager/GetUt1MinusUtcAt/DUT1 3.csv | 0 .../Scenario/Scenario STK ScenarioWB.wsp | 8 +- .../Scenario/Scenario STK ScenarioWB.wsptb | Bin .../GetUt1MinusUtcAt/Scenario/Scenario.sc | 0 .../GetUt1MinusUtcAt/Scenario/Scenario.sc3 | 0 .../Scenario/ScenarioTimelinePrefs.xml | 0 .../{Providers => Provider}/J2000.test.cpp | 10 +- .../{Providers => Provider}/MOD.test.cpp | 10 +- .../{Providers => Provider}/TEME.test.cpp | 14 +- .../TEME/Scenario_A/Scenario ITRF_TEME.csv | 0 .../Scenario_A/Scenario STK ScenarioWB.wsp | 8 +- .../Scenario_A/Scenario STK ScenarioWB.wsptb | Bin .../TEME/Scenario_A/Scenario.sc | 0 .../TEME/Scenario_A/Scenario.sc3 | 0 .../TEME/Scenario_A/ScenarioTimelinePrefs.xml | 0 .../TEME/Scenario_B/Scenario ITRF_TEME.csv | 0 .../Scenario_B/Scenario STK ScenarioWB.wsp | 8 +- .../Scenario_B/Scenario STK ScenarioWB.wsptb | Bin .../TEME/Scenario_B/Scenario.sc | 0 .../TEME/Scenario_B/Scenario.sc3 | 0 .../TEME/Scenario_B/ScenarioTimelinePrefs.xml | 0 .../{Providers => Provider}/TOD.test.cpp | 14 +- .../Transform.test.cpp | 54 +++---- .../Transforms/GCRF_CIRF_orekit.csv | 0 .../Transforms/GCRF_ITRF_orekit.csv | 0 .../Transforms/GCRF_ITRF_stk.csv | 0 .../Transforms/GCRF_J2000_orekit.csv | 0 .../Transforms/GCRF_J2000_stk.csv | 0 .../Transforms/GCRF_MOD_orekit.csv | 0 .../Transforms/GCRF_MOD_stk.csv | 0 .../Transforms/GCRF_TEME_orekit.csv | 0 .../Transforms/GCRF_TEME_stk.csv | 0 .../Transforms/GCRF_TIRF_orekit.csv | 0 .../Transforms/GCRF_TOD_orekit.csv | 0 .../Transforms/GCRF_TOD_stk.csv | 0 .../Transforms/README.md | 0 .../Physics/Coordinate/Frames/ITRF.test.cpp | 10 +- .../Physics/Coordinate/Frames/TOD.test.cpp | 2 +- .../Physics/Coordinate/Position.test.cpp | 2 +- .../Physics/Coordinate/Spherical/AER.test.cpp | 12 +- .../Physics/Coordinate/Spherical/LLA.test.cpp | 8 +- .../Physics/Coordinate/Transform.test.cpp | 4 +- .../{Providers => Provider}/Nadir.test.cpp | 6 +- .../Physics/Data/Utilities.test.cpp | 2 +- .../Physics/Environment.test.cpp | 12 +- .../Environment/Atmospheric/Earth.test.cpp | 14 +- .../Atmospheric/Earth/Exponential.test.cpp | 12 +- .../Atmospheric/Earth/NRLMSISE00.test.cpp | 16 +- .../{Ephemerides => Ephemeris}/SPICE.test.cpp | 48 +++--- .../SPICE/AccessFrame/Scenario_1 Earth.csv | 0 .../SPICE/AccessFrame/Scenario_1 Moon.csv | 0 .../SPICE/AccessFrame/Scenario_1 Sun.csv | 0 .../Scenario_1/Scenario_1 STK ScenarioWB.wsp | 8 +- .../Scenario_1 STK ScenarioWB.wsptb | Bin .../AccessFrame/Scenario_1/Scenario_1.sc | 0 .../AccessFrame/Scenario_1/Scenario_1.sc3 | 0 .../Scenario_1/Scenario_1TimelinePrefs.xml | 0 .../SPICE/Manager.test.cpp | 44 +++--- .../SPICE/de430.bsp | 0 .../SPICE/earth_000101_181204_180912.bpc | 0 .../SPICE/earth_000101_190206_181115.bpc | 0 .../SPICE/earth_200101_990628_predict.bpc | 0 .../SPICE/earth_assoc_itrf93.tf | 0 .../SPICE/moon_080317.tf | 0 .../SPICE/moon_assoc_me.tf | 0 .../SPICE/moon_assoc_pa.tf | 0 .../SPICE/moon_pa_de421_1900-2050.bpc | 0 .../SPICE/naif0012.tls | 0 .../SPICE/naif0012.tls.pc | 0 .../SPICE/pck00010.tpc | 0 .../Environment/Gravitational/Earth.test.cpp | 6 +- .../Gravitational/Spherical.test.cpp | 6 +- .../Physics/Environment/Object.test.cpp | 6 +- .../{Objects => Object}/Celestial.test.cpp | 38 ++--- .../Celestial}/Earth.test.cpp | 50 +++---- .../Earth/GetFrameAt/NED_GCRF 1.csv | 0 .../Earth/GetFrameAt/NED_GCRF 2.csv | 0 .../Earth/GetFrameAt/NED_GCRF 3.csv | 0 .../Earth/GetFrameAt/NED_GCRF 4.csv | 0 .../Earth/GetFrameAt/NED_ITRF 1.csv | 0 .../Earth/GetFrameAt/NED_ITRF 2.csv | 0 .../Earth/GetFrameAt/NED_ITRF 3.csv | 0 .../Earth/GetFrameAt/NED_ITRF 4.csv | 0 .../Scenario/Scenario STK ScenarioWB.wsp | 8 +- .../Scenario/Scenario STK ScenarioWB.wsptb | Bin .../Earth/GetFrameAt/Scenario/Scenario.sc | 0 .../Earth/GetFrameAt/Scenario/Scenario.sc3 | 0 .../Scenario/ScenarioTimelinePrefs.xml | 0 .../Earth/GetFrameAt/Scenario/Target1.t | 0 .../Earth/GetFrameAt/Scenario/Target1.t3 | 0 .../Earth/GetFrameAt/Scenario/Target2.t | 0 .../Earth/GetFrameAt/Scenario/Target2.t3 | 0 .../Earth/GetFrameAt/Scenario/Target3.t | 0 .../Earth/GetFrameAt/Scenario/Target3.t3 | 0 .../Earth/GetFrameAt/Scenario/Target4.t | 0 .../Earth/GetFrameAt/Scenario/Target4.t3 | 0 .../Celestial}/Moon.test.cpp | 8 +- .../Celestial}/Sun.test.cpp | 8 +- .../Environment/Object/Geometry.test.cpp | 8 +- .../{Utilities => Utility}/Eclipse.test.cpp | 20 +-- .../Scenario/Scenario STK ScenarioWB.wsp | 0 .../Scenario/Scenario STK ScenarioWB.wsptb | Bin .../Scenario/Scenario.sc | 0 .../Scenario/Scenario.sc3 | 0 .../Scenario/ScenarioTimelinePrefs.xml | 0 .../Scenario/Target.t | 0 .../Scenario/Target.t3 | 0 .../Scenario/Target_1.t | 0 .../Scenario/Target_1.t3 | 0 .../Scenario/Target_2.t | 0 .../Scenario/Target_2.t3 | 0 .../Scenario/Target_3.t | 0 .../Scenario/Target_3.t3 | 0 .../Scenario/Target_4.t | 0 .../Scenario/Target_4.t3 | 0 .../Scenario/Target_5.t | 0 .../Scenario/Target_5.t3 | 0 .../Target_1 Eclipse.csv | 0 .../Target_2 Eclipse.csv | 0 .../Target_3 Eclipse.csv | 0 .../Target_4 Eclipse.csv | 0 .../Target_5 Eclipse.csv | 0 .../Physics/Time/Duration.test.cpp | 2 +- test/OpenSpaceToolkit/Physics/Unit.test.cpp | 2 +- .../Physics/Units/Derived.test.cpp | 138 +++++++++--------- .../Physics/Units/Derived/Angle.test.cpp | 134 ++++++++--------- .../Physics/Units/ElectricCurrent.test.cpp | 46 +++--- .../Physics/Units/Length.test.cpp | 130 ++++++++--------- .../Physics/Units/Mass.test.cpp | 42 +++--- .../Physics/Units/Time.test.cpp | 42 +++--- .../OpenSpaceToolkitPhysicsConfig.cmake.in | 2 +- 328 files changed, 1245 insertions(+), 1275 deletions(-) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/{Providers => Provider}/Dynamic.cpp (90%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/{Providers => Provider}/IAU.cpp (51%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/{Providers => Provider}/IAU/Theory.cpp (50%) create mode 100644 bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS.cpp rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/{Providers => Provider}/IERS/BulletinA.cpp (93%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/{Providers => Provider}/IERS/Finals2000A.cpp (92%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/{Providers => Provider}/IERS/Manager.cpp (90%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/{Providers => Provider}/Static.cpp (73%) delete mode 100644 bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers.cpp delete mode 100644 bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS.cpp rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/{Objects => Object}/Celestial.cpp (84%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth.cpp (91%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/{Objects/CelestialBodies => Object/Celestial}/Moon.cpp (84%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/{Objects/CelestialBodies => Object/Celestial}/Sun.cpp (79%) delete mode 100644 bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects.cpp delete mode 100644 bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Objects/CelestialBodies.cpp create mode 100644 bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit.cpp rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Units => Unit}/Derived.cpp (91%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Units => Unit}/Derived/Angle.cpp (93%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Units => Unit}/ElectricCurrent.cpp (92%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Units => Unit}/Length.cpp (95%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Units => Unit}/Mass.cpp (88%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Units => Unit}/Time.cpp (92%) delete mode 100644 bindings/python/src/OpenSpaceToolkitPhysicsPy/Units.cpp rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Utilities => Utility}/ArrayCasting.hpp (100%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Utilities => Utility}/DateTimeCasting.hpp (100%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Utilities => Utility}/IterableConverter.hpp (95%) rename bindings/python/src/OpenSpaceToolkitPhysicsPy/{Utilities => Utility}/ShiftToString.hpp (100%) rename bindings/python/test/coordinate/frame/{providers => provider}/__init__.py (100%) rename bindings/python/test/coordinate/frame/{providers => provider}/iers/__init__.py (100%) rename bindings/python/test/coordinate/frame/{providers => provider}/iers/conftest.py (86%) rename bindings/python/test/coordinate/frame/{providers => provider}/iers/data/finals2000A.data (100%) rename bindings/python/test/coordinate/frame/{providers => provider}/iers/data/ser7.dat (100%) rename bindings/python/test/coordinate/frame/{providers => provider}/iers/test_bulletin_a.py (98%) rename bindings/python/test/coordinate/frame/{providers => provider}/iers/test_finals_2000a.py (98%) rename bindings/python/test/coordinate/frame/{providers => provider}/iers/test_manager.py (96%) rename bindings/python/test/environment/{objects => object}/celestial/__init__ .py (100%) rename bindings/python/test/environment/{objects => object}/celestial/test_earth.py (98%) rename bindings/python/test/environment/{objects => object}/celestial/test_moon.py (82%) rename bindings/python/test/environment/{objects => object}/celestial/test_sun.py (82%) rename bindings/python/test/environment/{objects => object}/test_celestial.py (81%) rename bindings/python/test/{environment/objects => unit}/__init__.py (100%) rename bindings/python/test/{units => unit/derived}/__init__.py (100%) rename bindings/python/test/{units => unit}/derived/test_angle.py (99%) rename bindings/python/test/{units => unit}/test_derived.py (84%) create mode 100644 bindings/python/test/unit/test_electric_current.py rename bindings/python/test/{units => unit}/test_length.py (92%) rename bindings/python/test/{units => unit}/test_mass.py (88%) rename bindings/python/test/{units => unit}/test_time.py (94%) delete mode 100644 bindings/python/test/units/derived/__init__.py delete mode 100644 bindings/python/test/units/test_electric_current.py rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/CIRF.hpp (88%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Dynamic.hpp (87%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/GCRF.hpp (87%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IAU/Theory.hpp (90%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/ICRF.hpp (87%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/BulletinA.hpp (97%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/BulletinB.hpp (95%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Finals2000A.hpp (97%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager.hpp (88%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/ITRF.hpp (87%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/J2000.hpp (82%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/MOD.hpp (93%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Static.hpp (86%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME.hpp (88%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TIRF.hpp (88%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TOD.hpp (83%) rename include/OpenSpaceToolkit/Physics/Coordinate/Frame/{Utilities.hpp => Utility.hpp} (78%) rename include/OpenSpaceToolkit/Physics/Data/{Providers => Provider}/Nadir.hpp (72%) rename include/OpenSpaceToolkit/Physics/Data/{Utilities.hpp => Utility.hpp} (83%) rename include/OpenSpaceToolkit/Physics/Environment/{Constants.hpp => Constant.hpp} (100%) rename include/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/Analytical.hpp (82%) rename include/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE.hpp (91%) rename include/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/Engine.hpp (88%) rename include/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/Kernel.hpp (93%) rename include/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/Manager.hpp (84%) rename include/OpenSpaceToolkit/Physics/Environment/{Objects => Object}/Celestial.hpp (93%) rename include/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth.hpp (92%) rename include/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Moon.hpp (82%) rename include/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Sun.hpp (82%) rename include/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse.hpp (89%) rename include/OpenSpaceToolkit/Physics/{Units => Unit}/Derived.hpp (91%) rename include/OpenSpaceToolkit/Physics/{Units => Unit}/Derived/Angle.hpp (95%) rename include/OpenSpaceToolkit/Physics/{Units => Unit}/ElectricCurrent.hpp (89%) rename include/OpenSpaceToolkit/Physics/{Units => Unit}/Length.hpp (93%) rename include/OpenSpaceToolkit/Physics/{Units => Unit}/Mass.hpp (89%) rename include/OpenSpaceToolkit/Physics/{Units => Unit}/Time.hpp (90%) rename include/OpenSpaceToolkit/Physics/{Units => Unit}/Unit.hpp (93%) delete mode 100644 include/OpenSpaceToolkit/Physics/Units.hpp rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/CIRF.cpp (95%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Dynamic.cpp (91%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/GCRF.cpp (87%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IAU/Theory.cpp (89%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/ICRF.cpp (89%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/BulletinA.cpp (99%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Finals2000A.cpp (99%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager.cpp (97%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/ITRF.cpp (94%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/J2000.cpp (97%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/MOD.cpp (93%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Static.cpp (92%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME.cpp (93%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TIRF.cpp (94%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TOD.cpp (97%) rename src/OpenSpaceToolkit/Physics/Coordinate/Frame/{Utilities.cpp => Utility.cpp} (96%) rename src/OpenSpaceToolkit/Physics/Data/{Providers => Provider}/Nadir.cpp (92%) rename src/OpenSpaceToolkit/Physics/Data/{Utilities.cpp => Utility.cpp} (96%) rename src/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/Analytical.cpp (83%) rename src/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE.cpp (83%) rename src/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/Engine.cpp (97%) rename src/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/Kernel.cpp (97%) rename src/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/Manager.cpp (95%) rename src/OpenSpaceToolkit/Physics/Environment/{Objects => Object}/Celestial.cpp (97%) rename src/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth.cpp (98%) rename src/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Moon.cpp (87%) rename src/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Sun.cpp (86%) rename src/OpenSpaceToolkit/Physics/Environment/{Utilities => Utilitity}/Eclipse.cpp (97%) rename src/OpenSpaceToolkit/Physics/{Units => Unit}/Derived.cpp (98%) rename src/OpenSpaceToolkit/Physics/{Units => Unit}/Derived/Angle.cpp (93%) rename src/OpenSpaceToolkit/Physics/{Units => Unit}/ElectricCurrent.cpp (91%) rename src/OpenSpaceToolkit/Physics/{Units => Unit}/Length.cpp (97%) rename src/OpenSpaceToolkit/Physics/{Units => Unit}/Mass.cpp (92%) rename src/OpenSpaceToolkit/Physics/{Units => Unit}/Time.cpp (94%) rename src/OpenSpaceToolkit/Physics/{Units => Unit}/Unit.cpp (95%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IAU.test.cpp (72%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/BulletinA.test.cpp (87%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/BulletinA/ser7.dat (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Finals2000A/finals2000A.data (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager.test.cpp (80%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetPolarMotionAt/Pole Wander 1.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetPolarMotionAt/Pole Wander 2.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetPolarMotionAt/Pole Wander 3.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers/IERS/Manager/GetUt1MinusUtcAt => Provider/IERS/Manager/GetPolarMotionAt}/Scenario/Scenario STK ScenarioWB.wsp (89%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetPolarMotionAt/Scenario/Scenario STK ScenarioWB.wsptb (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetPolarMotionAt/Scenario/Scenario.sc (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetPolarMotionAt/Scenario/Scenario.sc3 (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetPolarMotionAt/Scenario/ScenarioTimelinePrefs.xml (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetUt1MinusUtcAt/DUT1 1.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetUt1MinusUtcAt/DUT1 2.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetUt1MinusUtcAt/DUT1 3.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers/IERS/Manager/GetPolarMotionAt => Provider/IERS/Manager/GetUt1MinusUtcAt}/Scenario/Scenario STK ScenarioWB.wsp (89%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetUt1MinusUtcAt/Scenario/Scenario STK ScenarioWB.wsptb (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetUt1MinusUtcAt/Scenario/Scenario.sc (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetUt1MinusUtcAt/Scenario/Scenario.sc3 (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/IERS/Manager/GetUt1MinusUtcAt/Scenario/ScenarioTimelinePrefs.xml (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/J2000.test.cpp (94%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/MOD.test.cpp (87%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME.test.cpp (92%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_A/Scenario ITRF_TEME.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_A/Scenario STK ScenarioWB.wsp (91%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_A/Scenario STK ScenarioWB.wsptb (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_A/Scenario.sc (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_A/Scenario.sc3 (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_A/ScenarioTimelinePrefs.xml (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_B/Scenario ITRF_TEME.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_B/Scenario STK ScenarioWB.wsp (91%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_B/Scenario STK ScenarioWB.wsptb (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_B/Scenario.sc (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_B/Scenario.sc3 (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TEME/Scenario_B/ScenarioTimelinePrefs.xml (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/TOD.test.cpp (87%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transform.test.cpp (93%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_CIRF_orekit.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_ITRF_orekit.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_ITRF_stk.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_J2000_orekit.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_J2000_stk.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_MOD_orekit.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_MOD_stk.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_TEME_orekit.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_TEME_stk.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_TIRF_orekit.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_TOD_orekit.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/GCRF_TOD_stk.csv (100%) rename test/OpenSpaceToolkit/Physics/Coordinate/Frame/{Providers => Provider}/Transforms/README.md (100%) rename test/OpenSpaceToolkit/Physics/Data/{Providers => Provider}/Nadir.test.cpp (82%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE.test.cpp (89%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1 Earth.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1 Moon.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1 Sun.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1/Scenario_1 STK ScenarioWB.wsp (90%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1/Scenario_1 STK ScenarioWB.wsptb (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1/Scenario_1.sc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1/Scenario_1.sc3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/AccessFrame/Scenario_1/Scenario_1TimelinePrefs.xml (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/Manager.test.cpp (80%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/de430.bsp (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/earth_000101_181204_180912.bpc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/earth_000101_190206_181115.bpc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/earth_200101_990628_predict.bpc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/earth_assoc_itrf93.tf (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/moon_080317.tf (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/moon_assoc_me.tf (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/moon_assoc_pa.tf (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/moon_pa_de421_1900-2050.bpc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/naif0012.tls (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/naif0012.tls.pc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Ephemerides => Ephemeris}/SPICE/pck00010.tpc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects => Object}/Celestial.test.cpp (94%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth.test.cpp (87%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_GCRF 1.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_GCRF 2.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_GCRF 3.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_GCRF 4.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_ITRF 1.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_ITRF 2.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_ITRF 3.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/NED_ITRF 4.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Scenario STK ScenarioWB.wsp (88%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Scenario STK ScenarioWB.wsptb (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Scenario.sc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Scenario.sc3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/ScenarioTimelinePrefs.xml (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target1.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target1.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target2.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target2.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target3.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target3.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target4.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Earth/GetFrameAt/Scenario/Target4.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Moon.test.cpp (85%) rename test/OpenSpaceToolkit/Physics/Environment/{Objects/CelestialBodies => Object/Celestial}/Sun.test.cpp (85%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse.test.cpp (92%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Scenario STK ScenarioWB.wsp (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Scenario STK ScenarioWB.wsptb (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Scenario.sc (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Scenario.sc3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/ScenarioTimelinePrefs.xml (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_1.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_1.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_2.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_2.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_3.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_3.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_4.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_4.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_5.t (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Scenario/Target_5.t3 (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Target_1 Eclipse.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Target_2 Eclipse.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Target_3 Eclipse.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Target_4 Eclipse.csv (100%) rename test/OpenSpaceToolkit/Physics/Environment/{Utilities => Utility}/Eclipse/EclipseIntervalsAtPosition/Target_5 Eclipse.csv (100%) 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_