Skip to content

Commit 034dd92

Browse files
michael-petersenmichael-petersen
committed
re-run notebooks for current EXP main
1 parent 89a66a6 commit 034dd92

14 files changed

Lines changed: 1191 additions & 514 deletions

‎Tutorials/Basis/cylcache python density.ipynb‎

Lines changed: 50 additions & 26 deletions
Large diffs are not rendered by default.

‎Tutorials/Basis/viewing a basis.ipynb‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"text": [
2424
"\n",
2525
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
26-
"%%%%% This is EXP 7.9.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
26+
"%%%%% This is EXP 7.9.3 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2727
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2828
"%%%%% Repository URL | https://github.com/EXP-code/EXP %\n",
29-
"%%%%% Current branch | suppressclangwarnings %\n",
30-
"%%%%% Current commit | 4c9000a74137e4e0d5737b0007d90cfd72e0adf3 %\n",
31-
"%%%%% Compile time | 2025-12-04 13:38:34 GMT %\n",
29+
"%%%%% Current branch | main %\n",
30+
"%%%%% Current commit | 6cbd08fe546ff42ec833ecca423f46f3ba1f0aa9 %\n",
31+
"%%%%% Compile time | 2026-04-08 10:25:43 BST %\n",
3232
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3333
"\n"
3434
]
@@ -83,7 +83,7 @@
8383
},
8484
{
8585
"cell_type": "code",
86-
"execution_count": null,
86+
"execution_count": 3,
8787
"id": "c3c868e4",
8888
"metadata": {},
8989
"outputs": [],
@@ -150,11 +150,10 @@
150150
"name": "stdout",
151151
"output_type": "stream",
152152
"text": [
153-
"---- SLGridSph::ReadH5Cache: parameter lmax: wanted 10 found 6\n",
154-
"---- SLGridSph::WriteH5Cache cache file <halo.cache.run0> exists\n",
155-
"---- SLGridSph::WriteH5Cache: existing file backed up to <halo.cache.run0.bak>\n",
156-
"---- SLGridSph::WriteH5Cache: wrote <halo.cache.run0>\n",
153+
"---- SLGridSph::ReadH5Cache: successfully read basis cache <halo.cache.run0>\n",
157154
"---- Spherical::orthoTest: worst=0.000295387\n",
155+
"---- Cylindrical: using original exponential deprojected disk for EOF conditioning\n",
156+
"---- Cylindrical: consider using the exact, spherically deprojected exponential with 'mtype: ExpSphere'\n",
158157
"---- EmpCylSL::ReadH5Cache: read <eof.cache.run0>\n",
159158
"---- EmpCylSL::read_cache: table forwarded to all processes\n",
160159
"---- Cylindrical::orthoTest: worst=0.00529627\n"

‎Tutorials/Coefficients/create coefficients from snapshots.ipynb‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"text": [
2828
"\n",
2929
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
30-
"%%%%% This is EXP 7.9.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
30+
"%%%%% This is EXP 7.9.3 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3131
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3232
"%%%%% Repository URL | https://github.com/EXP-code/EXP %\n",
33-
"%%%%% Current branch | suppressclangwarnings %\n",
34-
"%%%%% Current commit | 4c9000a74137e4e0d5737b0007d90cfd72e0adf3 %\n",
35-
"%%%%% Compile time | 2025-12-04 13:38:34 GMT %\n",
33+
"%%%%% Current branch | main %\n",
34+
"%%%%% Current commit | 6cbd08fe546ff42ec833ecca423f46f3ba1f0aa9 %\n",
35+
"%%%%% Compile time | 2026-04-08 10:25:43 BST %\n",
3636
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3737
"\n"
3838
]
@@ -667,7 +667,7 @@
667667
"Completed the file group list\n",
668668
"\n",
669669
"The coefficient time list is [0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.2]\n",
670-
"Elapsed time: 384.7182068824768\n"
670+
"Elapsed time: 439.9263460636139\n"
671671
]
672672
}
673673
],
@@ -1122,7 +1122,9 @@
11221122
"name": "stdout",
11231123
"output_type": "stream",
11241124
"text": [
1125-
"Coeffiecients saved!Coefs::WriteH5Units: wrote units to HDF5 file:\n",
1125+
"No file to remove\n",
1126+
"Coeffiecients saved!\n",
1127+
"Coefs::WriteH5Units: wrote units to HDF5 file:\n",
11261128
"------------------------------------------------\n",
11271129
"Name Unit Value \n",
11281130
"---------- ---------- ---------- \n",
@@ -1131,7 +1133,6 @@
11311133
"mass none 1 \n",
11321134
"time none 1 \n",
11331135
"------------------------------------------------\n",
1134-
"\n",
11351136
"\n"
11361137
]
11371138
}
@@ -1218,6 +1219,22 @@
12181219
"except:\n",
12191220
" printf(\"Already clean!\")"
12201221
]
1222+
},
1223+
{
1224+
"cell_type": "code",
1225+
"execution_count": null,
1226+
"id": "6fc9dd15",
1227+
"metadata": {},
1228+
"outputs": [],
1229+
"source": []
1230+
},
1231+
{
1232+
"cell_type": "code",
1233+
"execution_count": null,
1234+
"id": "83ca8fa2",
1235+
"metadata": {},
1236+
"outputs": [],
1237+
"source": []
12211238
}
12221239
],
12231240
"metadata": {

‎Tutorials/Coefficients/cube coefficients.ipynb‎

Lines changed: 405 additions & 405 deletions
Large diffs are not rendered by default.

‎Tutorials/Coefficients/read and plot coefficients.ipynb‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
},
1313
{
1414
"cell_type": "code",
15-
"execution_count": 1,
15+
"execution_count": null,
1616
"id": "76484acb",
1717
"metadata": {},
1818
"outputs": [],
1919
"source": [
2020
"import os\n",
2121
"import yaml\n",
22+
"\n",
2223
"import pyEXP\n",
24+
"pyEXP.util.getVersionInfo()\n",
25+
"\n",
2326
"import numpy as np\n",
2427
"import matplotlib.pyplot as plt\n",
2528
"plt.rcParams['figure.figsize'] = [12, 9]\n",

‎Tutorials/Coefficients/velocity coefficients from snapshots.ipynb‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"text": [
2828
"\n",
2929
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
30-
"%%%%% This is EXP 7.9.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
30+
"%%%%% This is EXP 7.9.3 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3131
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3232
"%%%%% Repository URL | https://github.com/EXP-code/EXP %\n",
33-
"%%%%% Current branch | suppressclangwarnings %\n",
34-
"%%%%% Current commit | 4c9000a74137e4e0d5737b0007d90cfd72e0adf3 %\n",
35-
"%%%%% Compile time | 2025-12-04 13:38:34 GMT %\n",
33+
"%%%%% Current branch | main %\n",
34+
"%%%%% Current commit | 6cbd08fe546ff42ec833ecca423f46f3ba1f0aa9 %\n",
35+
"%%%%% Compile time | 2026-04-08 10:25:43 BST %\n",
3636
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3737
"\n"
3838
]
@@ -261,7 +261,7 @@
261261
{
262262
"data": {
263263
"text/plain": [
264-
"<matplotlib.legend.Legend at 0x11c113750>"
264+
"<matplotlib.legend.Legend at 0x1176f7950>"
265265
]
266266
},
267267
"execution_count": 6,
@@ -478,8 +478,7 @@
478478
"text": [
479479
"Type is <class 'pyEXP.coefs.SphFldCoefs'>\n",
480480
"Geometry is sphere\n",
481-
"Times are the same, now checking parameters at each time\n",
482-
"Parameters are the same, now checking coefficients\n"
481+
"Times are the same, now checking parameters at each time\n"
483482
]
484483
},
485484
{
@@ -491,6 +490,13 @@
491490
"execution_count": 10,
492491
"metadata": {},
493492
"output_type": "execute_result"
493+
},
494+
{
495+
"name": "stdout",
496+
"output_type": "stream",
497+
"text": [
498+
"Parameters are the same, now checking coefficients\n"
499+
]
494500
}
495501
],
496502
"source": [

‎Tutorials/EXP/disk halo.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"name": "stdout",
2525
"output_type": "stream",
2626
"text": [
27-
"/home/weinberg/Projects/pyEXP-examples/Tutorials/EXP/DiskHalo\n"
27+
"/Users/mpetersen/Code/pyEXP-examples/Tutorials/EXP/DiskHalo\n"
2828
]
2929
}
3030
],
@@ -67032,7 +67032,7 @@
6703267032
],
6703367033
"metadata": {
6703467034
"kernelspec": {
67035-
"display_name": "Python 3 (ipykernel)",
67035+
"display_name": "Python 3",
6703667036
"language": "python",
6703767037
"name": "python3"
6703867038
},
@@ -67046,7 +67046,7 @@
6704667046
"name": "python",
6704767047
"nbconvert_exporter": "python",
6704867048
"pygments_lexer": "ipython3",
67049-
"version": "3.12.3"
67049+
"version": "3.11.6"
6705067050
}
6705167051
},
6705267052
"nbformat": 4,

‎Tutorials/Introduction/Part1-Coefficients.ipynb‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
"text": [
2525
"\n",
2626
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
27-
"%%%%% This is EXP 7.9.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
27+
"%%%%% This is EXP 7.9.3 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2828
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2929
"%%%%% Repository URL | https://github.com/EXP-code/EXP %\n",
30-
"%%%%% Current branch | suppressclangwarnings %\n",
31-
"%%%%% Current commit | 4c9000a74137e4e0d5737b0007d90cfd72e0adf3 %\n",
32-
"%%%%% Compile time | 2025-12-04 13:38:34 GMT %\n",
30+
"%%%%% Current branch | main %\n",
31+
"%%%%% Current commit | 6cbd08fe546ff42ec833ecca423f46f3ba1f0aa9 %\n",
32+
"%%%%% Compile time | 2026-04-08 10:25:43 BST %\n",
3333
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3434
"\n"
3535
]
@@ -702,9 +702,7 @@
702702
"name": "stdout",
703703
"output_type": "stream",
704704
"text": [
705-
"Type is sphere\n",
706-
"Times are the same, now checking parameters at each time\n",
707-
"Parameters are the same, now checking coefficients\n"
705+
"Type is sphere\n"
708706
]
709707
},
710708
{
@@ -716,6 +714,14 @@
716714
"execution_count": 7,
717715
"metadata": {},
718716
"output_type": "execute_result"
717+
},
718+
{
719+
"name": "stdout",
720+
"output_type": "stream",
721+
"text": [
722+
"Times are the same, now checking parameters at each time\n",
723+
"Parameters are the same, now checking coefficients\n"
724+
]
719725
}
720726
],
721727
"source": [

‎Tutorials/Introduction/Part2-Analysis.ipynb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
"text": [
2525
"\n",
2626
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
27-
"%%%%% This is EXP 7.9.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
27+
"%%%%% This is EXP 7.9.3 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2828
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2929
"%%%%% Repository URL | https://github.com/EXP-code/EXP %\n",
30-
"%%%%% Current branch | suppressclangwarnings %\n",
31-
"%%%%% Current commit | 4c9000a74137e4e0d5737b0007d90cfd72e0adf3 %\n",
32-
"%%%%% Compile time | 2025-12-04 13:38:34 GMT %\n",
30+
"%%%%% Current branch | main %\n",
31+
"%%%%% Current commit | 6cbd08fe546ff42ec833ecca423f46f3ba1f0aa9 %\n",
32+
"%%%%% Compile time | 2026-04-08 10:25:43 BST %\n",
3333
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3434
"\n"
3535
]

‎Tutorials/Orbits/orbits in an EXP field.ipynb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"text": [
2323
"\n",
2424
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
25-
"%%%%% This is EXP 7.9.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
25+
"%%%%% This is EXP 7.9.1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2626
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
2727
"%%%%% Repository URL | https://github.com/EXP-code/EXP %\n",
28-
"%%%%% Current branch | suppressclangwarnings %\n",
29-
"%%%%% Current commit | 4c9000a74137e4e0d5737b0007d90cfd72e0adf3 %\n",
30-
"%%%%% Compile time | 2025-12-04 13:38:34 GMT %\n",
28+
"%%%%% Current branch | main %\n",
29+
"%%%%% Current commit | 96dc5f292f374d5001340a70c841bb360946b124 %\n",
30+
"%%%%% Compile time | 2025-12-11 12:46:17 GMT %\n",
3131
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
3232
"\n"
3333
]

0 commit comments

Comments
 (0)