Issue #86: Update BSK gravFactory

AVSLab · Dec 14, 2023 · 5634386 · 5634386
1 parent 47b1d76
commit 5634386
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/bsk_rl/envs/general_satellite_tasking/simulation/environment.py b/src/bsk_rl/envs/general_satellite_tasking/simulation/environment.py
@@ -121,11 +121,8 @@ def _set_gravity_bodies(
         self.planet.isCentralBody = (
             True  # ensure this is the central gravitational body
         )
-        self.planet.useSphericalHarmParams = True
-        simIncludeGravBody.loadGravFromFile(
-            bsk_path + "/supportData/LocalGravData/GGM03S.txt",
-            self.planet.spherHarm,
-            10,
+        self.planet.useSphericalHarmonicsGravityModel(
+            bsk_path + "/supportData/LocalGravData/GGM03S.txt", 10
         )
 
         # setup Spice interface for some solar system bodies

diff --git a/src/bsk_rl/envs/general_satellite_tasking/utils/orbital.py b/src/bsk_rl/envs/general_satellite_tasking/utils/orbital.py
@@ -178,9 +178,8 @@ def init_simulator(self) -> None:
         planet = self.gravFactory.createEarth()
         self.gravFactory.createSun()
         planet.isCentralBody = True
-        planet.useSphericalHarmParams = True
-        simIncludeGravBody.loadGravFromFile(
-            bskPath + "/supportData/LocalGravData/GGM03S.txt", planet.spherHarm, 10
+        planet.useSphericalHarmonicsGravityModel(
+            bskPath + "/supportData/LocalGravData/GGM03S.txt", 10
         )
         UTCInit = self.utc_init
         self.gravFactory.createSpiceInterface(

diff --git a/tests/integration/envs/general_satellite_tasking/scenario/test_int_satellites.py b/tests/integration/envs/general_satellite_tasking/scenario/test_int_satellites.py
@@ -44,9 +44,10 @@ class ImageSat(
     )
 
     def test_generate_more_windows(self):
-        self.env.reset()
+        observation, info = self.env.reset()
         dts = []
         while self.env.simulator.sim_time < 1500.0:
+            print(self.env.simulator.sim_time, info)
             observation, reward, terminated, truncated, info = self.env.step(1)
             dts.append(info["d_ts"])
         assert True  # Ensure stepping past initial generation duration works