Update for S2E v8

.github/workflows/build.yml

@@ -81,7 +81,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
@@ -173,7 +172,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

.gitignore

@@ -4,7 +4,7 @@ CMakeBuilds/
 .vscode/
 
 # Log files
-data/logs/
+**/logs/
 
 # ExtLibraries
 ExtLibraries/
@@ -31,3 +31,9 @@ build/
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+
+# Setting files
+settings/environment/cspice
+settings/environment/space_weather
+settings/environment/gravity_field
+settings/environment/star_catalogue

CMakeLists.txt

@@ -5,14 +5,13 @@ cmake_minimum_required(VERSION 3.13)
 project(S2E_USER_EXAMPLE
   LANGUAGES CXX
   DESCRIPTION "s2e-user-example: An example of S2E user side repository"
-  VERSION 0.0.0
+  VERSION 1.0.0
 )
 
 # build config
 option(USE_HILS "Use HILS" OFF)
 option(USE_C2A "Use C2A" OFF)
 option(BUILD_64BIT "Build 64bit" OFF)
-option(GOOGLE_TEST "Execute GoogleTest" OFF)
 
 # Mac user setting
 option(APPLE_SILICON "Build with Apple Silicon" OFF)
@@ -43,8 +42,8 @@ if(NOT DEFINED C2A_NAME)
 endif()
 
 ## Directory path for ini files
-if(NOT DEFINED INI_FILE_DIR_FROM_EXE)
-  set(INI_FILE_DIR_FROM_EXE ../../data/initialize_files)
+if(NOT DEFINED SETTINGS_DIR_FROM_EXE)
+  set(SETTINGS_DIR_FROM_EXE ../../settings)
 endif()
 
 if(NOT DEFINED EXT_LIB_DIR_FROM_EXE)
@@ -90,8 +89,12 @@ add_subdirectory(${S2E_CORE_DIR}/src/disturbances s2e_core/disturbances)
 add_subdirectory(${S2E_CORE_DIR}/src/dynamics s2e_core/dynamics)
 add_subdirectory(${S2E_CORE_DIR}/src/environment/global s2e_core/environment/global)
 add_subdirectory(${S2E_CORE_DIR}/src/environment/local s2e_core/environment/local)
-add_subdirectory(${S2E_CORE_DIR}/src/library s2e_core/library)
+add_subdirectory(${S2E_CORE_DIR}/src/logger s2e_core/logger)
+add_subdirectory(${S2E_CORE_DIR}/src/math_physics s2e_core/math_physics)
+add_subdirectory(${S2E_CORE_DIR}/src/setting_file_reader s2e_core/setting_file_reader)
 add_subdirectory(${S2E_CORE_DIR}/src/simulation s2e_core/simulation)
+add_subdirectory(${S2E_CORE_DIR}/src/utilities s2e_core/utilities)
+add_subdirectory(${S2E_CORE_DIR}/ExtLibraries/inih)
 
 # Add all cpp files as SOURCE_FILES
 file(GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
@@ -178,13 +181,14 @@ set(S2E_LIBRARIES
   IGRF WRAPPER_NRLMSISE00 INIH SGP4 UTIL OPTICS RELATIVE_ORBIT_MODELS ORBIT_MODELS GEODESY MATH
 )
 # Initialize link
-target_link_libraries(COMPONENT DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT LIBRARY)
-target_link_libraries(DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT SIMULATION LIBRARY)
-target_link_libraries(DISTURBANCE DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT LIBRARY)
-target_link_libraries(SIMULATION DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT DISTURBANCE LIBRARY)
-target_link_libraries(GLOBAL_ENVIRONMENT ${CSPICE_LIB} LIBRARY)
-target_link_libraries(LOCAL_ENVIRONMENT GLOBAL_ENVIRONMENT ${CSPICE_LIB} LIBRARY)
-target_link_libraries(LIBRARY ${NRLMSISE00_LIB})
+target_link_libraries(COMPONENT DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT MATH_PHYSICS SETTING_FILE_READER LOGGER UTILITIES)
+target_link_libraries(DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT SIMULATION MATH_PHYSICS)
+target_link_libraries(DISTURBANCE DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT MATH_PHYSICS)
+target_link_libraries(SIMULATION DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT DISTURBANCE MATH_PHYSICS)
+target_link_libraries(GLOBAL_ENVIRONMENT ${CSPICE_LIB} MATH_PHYSICS)
+target_link_libraries(LOCAL_ENVIRONMENT GLOBAL_ENVIRONMENT ${CSPICE_LIB} MATH_PHYSICS)
+target_link_libraries(MATH_PHYSICS ${NRLMSISE00_LIB})
+target_link_libraries(SETTING_FILE_READER INIH)
 
 target_link_libraries(${PROJECT_NAME} DYNAMICS)
 target_link_libraries(${PROJECT_NAME} DISTURBANCE)

data/initialize_files/user_satellite_disturbance.ini → settings/user_satellite/disturbance.ini

@@ -3,8 +3,14 @@
 calculation = DISABLE
 logging = ENABLE
 degree = 4
-coefficients_file_path = EXT_LIB_DIR_FROM_EXE/GeoPotential/egm96_to360.ascii
+coefficients_file_path = SETTINGS_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 = SETTINGS_DIR_FROM_EXE/environment/gravity_field/gggrx_1200a_sha.tab
 
 [MAGNETIC_DISTURBANCE]
 // Enable only when the center object is defined as the Earth

data/initialize_files/user_satellite_local_environment.ini → settings/user_satellite/local_environment.ini

@@ -1,7 +1,7 @@
 [MAGNETIC_FIELD_ENVIRONMENT]
 calculation = ENABLE
 logging = ENABLE
-coefficient_file = CORE_DIR_FROM_EXE/src/library/external/igrf/igrf13.coef
+coefficient_file = SETTINGS_DIR_FROM_EXE/environment/magnetic_field/igrf13.coef
 magnetic_field_random_walk_standard_deviation_nT = 10.0
 magnetic_field_random_walk_limit_nT = 400.0
 magnetic_field_white_noise_standard_deviation_nT = 50.0
@@ -12,14 +12,20 @@ calculation = ENABLE
 logging = ENABLE
 
 
+[EARTH_ALBEDO]
+calculation = DISABLE
+// Earth albedo factor: Percentage of sunlight reflected off the Earth surface. Value between 0.0 and 1.0
+earth_albedo_factor = 0.3
+
+
 [ATMOSPHERE]
 calculation = ENABLE
 logging = ENABLE
 
 // Atmosphere model
 // STANDARD: Model using scale height, NRLMSISE00: NRLMSISE00 model
 model = STANDARD
-nrlmsise00_table_file = EXT_LIB_DIR_FROM_EXE/nrlmsise00/table/SpaceWeather.txt
+nrlmsise00_table_file = SETTINGS_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