From cfb77ac0b7c382f8fe6ea4fea973bcd30bd71c8f Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 25 Aug 2024 14:29:13 +0900 Subject: [PATCH 1/5] Move egm file to settings --- .../environment/gravity_field}/egm96_to360.ascii | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {ExtLibraries/GeoPotential => settings/environment/gravity_field}/egm96_to360.ascii (100%) diff --git a/ExtLibraries/GeoPotential/egm96_to360.ascii b/settings/environment/gravity_field/egm96_to360.ascii similarity index 100% rename from ExtLibraries/GeoPotential/egm96_to360.ascii rename to settings/environment/gravity_field/egm96_to360.ascii From b7a375de235c2af86432e42007e42e565a3ceaec Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 25 Aug 2024 14:29:46 +0900 Subject: [PATCH 2/5] Delete GeoPotential CMake --- ExtLibraries/GeoPotential/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ExtLibraries/GeoPotential/CMakeLists.txt diff --git a/ExtLibraries/GeoPotential/CMakeLists.txt b/ExtLibraries/GeoPotential/CMakeLists.txt deleted file mode 100644 index 037c56652..000000000 --- a/ExtLibraries/GeoPotential/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(geopotential) - -cmake_minimum_required(VERSION 3.13) - - -set(GEOPOTENTIAL_INSTALL_DIR ${EXT_LIB_DIR}/GeoPotential/) - -## install table -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/egm96_to360.ascii - DESTINATION ${GEOPOTENTIAL_INSTALL_DIR} -) From 3a96fc9fd4a54ae8540fa92c5610f1dbb4f8121d Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 25 Aug 2024 14:30:23 +0900 Subject: [PATCH 3/5] Remove Geopotential CMake call --- ExtLibraries/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ExtLibraries/CMakeLists.txt b/ExtLibraries/CMakeLists.txt index d4b66fba9..062e93ccd 100644 --- a/ExtLibraries/CMakeLists.txt +++ b/ExtLibraries/CMakeLists.txt @@ -23,5 +23,4 @@ message("ExtLibraries install dir: ${EXT_LIB_DIR}") add_subdirectory(nrlmsise00) add_subdirectory(cspice) -add_subdirectory(GeoPotential) add_subdirectory(lunar_gravity_field) From 5fbb92b3b74494659d57e2f835e3c15e7f954937 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 25 Aug 2024 14:41:16 +0900 Subject: [PATCH 4/5] Update download directory for lunar gravity field --- ExtLibraries/lunar_gravity_field/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ExtLibraries/lunar_gravity_field/CMakeLists.txt b/ExtLibraries/lunar_gravity_field/CMakeLists.txt index 35a6f92dc..2c5f75c56 100644 --- a/ExtLibraries/lunar_gravity_field/CMakeLists.txt +++ b/ExtLibraries/lunar_gravity_field/CMakeLists.txt @@ -4,7 +4,9 @@ cmake_minimum_required(VERSION 3.18) include(FetchContent) -set(LUNAR_GRAVITY_FIELD_INSTALL_DIR ${EXT_LIB_DIR}/lunar_gravity_field) +set(SETTINGS_DIR "${CMAKE_CURRENT_LIST_DIR}/../../settings/") + +set(LUNAR_GRAVITY_FIELD_INSTALL_DIR ${SETTINGS_DIR}/environment/gravity_field) set(LUNAR_GRAVITY_FIELD_URL_BASE https://pds-geosciences.wustl.edu/grail/grail-l-lgrs-5-rdr-v1/grail_1001/shadr) set(LUNAR_GRAVITY_FIELD_FILE gggrx_1200a_sha.tab) From 076b3378bbfd15e4a1e396c839e2fb2f385ccd79 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 25 Aug 2024 14:43:02 +0900 Subject: [PATCH 5/5] Update default directory path for gravity field settings --- settings/sample_satellite/disturbance.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/sample_satellite/disturbance.ini b/settings/sample_satellite/disturbance.ini index 21bb68c1f..06564e503 100644 --- a/settings/sample_satellite/disturbance.ini +++ b/settings/sample_satellite/disturbance.ini @@ -3,14 +3,14 @@ calculation = DISABLE logging = ENABLE degree = 4 -coefficients_file_path = EXT_LIB_DIR_FROM_EXE/GeoPotential/egm96_to360.ascii +coefficients_file_path = INI_FILE_DIR_FROM_EXE/environment/gravity_field/egm96_to360.ascii [LUNAR_GRAVITY_FIELD] // Enable only when the center object is defined as the Moon calculation = DISABLE logging = ENABLE degree = 10 -coefficients_file_path = EXT_LIB_DIR_FROM_EXE/LunarGravityField/gggrx_1200a_sha.tab +coefficients_file_path = INI_FILE_DIR_FROM_EXE/environment/gravity_field/gggrx_1200a_sha.tab [MAGNETIC_DISTURBANCE]