Merge branch 'master' into pr/2500

tardis-sn · Jan 22, 2024 · 0064c8c · 0064c8c
2 parents fb9c8cd + 17c5da9
commit 0064c8c
Show file tree

Hide file tree

Showing 22 changed files with 416 additions and 336 deletions.
diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml
diff --git a/.zenodo.json b/.zenodo.json
@@ -116,14 +116,17 @@
       "name": "Sondhi, Dhruv"
     },
     {
-      "name": "Barbosa, Talytha"
+      "name": "O'Brien, Jack"
     },
     {
-      "name": "O'Brien, Jack"
+      "name": "Barbosa, Talytha"
     },
     {
       "name": "Yu, Jenny"
     },
+    {
+      "name": "Shields, Joshua"
+    },
     {
       "name": "Patel, Maryam"
     },
@@ -142,20 +145,20 @@
       "affiliation": "University of Oxford"
     },
     {
-      "name": "Shields, Joshua"
+      "name": "Singh, Shreyas"
     },
     {
       "name": "Savel, Arjun"
     },
-    {
-      "name": "Singh, Shreyas"
-    },
     {
       "name": "Reinecke, Martin"
     },
     {
       "name": "Eweis, Youssef"
     },
+    {
+      "name": "Holas, Alexander"
+    },
     {
       "name": "Bylund, Tomas"
     },
@@ -165,37 +168,30 @@
     {
       "name": "Bentil, Laud"
     },
-    {
-      "name": "Holas, Alexander"
-    },
     {
       "name": "Eguren, Jordi",
       "orcid": "0000-0002-2328-8030"
     },
     {
-      "name": "Alam, Arib"
+      "name": "Bartnik, Matthew"
     },
     {
-      "name": "Kumar, Ansh"
+      "name": "Alam, Arib"
     },
     {
-      "name": "Bartnik, Matthew"
+      "name": "Kumar, Ansh"
     },
     {
       "name": "Varma Buddaraju, Rohith"
     },
     {
       "name": "Magee, Mark"
     },
-    {
-      "name": "Livneh, Ran"
-    },
     {
       "name": "Kambham, Satwik"
     },
     {
-      "name": "Mishra, Sashank",
-      "orcid": "0000-0001-8302-1584"
+      "name": "Livneh, Ran"
     },
     {
       "name": "Rajagopalan, Srinath"
@@ -204,37 +200,38 @@
       "name": "Daksh, Ayushi"
     },
     {
-      "name": "Bhakar, Jayant"
+      "name": "Mishra, Sashank",
+      "orcid": "0000-0001-8302-1584"
     },
     {
-      "name": "Reichenbach, John"
+      "name": "Dutta, Anirban"
     },
     {
       "name": "Floers, Andreas"
     },
     {
-      "name": "Actions, GitHub"
+      "name": "Jain, Rinkle"
     },
     {
-      "name": "Jain, Rinkle"
+      "name": "Reichenbach, John"
     },
     {
-      "name": "Singh, Sourav"
+      "name": "Actions, GitHub"
     },
     {
-      "name": "Brar, Antreev"
+      "name": "Bhakar, Jayant"
     },
     {
-      "name": "Dutta, Anirban"
+      "name": "Brar, Antreev"
     },
     {
       "name": "Chaumal, Aarya"
     },
     {
-      "name": "Matsumura, Yuki"
+      "name": "Singh, Sourav"
     },
     {
-      "name": "Patidar, Abhishek"
+      "name": "Selsing, Jonatan"
     },
     {
       "name": "Kowalski, Nathan"
@@ -246,23 +243,29 @@
       "name": "Gupta, Harshul"
     },
     {
-      "name": "Selsing, Jonatan"
+      "name": "Talegaonkar, Chinmay"
     },
     {
-      "name": "Talegaonkar, Chinmay"
+      "name": "Matsumura, Yuki"
     },
     {
       "name": "Sofiatti, Caroline"
     },
     {
-      "name": "Prasad, Shilpi"
+      "name": "Patidar, Abhishek"
+    },
+    {
+      "name": "Venkat, Shashank"
     },
     {
       "name": "Buchner, Johannes"
     },
     {
       "name": "Yap, Kevin"
     },
+    {
+      "name": "Martinez, Laureano"
+    },
     {
       "name": "Truong, Le"
     },
@@ -276,22 +279,22 @@
       "name": "Sarafina, Nance"
     },
     {
-      "name": "Patra, Nilesh"
+      "name": "Volodin, Dmitry"
     },
     {
-      "name": "Volodin, Dmitry"
+      "name": "Patra, Nilesh"
     },
     {
-      "name": "Singh Rathore, Parikshit"
+      "name": "Patel, Pratik"
     },
     {
       "name": "Sharma, Sampark"
     },
     {
-      "name": "Venkat, Shashank"
+      "name": "Lu, Jing"
     },
     {
-      "name": "Lu, Jing"
+      "name": "Prasad, Shilpi"
     },
     {
       "name": "Gupta, Suyash"
@@ -306,7 +309,7 @@
       "name": "Aggarwal, Yash"
     },
     {
-      "name": "Patel, Pratik"
+      "name": "Singh Rathore, Parikshit"
     },
     {
       "name": "Dasgupta, Debajyoti"
@@ -315,19 +318,16 @@
       "name": "PATIDAR, ABHISHEK"
     },
     {
-      "name": "Martinez, Laureano"
+      "name": "Nayak U, Ashwin"
     },
     {
       "name": "Kolliboyina, Chaitanya"
     },
     {
-      "name": "Nayak U, Ashwin"
+      "name": "Kumar, Atul"
     },
     {
       "name": "Kharkar, Atharwa"
-    },
-    {
-      "name": "Kumar, Atul"
     }
   ]
 }
diff --git a/docs/io/optional/callback_example.ipynb b/docs/io/optional/callback_example.ipynb
@@ -78,7 +78,7 @@
    "source": [
     "def append_num_emitted_to_list(sim, lst):\n",
     "    if sim.iterations_executed < sim.iterations:\n",
-    "        num_emitted_packets = len(sim.transport.emitted_packet_nu)\n",
+    "        num_emitted_packets = len(sim.transport.transport_state.emitted_packet_nu)\n",
     "        lst.append(num_emitted_packets)"
    ]
   },