Skip to content

Commit

Permalink
edit EoT and sun movement, add maps of eclipses
Browse files Browse the repository at this point in the history
  • Loading branch information
@AShepelevv
AShepelevv authored May 5, 2024
1 parent beb237a commit c1fbdf6
Show file tree
Hide file tree
Showing 17 changed files with 313 additions and 134 deletions.
42 changes: 20 additions & 22 deletions calc/analemma.nb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
NotebookFileLineBreakTest
NotebookFileLineBreakTest
NotebookDataPosition[ 158, 7]
NotebookDataLength[ 9329, 259]
NotebookOptionsPosition[ 8484, 238]
NotebookOutlinePosition[ 8876, 254]
CellTagsIndexPosition[ 8833, 251]
NotebookDataLength[ 9504, 257]
NotebookOptionsPosition[ 8658, 236]
NotebookOutlinePosition[ 9050, 252]
CellTagsIndexPosition[ 9007, 249]
WindowFrame->Normal*)

(* Beginning of Notebook Content *)
Expand Down Expand Up @@ -157,15 +157,14 @@ Cell[BoxData[{
3.91344269685448*^9}, {3.913442733876906*^9, 3.913442871733096*^9}, {
3.913443564045473*^9, 3.9134435641176233`*^9}, {3.913444587838147*^9,
3.913444588345091*^9}, {3.913527395272806*^9, 3.91352749898803*^9}, {
3.913530319431258*^9, 3.9135303206567917`*^9}},
CellLabel->
"In[1262]:=",ExpressionUUID->"768c3947-bf16-472e-ad5d-25dbca831819"],
3.913530319431258*^9, 3.9135303206567917`*^9}, {3.916030248408989*^9,
3.916030279221981*^9}, {3.916030326791511*^9, 3.916030328102264*^9}},
CellLabel->"In[29]:=",ExpressionUUID->"768c3947-bf16-472e-ad5d-25dbca831819"],

Cell[BoxData[
RowBox[{"TableForm", "[", "analemmaByMonthsData", "]"}]], "Input",
CellChangeTimes->{{3.913530324355253*^9, 3.913530338955241*^9}},
CellLabel->
"In[1272]:=",ExpressionUUID->"e2e017b2-55da-4f83-b538-4dcbe5e174dc"],
CellLabel->"In[39]:=",ExpressionUUID->"e2e017b2-55da-4f83-b538-4dcbe5e174dc"],

Cell[BoxData[
RowBox[{"ListPlot", "[",
Expand All @@ -182,8 +181,8 @@ Cell[BoxData[
RowBox[{"PointSize", "[", "0.02", "]"}]}], "]"}], ",",
RowBox[{"{",
RowBox[{"i", ",", "1", ",",
RowBox[{"Length", "[", "dataMonths", "]"}]}], "}"}]}], "]"}]}],
"}"}], ",", " ",
RowBox[{"Length", "[", "analemmaByMonthsData", "]"}]}], "}"}]}],
"]"}]}], "}"}], ",", " ",
RowBox[{"PlotRange", "\[Rule]",
RowBox[{"{",
RowBox[{
Expand All @@ -195,8 +194,9 @@ Cell[BoxData[
RowBox[{"-", "25"}], ",", "25"}], "}"}]}], "}"}]}], ",",
RowBox[{"AspectRatio", "\[Rule]",
RowBox[{"5", "/", "4"}]}]}], "]"}]], "Input",
CellLabel->
"In[1273]:=",ExpressionUUID->"bddd6d6d-c626-4f2e-8a5a-49ddd588ec64"],
CellChangeTimes->{
3.916030216421568*^9, {3.916030336290679*^9, 3.916030396512063*^9}},
CellLabel->"In[40]:=",ExpressionUUID->"bddd6d6d-c626-4f2e-8a5a-49ddd588ec64"],

Cell[BoxData[
RowBox[{"Export", "[",
Expand All @@ -213,8 +213,7 @@ Cell[BoxData[
RowBox[{"{",
RowBox[{"\"\<eta\>\"", ",", "\"\<delta\>\""}], "}"}], "}"}], ",",
"analemmaData"}], "]"}], ",", " ", "\"\<Table\>\""}], "]"}]], "Input",
CellLabel->
"In[1274]:=",ExpressionUUID->"5964098a-1e47-4729-92e9-79116c330520"],
CellLabel->"In[41]:=",ExpressionUUID->"5964098a-1e47-4729-92e9-79116c330520"],

Cell[BoxData[
RowBox[{"Export", "[",
Expand All @@ -232,8 +231,7 @@ Cell[BoxData[
RowBox[{"\"\<eta\>\"", ",", "\"\<delta\>\""}], "}"}], "}"}], ",",
"analemmaByMonthsData"}], "]"}], ",", " ", "\"\<Table\>\""}],
"]"}]], "Input",
CellLabel->
"In[1275]:=",ExpressionUUID->"9b529986-bf8a-42b3-8cb9-a15912637c55"]
CellLabel->"In[42]:=",ExpressionUUID->"9b529986-bf8a-42b3-8cb9-a15912637c55"]
}, Open ]]
},
WindowSize->{992, 901},
Expand All @@ -255,11 +253,11 @@ CellTagsIndex->{}
Notebook[{
Cell[CellGroupData[{
Cell[580, 22, 153, 3, 98, "Title",ExpressionUUID->"b9afb94b-b095-4879-aafe-43a4838777da"],
Cell[736, 27, 5274, 134, 314, "Input",ExpressionUUID->"768c3947-bf16-472e-ad5d-25dbca831819"],
Cell[6013, 163, 231, 4, 30, "Input",ExpressionUUID->"e2e017b2-55da-4f83-b538-4dcbe5e174dc"],
Cell[6247, 169, 993, 29, 52, "Input",ExpressionUUID->"bddd6d6d-c626-4f2e-8a5a-49ddd588ec64"],
Cell[7243, 200, 602, 16, 52, "Input",ExpressionUUID->"5964098a-1e47-4729-92e9-79116c330520"],
Cell[7848, 218, 620, 17, 52, "Input",ExpressionUUID->"9b529986-bf8a-42b3-8cb9-a15912637c55"]
Cell[736, 27, 5365, 134, 314, "Input",ExpressionUUID->"768c3947-bf16-472e-ad5d-25dbca831819"],
Cell[6104, 163, 226, 3, 30, "Input",ExpressionUUID->"e2e017b2-55da-4f83-b538-4dcbe5e174dc"],
Cell[6333, 168, 1091, 30, 52, "Input",ExpressionUUID->"bddd6d6d-c626-4f2e-8a5a-49ddd588ec64"],
Cell[7427, 200, 597, 15, 52, "Input",ExpressionUUID->"5964098a-1e47-4729-92e9-79116c330520"],
Cell[8027, 217, 615, 16, 52, "Input",ExpressionUUID->"9b529986-bf8a-42b3-8cb9-a15912637c55"]
}, Open ]]
}
]
Expand Down
152 changes: 152 additions & 0 deletions calc/eclipses-map.nb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
(* Content-type: application/vnd.wolfram.mathematica *)

(*** Wolfram Notebook File ***)
(* http://www.wolfram.com/nb *)

(* CreatedBy='Mathematica 12.1' *)

(*CacheID: 234*)
(* Internal cache information:
NotebookFileLineBreakTest
NotebookFileLineBreakTest
NotebookDataPosition[ 158, 7]
NotebookDataLength[ 5367, 144]
NotebookOptionsPosition[ 4618, 124]
NotebookOutlinePosition[ 5010, 140]
CellTagsIndexPosition[ 4967, 137]
WindowFrame->Normal*)

(* Beginning of Notebook Content *)
Notebook[{

Cell[CellGroupData[{
Cell["Eclipses map", "Title",
CellChangeTimes->{{3.914851638619878*^9,
3.914851662253729*^9}},ExpressionUUID->"f7d45056-1979-42fd-94f5-\
e63b95c3438c"],

Cell[BoxData[
RowBox[{"map", "=", " ",
RowBox[{"GeoGraphics", "[",
RowBox[{
RowBox[{"{",
RowBox[{
RowBox[{"GeoStyling", "[", "None", "]"}], ",",
RowBox[{"Opacity", "[", ".3", "]"}], ",", "Red", ",",
RowBox[{"SolarEclipse", "[",
RowBox[{
RowBox[{"{",
RowBox[{
RowBox[{"DateObject", "[",
RowBox[{"{",
RowBox[{"1901", ",", "1", ",", "1", ",", "0", ",", "0"}], "}"}],
"]"}], ",",
RowBox[{"DateObject", "[",
RowBox[{"{",
RowBox[{"2001", ",", "1", ",", "1", ",", "0", ",", "0"}], "}"}],
"]"}], ",", "All"}], "}"}], ",", "\"\<TotalPhasePolygon\>\"", ",",

RowBox[{"EclipseType", "\[Rule]", "\"\<Total\>\""}]}], "]"}]}], "}"}],
",",
RowBox[{"GeoProjection", "\[Rule]", "\"\<PlateCarree\>\""}], ",", " ",
RowBox[{"GeoCenter", "\[Rule]",
RowBox[{"GeoPosition", "[",
RowBox[{"{",
RowBox[{"90", ",", "0"}], "}"}], "]"}]}], ",",
RowBox[{"\"\<GeoZoomLevel\>\"", "\[Rule]", "3"}], ",", " ",
RowBox[{"GeoRange", "\[Rule]", "\"\<World\>\""}], ",",
RowBox[{"GeoGridLines", "\[Rule]", "Automatic"}], ",",
RowBox[{"GeoGridLinesStyle", "\[Rule]",
RowBox[{"Directive", "[",
RowBox[{
RowBox[{"Thickness", "[", "0.002", "]"}], ",",
RowBox[{"GrayLevel", "[", "0.5", "]"}]}], "]"}]}]}], "]"}]}]], "Input",\

CellChangeTimes->{{3.914849407795369*^9, 3.914849491582266*^9}, {
3.914849813033779*^9, 3.9148498487333183`*^9}, 3.9148505670919657`*^9, {
3.914851378592115*^9, 3.914851460364491*^9}, {3.914851518568166*^9,
3.914851541713567*^9}, 3.915428363009172*^9},
CellLabel->"In[1]:=",ExpressionUUID->"69fef74a-ca50-4952-8929-e582fc608e3a"],

Cell[BoxData[
RowBox[{"grayMap", " ", "=", " ",
RowBox[{"ImageAdjust", "[",
RowBox[{
RowBox[{"ColorConvert", "[",
RowBox[{"map", ",", " ", "\"\<Grayscale\>\""}], "]"}], ",",
RowBox[{"{",
RowBox[{"1", ",",
RowBox[{"-", "0.2"}]}], "}"}]}], "]"}]}]], "Input",
CellLabel->"In[2]:=",ExpressionUUID->"45ca8e68-e99c-4b5d-954c-6d2e4b01f301"],

Cell[BoxData[
RowBox[{
RowBox[{"Export", "[",
RowBox[{
RowBox[{"FileNameJoin", "[",
RowBox[{"{",
RowBox[{
RowBox[{"NotebookDirectory", "[", "]"}], ",", "\"\<..\>\"", ",",
"\"\<img\>\"", ",",
RowBox[{"StringJoin", "[",
RowBox[{"\"\<eclipses-map-20\>\"", ",", "\"\<.png\>\""}], "]"}]}],
"}"}], "]"}], ",", "grayMap"}], "]"}], ";"}]], "Input",
CellChangeTimes->{{3.914851610402912*^9, 3.914851619325665*^9}, {
3.914851785604684*^9, 3.914851806831203*^9}},
CellLabel->"In[3]:=",ExpressionUUID->"e0f5cc86-9f15-424b-9b1d-ab1aed59f302"],

Cell[BoxData[
RowBox[{"oneEclipse", " ", "=", " ",
RowBox[{"GeoGraphics", "[",
RowBox[{
RowBox[{"{",
RowBox[{
RowBox[{"GeoStyling", "[", "None", "]"}], ",",
RowBox[{"SolarEclipse", "[",
RowBox[{
RowBox[{"DateObject", "[",
RowBox[{"{",
RowBox[{"1999", ",", "8", ",", "11", ",", "0", ",", "0"}], "}"}],
"]"}], ",", "\"\<GraphicsData\>\"", ",",
RowBox[{"EclipseType", "\[Rule]", "\"\<Total\>\""}]}], "]"}]}], "}"}],
",",
RowBox[{"GeoProjection", "\[Rule]", "\"\<Orthographic\>\""}], ",",
RowBox[{"GeoRange", "\[Rule]", "\"\<World\>\""}], ",",
RowBox[{"GeoCenter", "->",
RowBox[{"{",
RowBox[{"45", ",", "25"}], "}"}]}], ",",
RowBox[{"\"\<GeoZoomLevel\>\"", "\[Rule]", "3"}]}], "]"}]}]], "Input",
CellChangeTimes->{{3.9154285162591543`*^9, 3.915428540668619*^9}, {
3.915428637360941*^9, 3.915428694998066*^9}, {3.9154287531197*^9,
3.915428757618977*^9}, {3.91542879146073*^9, 3.9154287918107357`*^9}},
CellLabel->"In[11]:=",ExpressionUUID->"e2872cb0-f91a-4e56-b69b-07c84cc492d2"]
}, Open ]]
},
WindowSize->{808, 897},
WindowMargins->{{4, Automatic}, {Automatic, 4}},
FrontEndVersion->"12.1 for Mac OS X x86 (64-bit) (March 13, 2020)",
StyleDefinitions->"Default.nb",
ExpressionUUID->"51d83266-a537-4ff5-885c-4170faf1d7c2"
]
(* End of Notebook Content *)

(* Internal cache information *)
(*CellTagsOutline
CellTagsIndex->{}
*)
(*CellTagsIndex
CellTagsIndex->{}
*)
(*NotebookFileOutline
Notebook[{
Cell[CellGroupData[{
Cell[580, 22, 155, 3, 98, "Title",ExpressionUUID->"f7d45056-1979-42fd-94f5-e63b95c3438c"],
Cell[738, 27, 1783, 41, 157, "Input",ExpressionUUID->"69fef74a-ca50-4952-8929-e582fc608e3a"],
Cell[2524, 70, 370, 9, 30, "Input",ExpressionUUID->"45ca8e68-e99c-4b5d-954c-6d2e4b01f301"],
Cell[2897, 81, 596, 14, 52, "Input",ExpressionUUID->"e0f5cc86-9f15-424b-9b1d-ab1aed59f302"],
Cell[3496, 97, 1106, 24, 115, "Input",ExpressionUUID->"e2872cb0-f91a-4e56-b69b-07c84cc492d2"]
}, Open ]]
}
]
*)

Binary file added img/eclipse-map-1999-08-11.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/eclipses-map-20.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/m13.pdf
View file
Binary file not shown.
Binary file added img/m45.pdf
View file
Binary file not shown.
Binary file added img/m57.pdf
View file
Binary file not shown.
Binary file added img/optical-aberrations-coma.pdf
View file
Binary file not shown.
Binary file added img/sky-map.pdf
View file
Binary file not shown.
16 changes: 16 additions & 0 deletions sections/geometrical-astronomy/eclipses.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,22 @@ \subsection{Затмения}
\end{wrapfigure}
Найденное выше максимальное угловое расстояние центра ширмы от центра источника, при котором наблюдается частичное затмение, определяет ширину полосы вокруг эклиптики, \lookPicRef{pic:elipses-node-distance}, внутри которой должен оказаться центр Луны, чтобы на Земле была потенциальная возможность наблюдать солнечное затмение. Оказывается, что Луна должна располагаться не дальше, чем $l = \gamma / \sin i \simeq 16^\circ$ от узла\footnote{в случае круговой орбиты Луны}, где $i$~--- угол наклона орбиты Луны к эклиптике.

\begin{figure}[h!]
\begin{subcaptionblock}[t]{0.63\tw}
\includegraphics[width=\tw]{eclipses-map-20.png}
\caption{Карта полных фаз затмений в 20-ом веке}
\label{pic:eclipse-20-century}
\end{subcaptionblock}
\hfill
\begin{subcaptionblock}[t]{0.32\tw}
\includegraphics[width=\tw]{eclipse-map-1999-08-11.png}
\caption{Карта затмения 11 августа 1999 года%\footnote{https://eclipse.gsfc.nasa.gov/SEplot/SEplot1951/SE1999Aug11T.GIF}
}
\label{pic:eclipse-1999-08-11}
\end{subcaptionblock}
\caption{}
\end{figure}

\begin{figure}[h!]
\centering
\vspace{-.5pc}
Expand Down
6 changes: 3 additions & 3 deletions sections/objects/other.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ \subsection{Другие объекты}
\begin{minipage}{0.32\tw}
\centering
\vspace{-1.2pc}
\includegraphics[width = .7\tw]{m13}
\includegraphics[width = .7\tw]{m13.pdf}
\captionof{figure}{Шаровое скопление M13 (негатив)}
\vspace{1pc}
\includegraphics[width = .7\tw]{m57}
\includegraphics[width = .7\tw]{m57.pdf}
\captionof{figure}{Пла\-не\-тар\-ная туманность M57 (негатив)}
\vspace{1.2pc}
\includegraphics[width = .7\tw]{m45}
\includegraphics[width = .7\tw]{m45.pdf}
\captionof{figure}{Рассеянное звёздное скопление M45 (негатив)}
\end{minipage}

2 changes: 1 addition & 1 deletion sections/optics/aberrations.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ \subsection{Аберрации в оптике}
\begin{wrapfigure}[13]{l}{0.4\tw}
\centering
\vspace{-1pc}
\includegraphics[width=0.4\tw]{optical-aberrations-coma.jpg}
\includegraphics[width=0.4\tw]{optical-aberrations-coma.pdf}
\caption{Изображение <<хвоста>> Большой Медведицы, полученное с помощью широкоугольного объектива, страдающего ярко выраженной комой.}
\label{pic:optics-aberrations-coma}
\end{wrapfigure}
Expand Down
Loading

0 comments on commit c1fbdf6

Please sign in to comment.