Skip to content

Commit

Permalink
Merge pull request #289 from ut-issl/develop
Browse files Browse the repository at this point in the history
Merge develop into main for v5.2.0 release
  • Loading branch information
200km authored Dec 30, 2022
2 parents 97fd87a + 56344b8 commit f2b54a0
Show file tree
Hide file tree
Showing 333 changed files with 11,415 additions and 3,040 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:
ver=$(grep python_version ./Pipfile | sed -e 's/^python_version\s=\s"\(.*\)"$/\1/')
echo "version=$ver" >> "$GITHUB_OUTPUT"
- uses: actions/setup-python@v4.3.0
- uses: actions/setup-python@v4.4.0
with:
python-version: ${{ steps.python-version.outputs.version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
ver=$(grep python_version ./Pipfile | sed -e 's/^python_version\s=\s"\(.*\)"$/\1/')
echo "version=${ver}" >> "$GITHUB_OUTPUT"
- uses: actions/setup-python@v4.3.0
- uses: actions/setup-python@v4.4.0
with:
python-version: ${{ steps.python-version.outputs.version }}

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_policy(SET CMP0048 NEW)
project(S2E
LANGUAGES CXX
DESCRIPTION "S2E: Spacecraft Simulation Environment"
VERSION 5.1.0
VERSION 5.2.0
)

cmake_minimum_required(VERSION 3.13)
Expand Down
2 changes: 1 addition & 1 deletion ExtLibraries/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(ExtLibraries)

cmake_minimum_required(VERSION 3.13)
cmake_minimum_required(VERSION 3.18)

# build config
option(BUILD_64BIT "Build 64bit" OFF)
Expand Down
4 changes: 2 additions & 2 deletions ExtLibraries/cspice/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(cspice)

cmake_minimum_required(VERSION 3.13)
cmake_minimum_required(VERSION 3.18)

include(ExternalProject)
include(FetchContent)
Expand Down Expand Up @@ -29,7 +29,7 @@ message("URL" ${CSPICE_URL})
ExternalProject_Add(cspice
URL ${CSPICE_URL}
URL_HASH SHA256=${CSPICE_SHA256}
DOWNLOAD_EXTRACT_TIMESTAMP false
# DOWNLOAD_EXTRACT_TIMESTAMP false # prepare for CMake 3.24
SOURCE_DIR "cspice"
CONFIGURE_COMMAND ""
BUILD_IN_SOURCE true
Expand Down
2 changes: 1 addition & 1 deletion ExtLibraries/nrlmsise00/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(nrlmsise00)

cmake_minimum_required(VERSION 3.13)
cmake_minimum_required(VERSION 3.18)

include(ExternalProject)
include(FetchContent)
Expand Down
21 changes: 14 additions & 7 deletions data/SampleSat/ini/SampleSat.ini
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ logging = ENABLE
// ENCKE : Encke orbit propagation with disturbances and thruster maneuver
propagate_mode = SGP4

// Orbit initialize mode for RK4, KEPLER, and ENCKE
// DEFAULT : Use default initialize method (RK4 and ENCKE use pos/vel, KEPLER uses init_mode_kepler)
// POSITION_VELOCITY_I : Initialize with position and velocity in the inertial frame
// ORBITAL_ELEMENTS : Initialize with orbital elements
initialize_mode = ORBITAL_ELEMENTS

// Settings for SGP4 ///////////////////////////////////////////////
// TLE
// Example: ISS
Expand All @@ -65,16 +71,14 @@ wgs = 2 // 0: wgs72old, 1: wgs72, 2: wgs84
//////////////////////////////////////////////////////////////////////////

// Initial value definition for RK4 //////////////////////////////////////
// * The coordinate system is defined in PlanetSelect.ini
// * For KEPLER or ENCKE method, orbit with i = 0 cannot be handled now.
// Users need to set with small inclination. (This issue will be solved.)
// * The coordinate system is defined at [PLANET_SELECTION] in SampleSimBase.ini
// Initial satellite position[m]
// Example: ISS
init_position(0) = -2111769.7723711144
init_position(1) = -5360353.2254375768
init_position(2) = 3596181.6497774957

//initial satellite velocity[m/s]
// Initial satellite velocity[m/s]
// Example: ISS
init_velocity(0) = 4200.4344740455268
init_velocity(1) = -4637.540129059361
Expand All @@ -92,7 +96,7 @@ relative_dynamics_model_type = 0
// 0: HCW
stm_model_type = 0
// Initial satellite position relative to the reference satellite in LVLH frame[m]
// The coordinate system is defined in PlanetSelect.ini
// * The coordinate system is defined at [PLANET_SELECTION] in SampleSimBase.ini
init_relative_position_lvlh(0) = 0.0
init_relative_position_lvlh(1) = 100.0
init_relative_position_lvlh(2) = 0.0
Expand All @@ -106,10 +110,12 @@ reference_sat_id = 1


// Information used for orbital propagation by the Kepler Motion ///////////
// initialize mode for kepler motion
// initialize mode for kepler motion.
// WARNINGS: init_mode_kepler will be integrated with initialize_mode mentioned above
// The initialize_mode has higher priority than init_mode_kepler
// INIT_POSVEL : initialize with position and velocity defined for RK4
// INIT_OE : initialize with the following orbital elements
init_mode_kepler = INIT_POSVEL
init_mode_kepler = INIT_OE
// Orbital Elements for INIT_OE
semi_major_axis_m = 6794500.0
eccentricity = 0.0015
Expand Down Expand Up @@ -153,3 +159,4 @@ mag_torquer_file = ../../data/SampleSat/ini/component/magtorquer.ini
rw_file = ../../data/SampleSat/ini/component/RW.ini
thruster_file = ../../data/SampleSat/ini/component/Thruster.ini
force_generator_file = ../../data/SampleSat/ini/component/ForceGenerator.ini
antenna_file = ../../data/SampleSat/ini/component/ANT.ini
138 changes: 95 additions & 43 deletions data/SampleSat/ini/component/ANT.ini
Original file line number Diff line number Diff line change
@@ -1,94 +1,146 @@
[ANT1]
//衛星搭載アンテナの例
// Example of antenna on spacecraft

//機体座標系(B)→コンポ座標系(C)変換Quaternion,(虚部,実部の順),コンポ座標系は視線方向がX
//今はSTTと同じ方向の適当な値になってる
// Quaternion converts body-fixed frame to component frame
q_b2c(0) = 0
q_b2c(1) = 0
q_b2c(2) = 0
q_b2c(3) = 1

//送信用かのフラグ
// Flag for transmitter or not
is_transmitter = 1

//受信用かのフラグ
is_receiver = 0
// Flag for receiver or not
is_receiver = 1

//周波数[MHz]
// frequency [MHz]
frequency = 8200.0

// ↓送信用の場合に設定するパラメータ
//RF出力[W]
// Parameters for transmitter
// RF output power [W]
tx_output = 1.0

//送信ゲイン[dBi]
tx_gain = 8.0

//給電損失[dB]
// Feeder loss [dB]
tx_loss_feeder = -1.5

//ポインティング損失[dB]
// Pointing loss [dB]
tx_loss_pointing = 0.0
// ↑

//↓受信用の場合に設定するパラメータ(つまり今の値は適当)
//受信ゲイン[dBi]
rx_gain = 43.27
// Antenna gain model
// ISOTROPIC: Ideal isotropic antenna
// RADIATION_PATTERN_CSV: Radiation pattern obtained by CSV files
tx_antenna_gain_model = RADIATION_PATTERN_CSV

// Gain for ISOTROPIC mode [dBi]
// Generally, it is zero but users can set any value for ideal analysis
tx_gain = 8.0

//給電損失[dB]
// Antenna radiation pattern CSV file path
tx_antenna_radiation_pattern_file = ../../data/SampleSat/ini/component/AntennaRadiationPatternCsv/SampleAntennaRadiationPattern.csv
// General information of the CSV file
tx_length_theta = 360
tx_length_phi = 181
tx_theta_max_rad = 6.28
tx_phi_max_rad = 3.14


// Parameters for receiver
// Feeder loss [dB]
rx_loss_feeder = -0.5

//ポインティング損失[dB]
// Pointing loss [dB]
rx_loss_pointing = -0.5

//システム雑音温度[K]
// System noise temperature [K]
rx_system_noise_temperature = 230
// ↑

// Antenna gain model
// ISOTROPIC: Ideal isotropic antenna
// RADIATION_PATTERN_CSV: Radiation pattern obtained by CSV files
rx_antenna_gain_model = RADIATION_PATTERN_CSV

// Gain for ISOTROPIC mode [dBi]
// Generally, it is zero but users can set any value for ideal analysis
rx_gain = 43.27

// Antenna radiation pattern CSV file path
rx_antenna_radiation_pattern_file = ../../data/SampleSat/ini/component/AntennaRadiationPatternCsv/SampleAntennaRadiationPattern.csv
// General information of the CSV file
rx_length_theta = 360
rx_length_phi = 181
rx_theta_max_rad = 6.28
rx_phi_max_rad = 3.14


[ANT2]
//地上局アンテナの例
// Example of antenna on ground station

//機体座標系(B)→コンポ座標系(C)変換Quaternion,(虚部,実部の順),コンポ座標系は視線方向がX
//地上局アンテナではこの値を使うことはないので適当
// Quaternion converts body-fixed frame to component frame
q_b2c(0) = 0
q_b2c(1) = 0
q_b2c(2) = 0
q_b2c(3) = 1

//送信用かのフラグ
// Flag for transmitter or not
is_transmitter = 0

//受信用かのフラグ
// Flag for receiver or not
is_receiver = 1

//周波数[MHz]
// frequency [MHz]
frequency = 8200.0

// ↓送信用の場合に設定するパラメータ(つまり今の値は適当)
//RF出力[W]
// Parameters for transmitter
// RF output power [W]
tx_output = 1.0

//送信ゲイン[dBi]
tx_gain = 12.0

//給電損失[dB]
// Feeder loss [dB]
tx_loss_feeder = -1.5

//ポインティング損失[dB]
// Pointing loss [dB]
tx_loss_pointing = 0.0
// ↑

//↓受信用の場合に設定するパラメータ
//受信ゲイン[dBi]
rx_gain = 43.27
// Antenna gain model
// ISOTROPIC: Ideal isotropic antenna
// RADIATION_PATTERN_CSV: Radiation pattern obtained by CSV files
tx_antenna_gain_model = RADIATION_PATTERN_CSV

// Gain for ISOTROPIC mode [dBi]
// Generally, it is zero but users can set any value for ideal analysis
tx_gain = 12.0

// Antenna radiation pattern CSV file path
tx_antenna_radiation_pattern_file = ../../data/SampleSat/ini/component/AntennaRadiationPatternCsv/SampleAntennaRadiationPattern.csv
// General information of the CSV file
tx_length_theta = 360
tx_length_phi = 181
tx_theta_max_rad = 6.28
tx_phi_max_rad = 3.14

//給電損失[dB]

// Parameters for receiver
// Feeder loss [dB]
rx_loss_feeder = -0.5

//ポインティング損失[dB]
// Pointing loss [dB]
rx_loss_pointing = -0.5

//システム雑音温度[K]
// System noise temperature [K]
rx_system_noise_temperature = 230
// ↑

// Antenna gain model
// ISOTROPIC: Ideal isotropic antenna
// RADIATION_PATTERN_CSV: Radiation pattern obtained by CSV files
rx_antenna_gain_model = RADIATION_PATTERN_CSV

// Gain for ISOTROPIC mode [dBi]
// Generally, it is zero but users can set any value for ideal analysis
rx_gain = 43.27

// Antenna radiation pattern CSV file path
rx_antenna_radiation_pattern_file = ../../data/SampleSat/ini/component/AntennaRadiationPatternCsv/SampleAntennaRadiationPattern.csv
// General information of the CSV file
rx_length_theta = 360
rx_length_phi = 181
rx_theta_max_rad = 6.28
rx_phi_max_rad = 3.14
Loading

0 comments on commit f2b54a0

Please sign in to comment.