Skip to content

Commit

Permalink
Merge branch 'orbitersim:main' into CreateAirfoil4
Browse files Browse the repository at this point in the history
  • Loading branch information
n7275 authored Jan 7, 2024
2 parents 8677916 + f3ffb61 commit 72e6268
Show file tree
Hide file tree
Showing 27 changed files with 74,296 additions and 7,526 deletions.
31 changes: 27 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -78,7 +78,30 @@ jobs:
- name: Install
working-directory: ${{ github.workspace }}/out/build/windows-${{ matrix.architecture }}-release
run: cmake --install . --prefix ${{ github.workspace }}/out/install

- name: List exports
working-directory: ${{ github.workspace }}/out/install/Orbiter
shell: cmd
run: |
dumpbin /EXPORTS Modules\Server\Orbiter.exe /OUT:exports_tmp0.txt
type exports_tmp0.txt | find " ?" > exports_tmp1.txt
for /F "tokens=4" %%F in (exports_tmp1.txt) do @echo %%F >> exports_tmp2.txt
undname exports_tmp2.txt | sort > exports.txt
del /Q exports_tmp*.txt
- name: Diff exports with Orbiter 2016
if: ${{ matrix.architecture == 'x86' }}
shell: cmd
continue-on-error: true
run: git diff -U0 --ignore-cr-at-eol --ignore-space-at-eol --no-index exports.2016.txt out/install/Orbiter/exports.txt

- name: Upload exports
uses: actions/upload-artifact@v4
with:
name: exports-${{ matrix.architecture }}
path: ${{ github.workspace }}/out/install/Orbiter/exports.txt
retention-days: 1

- name: Pack
if: ${{ github.ref == 'refs/heads/main' }}
working-directory: ${{ github.workspace }}/out/install/Orbiter
Expand All @@ -87,7 +110,7 @@ jobs:

- name: Upload Build Artifact
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
with:
name: Orbiter-${{ matrix.architecture }}
# A file, directory or wildcard pattern that describes what to upload
Expand All @@ -108,10 +131,10 @@ jobs:
run: mkdir out

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: ./out

Expand Down
Binary file modified Doc/Credit.doc
Binary file not shown.
8 changes: 5 additions & 3 deletions Doc/Technotes/gravity/gravity.tex
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ \section{Extension to Tesseral Harmonics}
U_G(s, t, u) = \frac{\mu}{r}\left\{1+\sum_{n=1}^{\infty}\left ( \frac{a}{r} \right )^n \sum_{m=1}^{n}A_{n,m}(u)(C_{n,m}r_m(s,t)+S_{n,m}i_m(s,t)) \right\}
\end{equation}
where s, t, and u are the x, y, and z\footnote{Note: Orbiter uses a left-handed coordinate system, wherein the y and z axes are swaped with respect conventional systems like IAU.}, components of position normalized by the magnitude of the position vector, $r_m(s,t)$ and $i_m(s,t)$ are the real and imaginary components respectively of $(s+it)^m$, and $A_{n,m}(u)$ are the \emph{m}th derivative of the associated Legendre polynomial $P_{n,m}(u)$.
Similar to the zonal representation, the acceleration vector acting upon the spacecraft is found by computing the gradient of the potential. The algorithm used to compute acceleration is discussed and described in detail by Eckman et al.\cite{Eckman08}, referencing the implementation developed by DeMars et al.\\cite{DeMars08}
Similar to the zonal representation, the acceleration vector acting upon the spacecraft is found by computing the gradient of the potential. The algorithm used to compute acceleration is discussed and described in detail by Eckman et al.\cite{Eckman08}, referencing the implementation developed by DeMars et al.\cite{DeMars08}

\subsection{Notes on Usage}
Gravity models must follow certain conventions in order to be used. The format used by this implementation is the SHADR format, or Spherical Harmonic ASCII Data Record of PSI\cite{shadr}. Only ASCII models where degree = order are supported.
Expand Down Expand Up @@ -194,14 +194,16 @@ \subsubsection{Limitations}
All gravity models must start with the C(1,0) and S(1,0) coefficients. In the case that they have been omitted by the original creator of the model, they must be padded by zeros as shown in the first two lines of the example above. Additionally: only normalized coefficients are supported, only models that have a reference latitude and longitude corresponding to Orbiter's positive X axis are supported (latitude = 0°, longitude = 0°).

\subsubsection{Included Models}
By default Orbiter comes with four gravity models, one each for: Mercury, Venus, Earth's Moon, and Mars. The default cut-off degree/order is 10 to minimize the impact on simulation performance, however this can be increased at the users discretion. A summary of the models included with this release and their respective default settings is shown in Table~\ref{tab:models}
By default Orbiter comes with four gravity models, one each for: Mercury, Venus, Earth, Luna, Mars, and Vesta. The default cut-off degree/order is 10 to minimize the impact on simulation performance, however this can be increased at the users discretion. A summary of the models included with this release and their respective default settings is shown in Table~\ref{tab:models}
\begin{table}[h]
\begin{tabular}{llcc}
Body & Model & Maximum Degree/Order & Default Degree/Order \\\hline
Mercury & \emph{jgmess\_160a\_sha.tab} & 160 & 10 \\
Venus & \emph{mod\_shgj120p.a01} & 120 & 10 \\
Earth & \emph{egm96\_to360.tab} & 360 & 10 \\
Luna &\emph{ jgl165p1.sha} & 165 & 10 \\
Mars &\emph{ jgmro\_120f\_sha.tab} & 120 & 10
Mars &\emph{ jgmro\_120f\_sha.tab} & 120 & 10 \\
Vesta &\emph{ JGDWN\_VES20H\_SHA.TAB} & 20 & 10
\end{tabular}
\caption{Gravity models included with Orbiter}
\label{tab:models}
Expand Down
1 change: 1 addition & 0 deletions GravityModels/Notes on Gravity Models.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Mercury jgmess_160a_sha.tab
Venus mod_shgj120p.a01
Earth egm96_to360.tab
Moon jgl165p1.sha
Mars jgmro_120f_sha.tab
Vesta JGDWN_VES20H_SHA.TAB
Loading

0 comments on commit 72e6268

Please sign in to comment.