Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add space weather directory #678

Merged
merged 5 commits into from
Aug 25, 2024
Merged

Add space weather directory #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f68bf7e
Add space wheather directory
200km Aug 25, 2024
f8ebcd9
Modify nrlmsise CMake
200km Aug 25, 2024
31c420f
Update directory path for space wheather
200km Aug 25, 2024
4ce4458
Fix typo
200km Aug 25, 2024
c9e52a2
Fix CI
200km Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ jobs:
ls cspice/include
ls cspice/generic_kernels
ls nrlmsise00
ls nrlmsise00/table
ls nrlmsise00/lib*
ls nrlmsise00/lib*/libnrlmsise00.lib
ls nrlmsise00/src
Expand Down Expand Up @@ -198,7 +197,6 @@ jobs:
ls cspice/include
ls cspice/generic_kernels
ls nrlmsise00
ls nrlmsise00/table
ls nrlmsise00/lib*
ls nrlmsise00/lib*/libnrlmsise00.a
ls nrlmsise00/src
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/google-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ jobs:
ls cspice/include
ls cspice/generic_kernels
ls nrlmsise00
ls nrlmsise00/table
ls nrlmsise00/lib*
ls nrlmsise00/lib*/libnrlmsise00.a
ls nrlmsise00/src
Expand Down
5 changes: 4 additions & 1 deletion ExtLibraries/nrlmsise00/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ cmake_minimum_required(VERSION 3.18)
include(ExternalProject)
include(FetchContent)

set(SETTINGS_DIR "${CMAKE_CURRENT_LIST_DIR}/../../settings/")

set(NRLMSISE_INSTALL_DIR ${EXT_LIB_DIR}/nrlmsise00)
set(TABLE_FILE_INSTALL_DIR ${SETTINGS_DIR}/environment/space_weather)

set(NRLMSISE_TABLE_URL_BASE ftp://ftp.agi.com/pub/DynamicEarthData)
set(NRLMSISE_TABLE_FILE SpaceWeather-v1.2.txt)
Expand Down Expand Up @@ -90,5 +93,5 @@ install(FILES ${NRLMSISE_TMP_DIR}/nrlmsise-00_data.c

## install table
install(FILES ${NRLMSISE_TMP_DIR}/${NRLMSISE_TABLE_FILE}
DESTINATION ${NRLMSISE_INSTALL_DIR}/table
DESTINATION ${TABLE_FILE_INSTALL_DIR}
)
Empty file added settings/environment/space_weather/.gitkeep
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion settings/sample_satellite/local_environment.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ logging = ENABLE
// NRLMSISE00: NRLMSISE00 model
// HARRIS_PRIESTER: Harris-Priester model
model = STANDARD
nrlmsise00_table_file = EXT_LIB_DIR_FROM_EXE/nrlmsise00/table/SpaceWeather-v1.2.txt
nrlmsise00_table_file = INI_FILE_DIR_FROM_EXE/environment/space_weather/SpaceWeather-v1.2.txt
// Whether using user-defined f10.7 and ap value
// Ref of f10.7: https://www.swpc.noaa.gov/phenomena/f107-cm-radio-emissions
// Ref of ap: http://wdc.kugi.kyoto-u.ac.jp/kp/kpexp-j.html
Expand Down