diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c86fb21e0..7f296f9f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,12 @@ on: paths: - '.github/workflows/build.yml' - 'ExtLibraries/**' - - 'CMakeLists.txt' - 'common.cmake' - - 'CMakeSettings.json' - 'src/**' - 'scripts/Plot/Pipfile' + - 'example/CMakeSettings.json' + - 'example/CMakeLists.txt' + - 'example/src/**' env: # datasource=github-releases depName=ut-issl/c2a-core @@ -113,38 +114,40 @@ jobs: if: steps.cache-extlib.outputs.cache-hit == 'true' shell: powershell run: | - ls ./settings/environment/cspice - cp -r "./ExtLibraries/cspice/generic_kernels" "./settings/environment/cspice" - ls ./settings/environment/cspice - ls ./settings/environment/cspice/generic_kernels/lsk - ls ./settings/environment/cspice/generic_kernels/pck - ls ./settings/environment/cspice/generic_kernels/spk - - - name: build 32bit + ls ./example/settings/environment/cspice + cp -r "./ExtLibraries/cspice/generic_kernels" "./example/settings/environment/cspice" + ls ./example/settings/environment/cspice + ls ./example/settings/environment/cspice/generic_kernels/lsk + ls ./example/settings/environment/cspice/generic_kernels/pck + ls ./example/settings/environment/cspice/generic_kernels/spk + + - name: build example (32bit) if: matrix.build_bit == 'BUILD_64BIT=OFF' shell: cmd + working-directory: ./example run: | cl.exe - cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DSETTINGS_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=./ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DSETTINGS_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=../ -DEXT_LIB_DIR=../ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=../c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - - name: build 64bit + - name: build example (64bit) if: matrix.build_bit == 'BUILD_64BIT=ON' shell: cmd + working-directory: ./example run: | cl.exe - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DSETTINGS_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=./ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DSETTINGS_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=../ -DEXT_LIB_DIR=../ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=../c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: fix simulation config shell: bash - working-directory: ./settings + working-directory: ./example/settings run: | find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/g' {} \; - - name: run simulation(SampleSat) + - name: run simulation (SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') - working-directory: ./ + working-directory: ./example run: | .\Debug\S2E.exe @@ -222,29 +225,30 @@ jobs: - name: copy to settings if: steps.cache-extlib.outputs.cache-hit == 'true' run: | - ls ./settings/environment/cspice - cp -r "./ExtLibraries/cspice/generic_kernels" "./settings/environment/cspice" - ls ./settings/environment/cspice - ls ./settings/environment/cspice/generic_kernels/lsk - ls ./settings/environment/cspice/generic_kernels/pck - ls ./settings/environment/cspice/generic_kernels/spk - + ls ./example/settings/environment/cspice + cp -r "./ExtLibraries/cspice/generic_kernels" "./example/settings/environment/cspice" + ls ./example/settings/environment/cspice + ls ./example/settings/environment/cspice/generic_kernels/lsk + ls ./example/settings/environment/cspice/generic_kernels/pck + ls ./example/settings/environment/cspice/generic_kernels/spk + - name: build env: CC: ${{ steps.compiler.outputs.CC }} CXX: ${{ steps.compiler.outputs.CXX }} + working-directory: ./example run: | - cmake . -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DSETTINGS_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=./ -D${{ matrix.build_bit }} + cmake . -DEXT_LIB_DIR=../ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DSETTINGS_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=../ -D${{ matrix.build_bit }} cmake --build . - name: fix simulation config - working-directory: ./settings + working-directory: ./example/settings run: | find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/g' {} \; - name: run simulation(SampleSat) - working-directory: ./ + working-directory: ./example run: | ./S2E @@ -253,19 +257,19 @@ jobs: run: | sudo apt-get install -y gnuplot pip3 install yq - LOG=$(ls ../../logs/logs_*/*.csv) + LOG=$(ls ../../example/logs/logs_*/*.csv) echo "plot $LOG" ./gen_graph.sh "${LOG}" ls ls ./imgs - + - name: read python version from Pipfile id: python-version working-directory: ./scripts/Plot run: | ver=$(grep python_version ./Pipfile | sed -e 's/^python_version\s=\s"\(.*\)"$/\1/') echo "version=$ver" >> "$GITHUB_OUTPUT" - + - uses: actions/setup-python@v5.3.0 with: python-version: ${{ steps.python-version.outputs.version }} diff --git a/.github/workflows/google-test.yml b/.github/workflows/google-test.yml index 65a639018..67d97e15f 100644 --- a/.github/workflows/google-test.yml +++ b/.github/workflows/google-test.yml @@ -89,13 +89,15 @@ jobs: ls nrlmsise00/lib*/libnrlmsise00.a ls nrlmsise00/src - - name: build + - name: build example env: CC: ${{ steps.compiler.outputs.CC }} CXX: ${{ steps.compiler.outputs.CXX }} + working-directory: ./example run: | - cmake . -DEXT_LIB_DIR=./ExtLibraries -DBUILD_64BIT=ON -DGOOGLE_TEST=ON -DCORE_DIR_FROM_EXE=../s2e-core + cmake . -DEXT_LIB_DIR=../ExtLibraries -DBUILD_64BIT=ON -DGOOGLE_TEST=ON -DCORE_DIR_FROM_EXE=../s2e-core cmake --build . - name: run test + working-directory: ./example run: ./S2E_TEST diff --git a/CMakeLists.txt b/example/CMakeLists.txt similarity index 84% rename from CMakeLists.txt rename to example/CMakeLists.txt index 46fda6c45..17caef33b 100644 --- a/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -27,8 +27,11 @@ if(WIN32) endif() ## set directory path +if(NOT DEFINED S2E_CORE_DIR) + set(S2E_CORE_DIR ${CMAKE_CURRENT_LIST_DIR}/../) +endif() if(NOT DEFINED EXT_LIB_DIR) - set(EXT_LIB_DIR ../ExtLibraries) + set(EXT_LIB_DIR ${CMAKE_CURRENT_LIST_DIR}/../../ExtLibraries) endif() set(CSPICE_DIR ${EXT_LIB_DIR}/cspice) set(NRLMSISE00_DIR ${EXT_LIB_DIR}/nrlmsise00) @@ -42,7 +45,7 @@ endif() ## Directory path for ini files if(NOT DEFINED SETTINGS_DIR_FROM_EXE) - set(SETTINGS_DIR_FROM_EXE ../../settings) + set(SETTINGS_DIR_FROM_EXE ../settings) endif() if(NOT DEFINED EXT_LIB_DIR_FROM_EXE) @@ -79,29 +82,30 @@ endif() set(S2E_DIR ${CMAKE_CURRENT_SOURCE_DIR}) ## include directories +include_directories(${S2E_CORE_DIR}/src) include_directories(${CSPICE_DIR}/include) include_directories(${NRLMSISE00_DIR}/src) ## add_subdirectories -add_subdirectory(src/simulation) -add_subdirectory(src/environment/global) -add_subdirectory(src/environment/local) -add_subdirectory(src/dynamics) -add_subdirectory(src/disturbances) -add_subdirectory(src/components) -add_subdirectory(src/math_physics) -add_subdirectory(src/setting_file_reader) -add_subdirectory(src/logger) -add_subdirectory(src/utilities) -add_subdirectory(ExtLibraries/inih) +add_subdirectory(${S2E_CORE_DIR}/src/simulation simulation) +add_subdirectory(${S2E_CORE_DIR}/src/environment/global environment/global) +add_subdirectory(${S2E_CORE_DIR}/src/environment/local environment/local) +add_subdirectory(${S2E_CORE_DIR}/src/dynamics dynamics) +add_subdirectory(${S2E_CORE_DIR}/src/disturbances disturbances) +add_subdirectory(${S2E_CORE_DIR}/src/components components) +add_subdirectory(${S2E_CORE_DIR}/src/math_physics math_physics) +add_subdirectory(${S2E_CORE_DIR}/src/setting_file_reader setting_file_reader) +add_subdirectory(${S2E_CORE_DIR}/src/logger logger) +add_subdirectory(${S2E_CORE_DIR}/src/utilities utilities) +add_subdirectory(${S2E_CORE_DIR}/ExtLibraries/inih ExtLibraries/inih) set(SOURCE_FILES src/s2e.cpp - src/simulation_sample/case/sample_case.cpp - src/simulation_sample/spacecraft/sample_spacecraft.cpp - src/simulation_sample/spacecraft/sample_components.cpp - src/simulation_sample/ground_station/sample_ground_station_components.cpp - src/simulation_sample/ground_station/sample_ground_station.cpp + src/simulation/case/sample_case.cpp + src/simulation/spacecraft/sample_spacecraft.cpp + src/simulation/spacecraft/sample_components.cpp + src/simulation/ground_station/sample_ground_station_components.cpp + src/simulation/ground_station/sample_ground_station.cpp ) ## cspice library @@ -264,4 +268,4 @@ endif() message("Cspice_LIB: " ${CSPICE_LIB}) message("nrlmsise00_LIB: " ${NRLMSISE00_LIB}) -include(common.cmake) +include(${S2E_CORE_DIR}/common.cmake) diff --git a/CMakeSettings.json b/example/CMakeSettings.json similarity index 100% rename from CMakeSettings.json rename to example/CMakeSettings.json diff --git a/settings/environment/cspice/.gitkeep b/example/settings/environment/cspice/.gitkeep similarity index 100% rename from settings/environment/cspice/.gitkeep rename to example/settings/environment/cspice/.gitkeep diff --git a/settings/environment/gnss/final_products/.gitkeep b/example/settings/environment/gnss/final_products/.gitkeep similarity index 100% rename from settings/environment/gnss/final_products/.gitkeep rename to example/settings/environment/gnss/final_products/.gitkeep diff --git a/settings/environment/gravity_field/egm96_to360.ascii b/example/settings/environment/gravity_field/egm96_to360.ascii similarity index 100% rename from settings/environment/gravity_field/egm96_to360.ascii rename to example/settings/environment/gravity_field/egm96_to360.ascii diff --git a/settings/environment/magnetic_field/igrf11.coef b/example/settings/environment/magnetic_field/igrf11.coef similarity index 100% rename from settings/environment/magnetic_field/igrf11.coef rename to example/settings/environment/magnetic_field/igrf11.coef diff --git a/settings/environment/magnetic_field/igrf12.coef b/example/settings/environment/magnetic_field/igrf12.coef similarity index 100% rename from settings/environment/magnetic_field/igrf12.coef rename to example/settings/environment/magnetic_field/igrf12.coef diff --git a/settings/environment/magnetic_field/igrf13.coef b/example/settings/environment/magnetic_field/igrf13.coef similarity index 100% rename from settings/environment/magnetic_field/igrf13.coef rename to example/settings/environment/magnetic_field/igrf13.coef diff --git a/settings/environment/sample_gnss.ini b/example/settings/environment/sample_gnss.ini similarity index 100% rename from settings/environment/sample_gnss.ini rename to example/settings/environment/sample_gnss.ini diff --git a/settings/environment/space_weather/.gitkeep b/example/settings/environment/space_weather/.gitkeep similarity index 100% rename from settings/environment/space_weather/.gitkeep rename to example/settings/environment/space_weather/.gitkeep diff --git a/settings/environment/star_catalogue/.gitkeep b/example/settings/environment/star_catalogue/.gitkeep similarity index 100% rename from settings/environment/star_catalogue/.gitkeep rename to example/settings/environment/star_catalogue/.gitkeep diff --git a/settings/sample_ground_station/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv b/example/settings/sample_ground_station/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv similarity index 100% rename from settings/sample_ground_station/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv rename to example/settings/sample_ground_station/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv diff --git a/settings/sample_ground_station/components/ground_station_antenna.ini b/example/settings/sample_ground_station/components/ground_station_antenna.ini similarity index 100% rename from settings/sample_ground_station/components/ground_station_antenna.ini rename to example/settings/sample_ground_station/components/ground_station_antenna.ini diff --git a/settings/sample_ground_station/components/ground_station_calculator.ini b/example/settings/sample_ground_station/components/ground_station_calculator.ini similarity index 100% rename from settings/sample_ground_station/components/ground_station_calculator.ini rename to example/settings/sample_ground_station/components/ground_station_calculator.ini diff --git a/settings/sample_ground_station/ground_station.ini b/example/settings/sample_ground_station/ground_station.ini similarity index 100% rename from settings/sample_ground_station/ground_station.ini rename to example/settings/sample_ground_station/ground_station.ini diff --git a/settings/sample_inter_satellite_communication.ini b/example/settings/sample_inter_satellite_communication.ini similarity index 100% rename from settings/sample_inter_satellite_communication.ini rename to example/settings/sample_inter_satellite_communication.ini diff --git a/settings/sample_satellite/components/angular_velocity_observer.ini b/example/settings/sample_satellite/components/angular_velocity_observer.ini similarity index 100% rename from settings/sample_satellite/components/angular_velocity_observer.ini rename to example/settings/sample_satellite/components/angular_velocity_observer.ini diff --git a/settings/sample_satellite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv b/example/settings/sample_satellite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv similarity index 100% rename from settings/sample_satellite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv rename to example/settings/sample_satellite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv diff --git a/settings/sample_satellite/components/attitude_observer.ini b/example/settings/sample_satellite/components/attitude_observer.ini similarity index 100% rename from settings/sample_satellite/components/attitude_observer.ini rename to example/settings/sample_satellite/components/attitude_observer.ini diff --git a/settings/sample_satellite/components/battery.ini b/example/settings/sample_satellite/components/battery.ini similarity index 100% rename from settings/sample_satellite/components/battery.ini rename to example/settings/sample_satellite/components/battery.ini diff --git a/settings/sample_satellite/components/component_interference.ini b/example/settings/sample_satellite/components/component_interference.ini similarity index 100% rename from settings/sample_satellite/components/component_interference.ini rename to example/settings/sample_satellite/components/component_interference.ini diff --git a/settings/sample_satellite/components/force_generator.ini b/example/settings/sample_satellite/components/force_generator.ini similarity index 100% rename from settings/sample_satellite/components/force_generator.ini rename to example/settings/sample_satellite/components/force_generator.ini diff --git a/settings/sample_satellite/components/gnss_receiver.ini b/example/settings/sample_satellite/components/gnss_receiver.ini similarity index 100% rename from settings/sample_satellite/components/gnss_receiver.ini rename to example/settings/sample_satellite/components/gnss_receiver.ini diff --git a/settings/sample_satellite/components/gyro_sensor.ini b/example/settings/sample_satellite/components/gyro_sensor.ini similarity index 100% rename from settings/sample_satellite/components/gyro_sensor.ini rename to example/settings/sample_satellite/components/gyro_sensor.ini diff --git a/settings/sample_satellite/components/magnetometer.ini b/example/settings/sample_satellite/components/magnetometer.ini similarity index 100% rename from settings/sample_satellite/components/magnetometer.ini rename to example/settings/sample_satellite/components/magnetometer.ini diff --git a/settings/sample_satellite/components/magnetorquer.ini b/example/settings/sample_satellite/components/magnetorquer.ini similarity index 100% rename from settings/sample_satellite/components/magnetorquer.ini rename to example/settings/sample_satellite/components/magnetorquer.ini diff --git a/settings/sample_satellite/components/orbit_observer.ini b/example/settings/sample_satellite/components/orbit_observer.ini similarity index 100% rename from settings/sample_satellite/components/orbit_observer.ini rename to example/settings/sample_satellite/components/orbit_observer.ini diff --git a/settings/sample_satellite/components/pcu_initial_study.ini b/example/settings/sample_satellite/components/pcu_initial_study.ini similarity index 100% rename from settings/sample_satellite/components/pcu_initial_study.ini rename to example/settings/sample_satellite/components/pcu_initial_study.ini diff --git a/settings/sample_satellite/components/reaction_wheel.ini b/example/settings/sample_satellite/components/reaction_wheel.ini similarity index 100% rename from settings/sample_satellite/components/reaction_wheel.ini rename to example/settings/sample_satellite/components/reaction_wheel.ini diff --git a/settings/sample_satellite/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv b/example/settings/sample_satellite/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv similarity index 100% rename from settings/sample_satellite/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv rename to example/settings/sample_satellite/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv diff --git a/settings/sample_satellite/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv b/example/settings/sample_satellite/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv similarity index 100% rename from settings/sample_satellite/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv rename to example/settings/sample_satellite/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv diff --git a/settings/sample_satellite/components/solar_array_panel.ini b/example/settings/sample_satellite/components/solar_array_panel.ini similarity index 100% rename from settings/sample_satellite/components/solar_array_panel.ini rename to example/settings/sample_satellite/components/solar_array_panel.ini diff --git a/settings/sample_satellite/components/spacecraft_antenna.ini b/example/settings/sample_satellite/components/spacecraft_antenna.ini similarity index 100% rename from settings/sample_satellite/components/spacecraft_antenna.ini rename to example/settings/sample_satellite/components/spacecraft_antenna.ini diff --git a/settings/sample_satellite/components/star_sensor.ini b/example/settings/sample_satellite/components/star_sensor.ini similarity index 100% rename from settings/sample_satellite/components/star_sensor.ini rename to example/settings/sample_satellite/components/star_sensor.ini diff --git a/settings/sample_satellite/components/sun_sensor.ini b/example/settings/sample_satellite/components/sun_sensor.ini similarity index 100% rename from settings/sample_satellite/components/sun_sensor.ini rename to example/settings/sample_satellite/components/sun_sensor.ini diff --git a/settings/sample_satellite/components/telescope.ini b/example/settings/sample_satellite/components/telescope.ini similarity index 100% rename from settings/sample_satellite/components/telescope.ini rename to example/settings/sample_satellite/components/telescope.ini diff --git a/settings/sample_satellite/components/thermal_components.ini b/example/settings/sample_satellite/components/thermal_components.ini similarity index 100% rename from settings/sample_satellite/components/thermal_components.ini rename to example/settings/sample_satellite/components/thermal_components.ini diff --git a/settings/sample_satellite/components/thruster.ini b/example/settings/sample_satellite/components/thruster.ini similarity index 100% rename from settings/sample_satellite/components/thruster.ini rename to example/settings/sample_satellite/components/thruster.ini diff --git a/settings/sample_satellite/components/torque_generator.ini b/example/settings/sample_satellite/components/torque_generator.ini similarity index 100% rename from settings/sample_satellite/components/torque_generator.ini rename to example/settings/sample_satellite/components/torque_generator.ini diff --git a/settings/sample_satellite/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv b/example/settings/sample_satellite/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv similarity index 100% rename from settings/sample_satellite/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv rename to example/settings/sample_satellite/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv diff --git a/settings/sample_satellite/components/wings_command_sender_to_c2a/example.ops b/example/settings/sample_satellite/components/wings_command_sender_to_c2a/example.ops similarity index 100% rename from settings/sample_satellite/components/wings_command_sender_to_c2a/example.ops rename to example/settings/sample_satellite/components/wings_command_sender_to_c2a/example.ops diff --git a/settings/sample_satellite/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini b/example/settings/sample_satellite/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini similarity index 100% rename from settings/sample_satellite/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini rename to example/settings/sample_satellite/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini diff --git a/settings/sample_satellite/disturbance.ini b/example/settings/sample_satellite/disturbance.ini similarity index 100% rename from settings/sample_satellite/disturbance.ini rename to example/settings/sample_satellite/disturbance.ini diff --git a/settings/sample_satellite/local_environment.ini b/example/settings/sample_satellite/local_environment.ini similarity index 100% rename from settings/sample_satellite/local_environment.ini rename to example/settings/sample_satellite/local_environment.ini diff --git a/settings/sample_satellite/orbit_files/time_series_orbit.csv b/example/settings/sample_satellite/orbit_files/time_series_orbit.csv similarity index 100% rename from settings/sample_satellite/orbit_files/time_series_orbit.csv rename to example/settings/sample_satellite/orbit_files/time_series_orbit.csv diff --git a/settings/sample_satellite/satellite.ini b/example/settings/sample_satellite/satellite.ini similarity index 100% rename from settings/sample_satellite/satellite.ini rename to example/settings/sample_satellite/satellite.ini diff --git a/settings/sample_satellite/structure.ini b/example/settings/sample_satellite/structure.ini similarity index 100% rename from settings/sample_satellite/structure.ini rename to example/settings/sample_satellite/structure.ini diff --git a/settings/sample_satellite/thermal_csv_files/cij.csv b/example/settings/sample_satellite/thermal_csv_files/cij.csv similarity index 100% rename from settings/sample_satellite/thermal_csv_files/cij.csv rename to example/settings/sample_satellite/thermal_csv_files/cij.csv diff --git a/settings/sample_satellite/thermal_csv_files/heaters.csv b/example/settings/sample_satellite/thermal_csv_files/heaters.csv similarity index 100% rename from settings/sample_satellite/thermal_csv_files/heaters.csv rename to example/settings/sample_satellite/thermal_csv_files/heaters.csv diff --git a/settings/sample_satellite/thermal_csv_files/heatload.csv b/example/settings/sample_satellite/thermal_csv_files/heatload.csv similarity index 100% rename from settings/sample_satellite/thermal_csv_files/heatload.csv rename to example/settings/sample_satellite/thermal_csv_files/heatload.csv diff --git a/settings/sample_satellite/thermal_csv_files/node.csv b/example/settings/sample_satellite/thermal_csv_files/node.csv similarity index 100% rename from settings/sample_satellite/thermal_csv_files/node.csv rename to example/settings/sample_satellite/thermal_csv_files/node.csv diff --git a/settings/sample_satellite/thermal_csv_files/rij.csv b/example/settings/sample_satellite/thermal_csv_files/rij.csv similarity index 100% rename from settings/sample_satellite/thermal_csv_files/rij.csv rename to example/settings/sample_satellite/thermal_csv_files/rij.csv diff --git a/settings/sample_simulation_base.ini b/example/settings/sample_simulation_base.ini similarity index 100% rename from settings/sample_simulation_base.ini rename to example/settings/sample_simulation_base.ini diff --git a/src/s2e.cpp b/example/src/s2e.cpp similarity index 97% rename from src/s2e.cpp rename to example/src/s2e.cpp index f0d19356e..ba034ed01 100644 --- a/src/s2e.cpp +++ b/example/src/s2e.cpp @@ -18,7 +18,7 @@ #include "logger/logger.hpp" // Add custom include files -#include "simulation_sample/case/sample_case.hpp" +#include "simulation/case/sample_case.hpp" // #include "simulation/monte_carlo_simulation/monte_carlo_simulation_executor.hpp" // #include "interface/hils/COSMOSWrapper.h" // #include "interface/hils/HardwareMessage.h" diff --git a/src/simulation_sample/case/sample_case.cpp b/example/src/simulation/case/sample_case.cpp similarity index 100% rename from src/simulation_sample/case/sample_case.cpp rename to example/src/simulation/case/sample_case.cpp diff --git a/src/simulation_sample/case/sample_case.hpp b/example/src/simulation/case/sample_case.hpp similarity index 96% rename from src/simulation_sample/case/sample_case.hpp rename to example/src/simulation/case/sample_case.hpp index af3fc5b74..156fabbb4 100644 --- a/src/simulation_sample/case/sample_case.hpp +++ b/example/src/simulation/case/sample_case.hpp @@ -6,7 +6,7 @@ #ifndef S2E_SIMULATION_SAMPLE_CASE_SAMPLE_CASE_HPP_ #define S2E_SIMULATION_SAMPLE_CASE_SAMPLE_CASE_HPP_ -#include +#include #include "../ground_station/sample_ground_station.hpp" #include "../spacecraft/sample_spacecraft.hpp" diff --git a/src/simulation_sample/ground_station/sample_ground_station.cpp b/example/src/simulation/ground_station/sample_ground_station.cpp similarity index 100% rename from src/simulation_sample/ground_station/sample_ground_station.cpp rename to example/src/simulation/ground_station/sample_ground_station.cpp diff --git a/src/simulation_sample/ground_station/sample_ground_station.hpp b/example/src/simulation/ground_station/sample_ground_station.hpp similarity index 100% rename from src/simulation_sample/ground_station/sample_ground_station.hpp rename to example/src/simulation/ground_station/sample_ground_station.hpp diff --git a/src/simulation_sample/ground_station/sample_ground_station_components.cpp b/example/src/simulation/ground_station/sample_ground_station_components.cpp similarity index 100% rename from src/simulation_sample/ground_station/sample_ground_station_components.cpp rename to example/src/simulation/ground_station/sample_ground_station_components.cpp diff --git a/src/simulation_sample/ground_station/sample_ground_station_components.hpp b/example/src/simulation/ground_station/sample_ground_station_components.hpp similarity index 100% rename from src/simulation_sample/ground_station/sample_ground_station_components.hpp rename to example/src/simulation/ground_station/sample_ground_station_components.hpp diff --git a/src/simulation_sample/spacecraft/sample_components.cpp b/example/src/simulation/spacecraft/sample_components.cpp similarity index 100% rename from src/simulation_sample/spacecraft/sample_components.cpp rename to example/src/simulation/spacecraft/sample_components.cpp diff --git a/src/simulation_sample/spacecraft/sample_components.hpp b/example/src/simulation/spacecraft/sample_components.hpp similarity index 100% rename from src/simulation_sample/spacecraft/sample_components.hpp rename to example/src/simulation/spacecraft/sample_components.hpp diff --git a/src/simulation_sample/spacecraft/sample_port_configuration.hpp b/example/src/simulation/spacecraft/sample_port_configuration.hpp similarity index 100% rename from src/simulation_sample/spacecraft/sample_port_configuration.hpp rename to example/src/simulation/spacecraft/sample_port_configuration.hpp diff --git a/src/simulation_sample/spacecraft/sample_spacecraft.cpp b/example/src/simulation/spacecraft/sample_spacecraft.cpp similarity index 100% rename from src/simulation_sample/spacecraft/sample_spacecraft.cpp rename to example/src/simulation/spacecraft/sample_spacecraft.cpp diff --git a/src/simulation_sample/spacecraft/sample_spacecraft.hpp b/example/src/simulation/spacecraft/sample_spacecraft.hpp similarity index 95% rename from src/simulation_sample/spacecraft/sample_spacecraft.hpp rename to example/src/simulation/spacecraft/sample_spacecraft.hpp index d745e1774..3a141cc8c 100644 --- a/src/simulation_sample/spacecraft/sample_spacecraft.hpp +++ b/example/src/simulation/spacecraft/sample_spacecraft.hpp @@ -6,7 +6,7 @@ #ifndef S2E_SIMULATION_SAMPLE_SPACECRAFT_SAMPLE_SPACECRAFT_HPP_ #define S2E_SIMULATION_SAMPLE_SPACECRAFT_SAMPLE_SPACECRAFT_HPP_ -#include +#include #include "sample_components.hpp" diff --git a/scripts/Plot/common.py b/scripts/Plot/common.py index c8a3510cb..6e730e6a2 100644 --- a/scripts/Plot/common.py +++ b/scripts/Plot/common.py @@ -53,7 +53,7 @@ def read_scalar_from_csv(read_file_name, header_name): return vector def add_log_file_arguments(aparser): - aparser.add_argument('--logs-dir', type=str, help='logs directory like "../../logs"', default='../../logs') + aparser.add_argument('--logs-dir', type=str, help='logs directory like "../../example/logs"', default='../../example/logs') aparser.add_argument('--file-tag', type=str, help='log file tag like 220627_142946') return aparser