Merge branch 'master' into dev

.gitignore

@@ -35,6 +35,8 @@ cmake-build-*/
 # Rever
 rever/
 
+.dat
+
 __pycache__/*
 __pycache__*
 .DS_Store
@@ -47,4 +49,5 @@ __pycache__*
 */jupyter-lab.log
 jupyter-lab.log
 
-**/*.pkl
+**/*.pkl
+*.dat

propagation/perturbed_satellite_orbit.ipynb

@@ -31,9 +31,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "1a3e92d7",
-   "metadata": {},
+   "metadata": {
+    "is_executing": true
+   },
    "outputs": [],
    "source": [
     "# Load standard modules\n",
@@ -189,14 +191,14 @@
    "outputs": [],
    "source": [
     "# Create radiation pressure settings, and add to vehicle\n",
-    "reference_area = (4*0.3*0.1+2*0.1*0.1)/4  # Average projection area of a 3U CubeSat\n",
+    "reference_area_radiation = (4*0.3*0.1+2*0.1*0.1)/4  # Average projection area of a 3U CubeSat\n",
     "radiation_pressure_coefficient = 1.2\n",
-    "occulting_bodies = [\"Earth\"]\n",
-    "radiation_pressure_settings = environment_setup.radiation_pressure.cannonball(\n",
-    "    \"Sun\", reference_area_radiation, radiation_pressure_coefficient, occulting_bodies\n",
-    ")\n",
-    "environment_setup.add_radiation_pressure_interface(\n",
-    "    bodies, \"Delfi-C3\", radiation_pressure_settings)"
+    "occulting_bodies_dict = dict()\n",
+    "occulting_bodies_dict[ \"Sun\" ] = [ \"Earth\" ]\n",
+    "vehicle_target_settings = environment_setup.radiation_pressure.cannonball_radiation_target(\n",
+    "    reference_area_radiation, radiation_pressure_coefficient, occulting_bodies_dict )\n",
+    "environment_setup.add_radiation_pressure_target_model(\n",
+    "    bodies, \"Delfi-C3\", vehicle_target_settings)"
    ]
   },
   {
@@ -253,7 +255,7 @@
     "# Define accelerations acting on Delfi-C3 by Sun and Earth.\n",
     "accelerations_settings_delfi_c3 = dict(\n",
     "    Sun=[\n",
-    "        propagation_setup.acceleration.cannonball_radiation_pressure(),\n",
+    "        propagation_setup.acceleration.radiation_pressure(),\n",
     "        propagation_setup.acceleration.point_mass_gravity()\n",
     "    ],\n",
     "    Earth=[\n",

propagation/perturbed_satellite_orbit.py

@@ -114,14 +114,14 @@
 # To account for the pressure of the solar radiation on the satellite, let's add another interface. This takes a radiation pressure coefficient of 1.2, and a radiation area of 4m$^2$. This interface also accounts for the variation in pressure cause by the shadow of Earth.
 
 # Create radiation pressure settings, and add to vehicle
-reference_area = (4*0.3*0.1+2*0.1*0.1)/4  # Average projection area of a 3U CubeSat
+reference_area_radiation = (4*0.3*0.1+2*0.1*0.1)/4  # Average projection area of a 3U CubeSat
 radiation_pressure_coefficient = 1.2
-occulting_bodies = ["Earth"]
-radiation_pressure_settings = environment_setup.radiation_pressure.cannonball(
-    "Sun", reference_area_radiation, radiation_pressure_coefficient, occulting_bodies
-)
-environment_setup.add_radiation_pressure_interface(
-    bodies, "Delfi-C3", radiation_pressure_settings)
+occulting_bodies_dict = dict()
+occulting_bodies_dict[ "Sun" ] = [ "Earth" ]
+vehicle_target_settings = environment_setup.radiation_pressure.cannonball_radiation_target(
+    reference_area_radiation, radiation_pressure_coefficient, occulting_bodies_dict )
+environment_setup.add_radiation_pressure_target_model(
+    bodies, "Delfi-C3", vehicle_target_settings)
 
 ## Propagation setup
 """
@@ -154,7 +154,7 @@
 # Define accelerations acting on Delfi-C3 by Sun and Earth.
 accelerations_settings_delfi_c3 = dict(
     Sun=[
-        propagation_setup.acceleration.cannonball_radiation_pressure(),
+        propagation_setup.acceleration.radiation_pressure(),
         propagation_setup.acceleration.point_mass_gravity()
     ],
     Earth=[