Skip to content

Commit a08cf76

Browse files
veronicasazveronicasaz
authored
Corrections tutorials
1 parent 0e285a4 commit a08cf76

2 files changed

Lines changed: 47 additions & 35 deletions

File tree

‎particles.ipynb‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"name": "stdout",
3232
"output_type": "stream",
3333
"text": [
34-
"Sun= Particle(12839191512243679478, set=<139958624342096>\n",
34+
"Sun= Particle(5327607734827039294, set=<140344016938512>\n",
3535
" , mass=1.0 MSun\n",
3636
" , vx=0.0 kms\n",
3737
" , vy=0.0 kms\n",
@@ -54,14 +54,14 @@
5454
},
5555
{
5656
"cell_type": "code",
57-
"execution_count": 3,
57+
"execution_count": 4,
5858
"metadata": {},
5959
"outputs": [
6060
{
6161
"name": "stdout",
6262
"output_type": "stream",
6363
"text": [
64-
"Earth= Particle(2132547103536715993, set=<139958624342096>\n",
64+
"Earth= Particle(11549171301815924007, set=<140344016938512>\n",
6565
" , mass=3.00273515275e-06 MSun\n",
6666
" , vx=0.0 kms\n",
6767
" , vy=29.7885123292 kms\n",
@@ -88,7 +88,7 @@
8888
},
8989
{
9090
"cell_type": "code",
91-
"execution_count": 4,
91+
"execution_count": 5,
9292
"metadata": {},
9393
"outputs": [
9494
{
@@ -98,8 +98,8 @@
9898
" key mass vx vy vz x y z\n",
9999
" - MSun kms kms kms au au au\n",
100100
"==================== =========== =========== =========== =========== =========== =========== ===========\n",
101-
"12839191512243679478 1.000e+00 0.000e+00 -8.945e-05 0.000e+00 -3.003e-06 0.000e+00 0.000e+00\n",
102-
" 2132547103536715993 3.003e-06 0.000e+00 2.979e+01 0.000e+00 1.000e+00 0.000e+00 0.000e+00\n",
101+
" 5327607734827039294 1.000e+00 0.000e+00 -8.945e-05 0.000e+00 -3.003e-06 0.000e+00 0.000e+00\n",
102+
"11549171301815924007 3.003e-06 0.000e+00 2.979e+01 0.000e+00 1.000e+00 0.000e+00 0.000e+00\n",
103103
"==================== =========== =========== =========== =========== =========== =========== ===========\n"
104104
]
105105
}
@@ -118,7 +118,7 @@
118118
},
119119
{
120120
"cell_type": "code",
121-
"execution_count": 5,
121+
"execution_count": 6,
122122
"metadata": {},
123123
"outputs": [],
124124
"source": [
@@ -135,14 +135,14 @@
135135
},
136136
{
137137
"cell_type": "code",
138-
"execution_count": 6,
138+
"execution_count": 7,
139139
"metadata": {},
140140
"outputs": [
141141
{
142142
"name": "stdout",
143143
"output_type": "stream",
144144
"text": [
145-
"Sun= Particle(12839191512243679478, set=<139958624342096>\n",
145+
"Sun= Particle(5327607734827039294, set=<140344016938512>\n",
146146
" , mass=1.0 MSun\n",
147147
" , name=sun\n",
148148
" , vx=0.0 kms\n",
@@ -168,7 +168,7 @@
168168
},
169169
{
170170
"cell_type": "code",
171-
"execution_count": 7,
171+
"execution_count": 8,
172172
"metadata": {},
173173
"outputs": [
174174
{
@@ -178,7 +178,7 @@
178178
"moon= key mass name vx vy vz x y z\n",
179179
" - kg none 44597309335878.1 * m * s**-1 44597309335878.1 * m * s**-1 44597309335878.1 * m * s**-1 km km km\n",
180180
"==================== =========== =========== =========== =========== =========== =========== =========== ===========\n",
181-
" 4163597056661966629 7.348e+22 moon 0.000e+00 2.297e-11 0.000e+00 3.844e+05 0.000e+00 0.000e+00\n",
181+
" 5429030374334993932 7.348e+22 moon 0.000e+00 2.297e-11 0.000e+00 3.844e+05 0.000e+00 0.000e+00\n",
182182
"==================== =========== =========== =========== =========== =========== =========== =========== ===========\n"
183183
]
184184
}
@@ -203,7 +203,7 @@
203203
},
204204
{
205205
"cell_type": "code",
206-
"execution_count": 8,
206+
"execution_count": 9,
207207
"metadata": {},
208208
"outputs": [],
209209
"source": [
@@ -220,16 +220,16 @@
220220
},
221221
{
222222
"cell_type": "code",
223-
"execution_count": 9,
223+
"execution_count": 10,
224224
"metadata": {},
225225
"outputs": [
226226
{
227227
"data": {
228228
"text/plain": [
229-
"<amuse.datamodel.particles.Particle at 0x7f4aa8163140>"
229+
"<amuse.datamodel.particles.Particle at 0x7fa46347c640>"
230230
]
231231
},
232-
"execution_count": 9,
232+
"execution_count": 10,
233233
"metadata": {},
234234
"output_type": "execute_result"
235235
}
@@ -248,7 +248,7 @@
248248
},
249249
{
250250
"cell_type": "code",
251-
"execution_count": 10,
251+
"execution_count": 11,
252252
"metadata": {},
253253
"outputs": [],
254254
"source": [
@@ -264,7 +264,7 @@
264264
},
265265
{
266266
"cell_type": "code",
267-
"execution_count": 11,
267+
"execution_count": 12,
268268
"metadata": {},
269269
"outputs": [
270270
{
@@ -274,9 +274,9 @@
274274
"Solar system: key mass name vx vy vz x y z\n",
275275
" - MSun none kms kms kms au au au\n",
276276
"==================== =========== =========== =========== =========== =========== =========== =========== ===========\n",
277-
"12839191512243679478 1.000e+00 sun 0.000e+00 -9.059e-05 0.000e+00 -3.040e-06 0.000e+00 0.000e+00\n",
278-
" 2132547103536715993 3.003e-06 earth 0.000e+00 2.979e+01 0.000e+00 1.000e+00 0.000e+00 0.000e+00\n",
279-
" 4163597056661966629 3.694e-08 moon 0.000e+00 3.081e+01 0.000e+00 1.003e+00 0.000e+00 0.000e+00\n",
277+
" 5327607734827039294 1.000e+00 sun 0.000e+00 -9.059e-05 0.000e+00 -3.040e-06 0.000e+00 0.000e+00\n",
278+
"11549171301815924007 3.003e-06 earth 0.000e+00 2.979e+01 0.000e+00 1.000e+00 0.000e+00 0.000e+00\n",
279+
" 5429030374334993932 3.694e-08 moon 0.000e+00 3.081e+01 0.000e+00 1.003e+00 0.000e+00 0.000e+00\n",
280280
"==================== =========== =========== =========== =========== =========== =========== =========== ===========\n"
281281
]
282282
}
@@ -296,7 +296,7 @@
296296
},
297297
{
298298
"cell_type": "code",
299-
"execution_count": 12,
299+
"execution_count": 13,
300300
"metadata": {},
301301
"outputs": [
302302
{
@@ -322,7 +322,7 @@
322322
},
323323
{
324324
"cell_type": "code",
325-
"execution_count": 13,
325+
"execution_count": 14,
326326
"metadata": {},
327327
"outputs": [
328328
{
@@ -347,7 +347,7 @@
347347
},
348348
{
349349
"cell_type": "code",
350-
"execution_count": 14,
350+
"execution_count": 15,
351351
"metadata": {},
352352
"outputs": [
353353
{
@@ -358,7 +358,7 @@
358358
" [ 4.86057963e-06, 0.00000000e+00, 0.00000000e+00]])"
359359
]
360360
},
361-
"execution_count": 14,
361+
"execution_count": 15,
362362
"metadata": {},
363363
"output_type": "execute_result"
364364
}
@@ -385,7 +385,7 @@
385385
},
386386
{
387387
"cell_type": "code",
388-
"execution_count": 15,
388+
"execution_count": 16,
389389
"metadata": {},
390390
"outputs": [
391391
{
@@ -586,7 +586,7 @@
586586
" 'z']"
587587
]
588588
},
589-
"execution_count": 15,
589+
"execution_count": 16,
590590
"metadata": {},
591591
"output_type": "execute_result"
592592
}
@@ -1403,11 +1403,11 @@
14031403
"cell_type": "markdown",
14041404
"metadata": {},
14051405
"source": [
1406-
"You have performed some rudimentary operations on a particle set.\n",
1406+
"###### You have performed some rudimentary operations on a particle set.\n",
14071407
"It is now time to experiment a little for yourself.\n",
14081408
"\n",
14091409
"\n",
1410-
"Assignmnets and questions:\n",
1410+
"Assignments and questions:\n",
14111411
"---------------\n",
14121412
"\n",
14131413
"### Assignment 1:\n",
@@ -1450,7 +1450,7 @@
14501450
],
14511451
"metadata": {
14521452
"kernelspec": {
1453-
"display_name": "Python 3",
1453+
"display_name": "Python 3 (ipykernel)",
14541454
"language": "python",
14551455
"name": "python3"
14561456
},
@@ -1464,7 +1464,7 @@
14641464
"name": "python",
14651465
"nbconvert_exporter": "python",
14661466
"pygments_lexer": "ipython3",
1467-
"version": "3.9.7"
1467+
"version": "3.8.10"
14681468
}
14691469
},
14701470
"nbformat": 4,

‎scalar_units.ipynb‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"cell_type": "code",
15-
"execution_count": 2,
15+
"execution_count": 1,
1616
"metadata": {},
1717
"outputs": [],
1818
"source": [
@@ -22,7 +22,7 @@
2222
},
2323
{
2424
"cell_type": "code",
25-
"execution_count": 3,
25+
"execution_count": 2,
2626
"metadata": {},
2727
"outputs": [],
2828
"source": [
@@ -33,7 +33,7 @@
3333
},
3434
{
3535
"cell_type": "code",
36-
"execution_count": 4,
36+
"execution_count": 6,
3737
"metadata": {},
3838
"outputs": [],
3939
"source": [
@@ -43,6 +43,18 @@
4343
"vesc = (2*G*mstar/rstar).sqrt()"
4444
]
4545
},
46+
{
47+
"cell_type": "code",
48+
"execution_count": 7,
49+
"metadata": {},
50+
"outputs": [],
51+
"source": [
52+
"# aAlternative, define G units beforehand\n",
53+
"units_G = units.m**3 * units.kg**-1 * units.s**-2\n",
54+
"G = 6.67e-11 | units_G\n",
55+
"vesc = (2* G * mstar / rstar).sqrt()"
56+
]
57+
},
4658
{
4759
"cell_type": "code",
4860
"execution_count": 5,
@@ -148,7 +160,7 @@
148160
],
149161
"metadata": {
150162
"kernelspec": {
151-
"display_name": "Python 3",
163+
"display_name": "Python 3 (ipykernel)",
152164
"language": "python",
153165
"name": "python3"
154166
},
@@ -162,7 +174,7 @@
162174
"name": "python",
163175
"nbconvert_exporter": "python",
164176
"pygments_lexer": "ipython3",
165-
"version": "3.9.7"
177+
"version": "3.8.10"
166178
}
167179
},
168180
"nbformat": 4,

0 commit comments

Comments
 (0)