Merge pull request #678 from ut-issl/feature/add-space-wheather-direc…

…tory Add space weather directory
ut-issl · Aug 25, 2024 · 7965d62 · 7965d62
2 parents 19010e4 + c9e52a2
commit 7965d62
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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
@@ -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

diff --git a/.github/workflows/google-test.yml b/.github/workflows/google-test.yml
@@ -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

diff --git a/ExtLibraries/nrlmsise00/CMakeLists.txt b/ExtLibraries/nrlmsise00/CMakeLists.txt
@@ -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)
@@ -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}
 )
diff --git a/settings/environment/space_weather/.gitkeep b/settings/environment/space_weather/.gitkeep
diff --git a/settings/sample_satellite/local_environment.ini b/settings/sample_satellite/local_environment.ini
@@ -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