From 797f9642c89db40c80b476f66bb255c4080f4f6f Mon Sep 17 00:00:00 2001
From: Dominic Dirkx <d.dirkx@tudelft.nl>
Date: Wed, 17 Jan 2024 20:15:28 +0100
Subject: [PATCH 1/3] Modified .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index fc3d45f..8591180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,8 @@ cmake-build-*/
 # Rever
 rever/
 
+.dat
+
 __pycache__/*
 __pycache__*
 .DS_Store

From 8a414650ed5f06b4fad5602255636c6157dbe40d Mon Sep 17 00:00:00 2001
From: TransferOrbit <transferorbit@icloud.com>
Date: Thu, 8 Feb 2024 13:43:34 +0100
Subject: [PATCH 2/3] corrected typo: reference_area_radiation

---
 propagation/perturbed_satellite_orbit.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/propagation/perturbed_satellite_orbit.ipynb b/propagation/perturbed_satellite_orbit.ipynb
index c430dec..359a2cc 100644
--- a/propagation/perturbed_satellite_orbit.ipynb
+++ b/propagation/perturbed_satellite_orbit.ipynb
@@ -189,7 +189,7 @@
    "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",

From 5600165492d88599bb2eade4e084d0f4ef4eb92d Mon Sep 17 00:00:00 2001
From: Dominic Dirkx <d.dirkx@tudelft.nl>
Date: Tue, 13 Feb 2024 12:45:44 +0100
Subject: [PATCH 3/3] Update to radiation pressure models in perturbed
 satellite example

---
 .gitignore                                  |  2 ++
 propagation/perturbed_satellite_orbit.ipynb | 21 ++++++++++++---------
 propagation/perturbed_satellite_orbit.py    | 14 +++++++-------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8591180..a9b24ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ __pycache__*
 
 */jupyter-lab.log
 jupyter-lab.log
+
+*.dat
diff --git a/propagation/perturbed_satellite_orbit.ipynb b/propagation/perturbed_satellite_orbit.ipynb
index 359a2cc..2ef04d9 100644
--- a/propagation/perturbed_satellite_orbit.ipynb
+++ b/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",
@@ -191,12 +193,13 @@
     "# Create radiation pressure settings, and add to vehicle\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",
+    "\n",
+    "environment_setup.add_radiation_pressure_target_model(\n",
+    "    bodies, \"Delfi-C3\", vehicle_target_settings)"
    ]
   },
   {
@@ -253,7 +256,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",
diff --git a/propagation/perturbed_satellite_orbit.py b/propagation/perturbed_satellite_orbit.py
index 5bb5080..83846f9 100644
--- a/propagation/perturbed_satellite_orbit.py
+++ b/propagation/perturbed_satellite_orbit.py
@@ -120,13 +120,13 @@
 # Create radiation pressure settings, and add to vehicle
 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
 """
@@ -160,7 +160,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=[