Skip to content

Commit 54a806a

Browse files
ctkelleyctkelley
committed
Update to 1.10 kernel
1 parent 8848664 commit 54a806a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1137
-828
lines changed

‎Project.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[deps]
2+
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
3+
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"

‎SIAMFANL.ipynb

+3-3
Original file line numberDiff line numberDiff line change
@@ -670,15 +670,15 @@
670670
],
671671
"metadata": {
672672
"kernelspec": {
673-
"display_name": "Julia 1.9.1",
673+
"display_name": "Julia 1.10.0",
674674
"language": "julia",
675-
"name": "julia-1.9"
675+
"name": "julia-1.10"
676676
},
677677
"language_info": {
678678
"file_extension": ".jl",
679679
"mimetype": "application/julia",
680680
"name": "julia",
681-
"version": "1.9.1"
681+
"version": "1.10.0"
682682
}
683683
},
684684
"nbformat": 4,

‎SIAMFANLCh1.ipynb

+24-13
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,20 @@
3030
},
3131
{
3232
"cell_type": "code",
33-
"execution_count": 11,
33+
"execution_count": 1,
3434
"metadata": {},
35-
"outputs": [],
35+
"outputs": [
36+
{
37+
"name": "stderr",
38+
"output_type": "stream",
39+
"text": [
40+
"\u001b[36m\u001b[1m[ \u001b[22m\u001b[39m\u001b[36m\u001b[1mInfo: \u001b[22m\u001b[39mPrecompiling SIAMFANLEquations [084e46ad-d928-497d-ad5e-07fa361a48c4]\n",
41+
"\u001b[36m\u001b[1m[ \u001b[22m\u001b[39m\u001b[36m\u001b[1mInfo: \u001b[22m\u001b[39mPrecompiling BenchmarkTools [6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf]\n",
42+
"\u001b[36m\u001b[1m[ \u001b[22m\u001b[39m\u001b[36m\u001b[1mInfo: \u001b[22m\u001b[39mPrecompiling PyPlot [d330b81b-6aea-500a-939a-2ce795aea3ee]\n",
43+
"\u001b[36m\u001b[1m[ \u001b[22m\u001b[39m\u001b[36m\u001b[1mInfo: \u001b[22m\u001b[39mPrecompiling NotebookSIAMFANL [top-level]\n"
44+
]
45+
}
46+
],
3647
"source": [
3748
"include(\"fanote_init.jl\")"
3849
]
@@ -266,7 +277,7 @@
266277
},
267278
{
268279
"cell_type": "code",
269-
"execution_count": 12,
280+
"execution_count": 2,
270281
"metadata": {},
271282
"outputs": [
272283
{
@@ -414,7 +425,7 @@
414425
},
415426
{
416427
"cell_type": "code",
417-
"execution_count": 13,
428+
"execution_count": 3,
418429
"metadata": {},
419430
"outputs": [
420431
{
@@ -563,7 +574,7 @@
563574
},
564575
{
565576
"cell_type": "code",
566-
"execution_count": 14,
577+
"execution_count": 4,
567578
"metadata": {},
568579
"outputs": [
569580
{
@@ -693,7 +704,7 @@
693704
},
694705
{
695706
"cell_type": "code",
696-
"execution_count": 15,
707+
"execution_count": 5,
697708
"metadata": {},
698709
"outputs": [
699710
{
@@ -1030,7 +1041,7 @@
10301041
},
10311042
{
10321043
"cell_type": "code",
1033-
"execution_count": 16,
1044+
"execution_count": 6,
10341045
"metadata": {},
10351046
"outputs": [
10361047
{
@@ -1114,7 +1125,7 @@
11141125
},
11151126
{
11161127
"cell_type": "code",
1117-
"execution_count": 17,
1128+
"execution_count": 7,
11181129
"metadata": {},
11191130
"outputs": [
11201131
{
@@ -1609,7 +1620,7 @@
16091620
},
16101621
{
16111622
"cell_type": "code",
1612-
"execution_count": 18,
1623+
"execution_count": 8,
16131624
"metadata": {},
16141625
"outputs": [
16151626
{
@@ -1642,7 +1653,7 @@
16421653
},
16431654
{
16441655
"cell_type": "code",
1645-
"execution_count": 19,
1656+
"execution_count": 9,
16461657
"metadata": {},
16471658
"outputs": [
16481659
{
@@ -2217,15 +2228,15 @@
22172228
],
22182229
"metadata": {
22192230
"kernelspec": {
2220-
"display_name": "Julia 1.9.1",
2231+
"display_name": "Julia 1.10.0",
22212232
"language": "julia",
2222-
"name": "julia-1.9"
2233+
"name": "julia-1.10"
22232234
},
22242235
"language_info": {
22252236
"file_extension": ".jl",
22262237
"mimetype": "application/julia",
22272238
"name": "julia",
2228-
"version": "1.9.1"
2239+
"version": "1.10.0"
22292240
}
22302241
},
22312242
"nbformat": 4,

‎SIAMFANLCh1s.ipynb

+8-8
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
" Hence the use of solhist' in the example below.\n",
488488
"\n",
489489
"\u001b[1m Examples for nsolsc.jl\u001b[22m\n",
490-
"\u001b[1m ––––––––––––––––––––––––\u001b[22m\n",
490+
"\u001b[1m ––––––––––––––––––––––\u001b[22m\n",
491491
"\n",
492492
"\u001b[36m julia> nsolout=nsolsc(atan,1.0;maxit=5,atol=1.e-12,rtol=1.e-12);\u001b[39m\n",
493493
"\u001b[36m \u001b[39m\n",
@@ -501,7 +501,7 @@
501501
"\u001b[36m 2.79173e-24\u001b[39m\n",
502502
"\n",
503503
"\u001b[1m If you have an analytic derivative, I will use it.\u001b[22m\n",
504-
"\u001b[1m ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡\u001b[22m\n",
504+
"\u001b[1m ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡\u001b[22m\n",
505505
"\n",
506506
"\u001b[36m julia> fs(x)=x^2-4.0; fsp(x)=2x;\u001b[39m\n",
507507
"\u001b[36m \u001b[39m\n",
@@ -518,7 +518,7 @@
518518
"\u001b[36m \u001b[39m\n",
519519
"\n",
520520
"\u001b[1m You can also use anonymous functions\u001b[22m\n",
521-
"\u001b[1m ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡\u001b[22m\n",
521+
"\u001b[1m ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡\u001b[22m\n",
522522
"\n",
523523
"\u001b[36m julia> nsolout=nsolsc(atan,10.0,x -> 1.0/(1.0+x^2); \u001b[39m\n",
524524
"\u001b[36m atol=1.e-9,rtol=1.e-9);\u001b[39m\n",
@@ -1074,7 +1074,7 @@
10741074
" Hence the use of solhist' in the example below.\n",
10751075
"\n",
10761076
"\u001b[1m Example for secant.jl\u001b[22m\n",
1077-
"\u001b[1m –––––––––––––––––––––––\u001b[22m\n",
1077+
"\u001b[1m –––––––––––––––––––––\u001b[22m\n",
10781078
"\n",
10791079
"\u001b[36m \u001b[39m\n",
10801080
"\u001b[36m julia> secout=secant(atan,1.0;maxit=6,atol=1.e-12,rtol=1.e-12);\u001b[39m\n",
@@ -1632,7 +1632,7 @@
16321632
" equation.\n",
16331633
"\n",
16341634
"\u001b[1m Examples for ptcsolsc\u001b[22m\n",
1635-
"\u001b[1m –––––––––––––––––––––––\u001b[22m\n",
1635+
"\u001b[1m –––––––––––––––––––––\u001b[22m\n",
16361636
"\n",
16371637
"\u001b[36m julia> ptcout=ptcsolsc(sptest,.2;delta0=2.0,rtol=1.e-3,atol=1.e-3);\u001b[39m\n",
16381638
"\u001b[36m \u001b[39m\n",
@@ -1996,15 +1996,15 @@
19961996
],
19971997
"metadata": {
19981998
"kernelspec": {
1999-
"display_name": "Julia 1.9.1",
1999+
"display_name": "Julia 1.10.0",
20002000
"language": "julia",
2001-
"name": "julia-1.9"
2001+
"name": "julia-1.10"
20022002
},
20032003
"language_info": {
20042004
"file_extension": ".jl",
20052005
"mimetype": "application/julia",
20062006
"name": "julia",
2007-
"version": "1.9.1"
2007+
"version": "1.10.0"
20082008
}
20092009
},
20102010
"nbformat": 4,

‎SIAMFANLCh2.ipynb

+13-13
Large diffs are not rendered by default.

‎SIAMFANLCh2s.ipynb

+26-26
Original file line numberDiff line numberDiff line change
@@ -726,10 +726,10 @@
726726
" ────────────────────────────────────────────────────────────────────────────\n",
727727
"\n",
728728
"\u001b[1m Examples for nsol\u001b[22m\n",
729-
"\u001b[1m –––––––––––––––––––\u001b[22m\n",
729+
"\u001b[1m –––––––––––––––––\u001b[22m\n",
730730
"\n",
731731
"\u001b[1m World's easiest problem example.\u001b[22m\n",
732-
"\u001b[1m ----------------------------------\u001b[22m\n",
732+
"\u001b[1m --------------------------------\u001b[22m\n",
733733
"\n",
734734
" Test 64 and 32 bit Jacobians. No meaningful difference in the residual\n",
735735
" histories or the converged solutions.\n",
@@ -761,7 +761,7 @@
761761
"\u001b[36m 2.30988e+00 -2.26485e-14\u001b[39m\n",
762762
"\n",
763763
"\u001b[1m H-equation example.\u001b[22m\n",
764-
"\u001b[1m ---------------------\u001b[22m\n",
764+
"\u001b[1m -------------------\u001b[22m\n",
765765
"\n",
766766
" I'm taking the sham=5 default here, so the convergence is not quadratic. The\n",
767767
" good news is that we evaluate the Jacobian only once.\n",
@@ -1084,13 +1084,13 @@
10841084
"output_type": "stream",
10851085
"text": [
10861086
"analytic, double\n",
1087-
" 11.938 ms (44 allocations: 180.02 KiB)\n",
1087+
" 11.717 ms (45 allocations: 180.06 KiB)\n",
10881088
"finite difference, double\n",
1089-
" 61.011 ms (9257 allocations: 779.64 KiB)\n",
1089+
" 61.121 ms (9258 allocations: 779.69 KiB)\n",
10901090
"analytic, single\n",
1091-
" 9.001 ms (50 allocations: 204.77 KiB)\n",
1091+
" 8.712 ms (51 allocations: 204.81 KiB)\n",
10921092
"finite difference, single\n",
1093-
" 57.902 ms (9263 allocations: 804.39 KiB)\n"
1093+
" 58.302 ms (9264 allocations: 804.44 KiB)\n"
10941094
]
10951095
}
10961096
],
@@ -1130,13 +1130,13 @@
11301130
"output_type": "stream",
11311131
"text": [
11321132
"analytic, double\n",
1133-
" 4.920 ms (42 allocations: 147.67 KiB)\n",
1133+
" 4.824 ms (43 allocations: 147.72 KiB)\n",
11341134
"finite difference, double\n",
1135-
" 21.296 ms (3113 allocations: 347.55 KiB)\n",
1135+
" 21.275 ms (3114 allocations: 347.59 KiB)\n",
11361136
"analytic, single\n",
1137-
" 3.468 ms (52 allocations: 188.92 KiB)\n",
1137+
" 3.450 ms (53 allocations: 188.97 KiB)\n",
11381138
"finite difference, single\n",
1139-
" 19.599 ms (3123 allocations: 388.80 KiB)\n"
1139+
" 19.883 ms (3124 allocations: 388.84 KiB)\n"
11401140
]
11411141
}
11421142
],
@@ -1174,13 +1174,13 @@
11741174
"output_type": "stream",
11751175
"text": [
11761176
"analytic, double, Newton\n",
1177-
" 458.822 ms (66 allocations: 706.30 KiB)\n",
1177+
" 461.841 ms (67 allocations: 706.34 KiB)\n",
11781178
"analytic, single, Newton\n",
1179-
" 256.024 ms (72 allocations: 803.05 KiB)\n",
1179+
" 254.826 ms (73 allocations: 803.09 KiB)\n",
11801180
"analytic, double, sham=5\n",
1181-
" 175.009 ms (60 allocations: 578.27 KiB)\n",
1181+
" 176.379 ms (61 allocations: 578.31 KiB)\n",
11821182
"analytic, single, sham=5\n",
1183-
" 96.652 ms (70 allocations: 739.52 KiB)\n"
1183+
" 95.908 ms (71 allocations: 739.56 KiB)\n"
11841184
]
11851185
}
11861186
],
@@ -1381,13 +1381,13 @@
13811381
"output_type": "stream",
13821382
"text": [
13831383
"analytic, double, Newton\n",
1384-
" 101.021 ms (94 allocations: 47.31 MiB)\n",
1384+
" 99.340 ms (108 allocations: 47.31 MiB)\n",
13851385
"analytic, double, sham=5\n",
1386-
" 88.066 ms (88 allocations: 44.25 MiB)\n",
1386+
" 87.033 ms (102 allocations: 44.25 MiB)\n",
13871387
"analytic, single, Newton\n",
1388-
" 94.957 ms (130 allocations: 54.17 MiB)\n",
1388+
" 93.319 ms (144 allocations: 54.17 MiB)\n",
13891389
"analytic, single, sham=5\n",
1390-
" 88.177 ms (132 allocations: 57.23 MiB)\n"
1390+
" 86.923 ms (147 allocations: 57.23 MiB)\n"
13911391
]
13921392
}
13931393
],
@@ -1426,9 +1426,9 @@
14261426
"output_type": "stream",
14271427
"text": [
14281428
"Newton\n",
1429-
" 5.512 ms (598 allocations: 9.33 MiB)\n",
1429+
" 5.441 ms (605 allocations: 9.33 MiB)\n",
14301430
"sham=5\n",
1431-
" 3.762 ms (415 allocations: 6.29 MiB)\n"
1431+
" 3.693 ms (420 allocations: 6.29 MiB)\n"
14321432
]
14331433
}
14341434
],
@@ -1948,10 +1948,10 @@
19481948
" iteration + 1. So, for scalar equations, it's a row vector.\n",
19491949
"\n",
19501950
"\u001b[1m Example for ptcsol\u001b[22m\n",
1951-
"\u001b[1m ––––––––––––––––––––\u001b[22m\n",
1951+
"\u001b[1m ––––––––––––––––––\u001b[22m\n",
19521952
"\n",
19531953
"\u001b[1m The buckling beam problem.\u001b[22m\n",
1954-
"\u001b[1m ----------------------------\u001b[22m\n",
1954+
"\u001b[1m --------------------------\u001b[22m\n",
19551955
"\n",
19561956
" You'll need to use TestProblems for this to work.\n",
19571957
"\n",
@@ -2211,15 +2211,15 @@
22112211
],
22122212
"metadata": {
22132213
"kernelspec": {
2214-
"display_name": "Julia 1.9.1",
2214+
"display_name": "Julia 1.10.0",
22152215
"language": "julia",
2216-
"name": "julia-1.9"
2216+
"name": "julia-1.10"
22172217
},
22182218
"language_info": {
22192219
"file_extension": ".jl",
22202220
"mimetype": "application/julia",
22212221
"name": "julia",
2222-
"version": "1.9.1"
2222+
"version": "1.10.0"
22232223
}
22242224
},
22252225
"nbformat": 4,

‎SIAMFANLCh3.ipynb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1463,15 +1463,15 @@
14631463
],
14641464
"metadata": {
14651465
"kernelspec": {
1466-
"display_name": "Julia 1.9.1",
1466+
"display_name": "Julia 1.10.0",
14671467
"language": "julia",
1468-
"name": "julia-1.9"
1468+
"name": "julia-1.10"
14691469
},
14701470
"language_info": {
14711471
"file_extension": ".jl",
14721472
"mimetype": "application/julia",
14731473
"name": "julia",
1474-
"version": "1.9.1"
1474+
"version": "1.10.0"
14751475
}
14761476
},
14771477
"nbformat": 4,

‎SIAMFANLCh3s.ipynb

+3-3
Original file line numberDiff line numberDiff line change
@@ -2117,15 +2117,15 @@
21172117
],
21182118
"metadata": {
21192119
"kernelspec": {
2120-
"display_name": "Julia 1.9.1",
2120+
"display_name": "Julia 1.10.0",
21212121
"language": "julia",
2122-
"name": "julia-1.9"
2122+
"name": "julia-1.10"
21232123
},
21242124
"language_info": {
21252125
"file_extension": ".jl",
21262126
"mimetype": "application/julia",
21272127
"name": "julia",
2128-
"version": "1.9.1"
2128+
"version": "1.10.0"
21292129
}
21302130
},
21312131
"nbformat": 4,

0 commit comments

Comments
 (0)