Merge pull request #460 from ut-issl/main

Merge main to develop for v6.2.1 patch update
ut-issl · Jul 18, 2023 · 15826a7 · 15826a7
2 parents 564f17b + 5cb727e
commit 15826a7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_policy(SET CMP0048 NEW)
 project(S2E
  LANGUAGES CXX
  DESCRIPTION "S2E: Spacecraft Simulation Environment"
- VERSION 6.2.0
+ VERSION 6.2.1
 )
 
 cmake_minimum_required(VERSION 3.13)

diff --git a/data/sample/initialize_files/components/ground_station_antenna.ini b/data/sample/initialize_files/components/ground_station_antenna.ini
@@ -37,7 +37,7 @@ tx_antenna_gain_model = ISOTROPIC
 tx_gain_dBi = 12.0
 
 // Antenna radiation pattern CSV file path
-tx_antenna_radiation_pattern_file = .../../data/sample/initialize_files/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
+tx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
 // General information of the CSV file
 tx_length_theta = 360
 tx_length_phi = 181
@@ -65,7 +65,7 @@ rx_antenna_gain_model = ISOTROPIC
 rx_gain_dBi = 43.27
 
 // Antenna radiation pattern CSV file path
-rx_antenna_radiation_pattern_file = ../../data/sample/initialize_files/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
+rx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
 // General information of the CSV file
 rx_length_theta = 360
 rx_length_phi = 181

diff --git a/data/sample/initialize_files/components/reaction_wheel.ini b/data/sample/initialize_files/components/reaction_wheel.ini
@@ -52,8 +52,8 @@ initial_angular_velocity_rad_s = 0.0
 //Parameters for calculate RW jitter
 jitter_calculation = DISABLE
 jitter_logging = DISABLE
-radial_force_harmonics_coefficient_file = ../../data/sample/initialize_files/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv
-radial_torque_harmonics_coefficient_file = ../../data/sample/initialize_files/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv
+radial_force_harmonics_coefficient_file = INI_FILE_DIR_FROM_EXE/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv
+radial_torque_harmonics_coefficient_file = INI_FILE_DIR_FROM_EXE/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv
 harmonics_degree = 12
 considers_structural_resonance = DISABLE
 structural_resonance_frequency_Hz = 585.0 //[Hz]

diff --git a/data/sample/initialize_files/components/spacecraft_antenna.ini b/data/sample/initialize_files/components/spacecraft_antenna.ini
@@ -37,7 +37,7 @@ tx_antenna_gain_model = RADIATION_PATTERN_CSV
 tx_gain_dBi = 8.0
 
 // Antenna radiation pattern CSV file path
-tx_antenna_radiation_pattern_file = ../../data/sample/initialize_files/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
+tx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
 // General information of the CSV file
 tx_length_theta = 360
 tx_length_phi = 181
@@ -65,7 +65,7 @@ rx_antenna_gain_model = RADIATION_PATTERN_CSV
 rx_gain_dBi = 43.27
 
 // Antenna radiation pattern CSV file path
-rx_antenna_radiation_pattern_file = ../../data/sample/initialize_files/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
+rx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
 // General information of the CSV file
 rx_length_theta = 360
 rx_length_phi = 181

diff --git a/src/dynamics/orbit/initialize_orbit.cpp b/src/dynamics/orbit/initialize_orbit.cpp
@@ -136,13 +136,7 @@ libra::Vector<6> InitializePosVel(std::string initialize_file, double current_ti
  kepler_orbit.CalcOrbit(current_time_jd);
  position_i_m = kepler_orbit.GetPosition_i_m();
  velocity_i_m_s = kepler_orbit.GetVelocity_i_m_s();
- } else if (initialize_mode == OrbitInitializeMode::kInertialPositionAndVelocity) {
- conf.ReadVector<3>(section_, "initial_position_i_m", position_i_m);
- conf.ReadVector<3>(section_, "initial_velocity_i_m_s", velocity_i_m_s);
  } else {
- std::cerr << "WARNINGS: orbit initialize mode is not defined!" << std::endl;
- std::cerr << "The orbit is automatically initialized as default mode" << std::endl;
-
  conf.ReadVector<3>(section_, "initial_position_i_m", position_i_m);
  conf.ReadVector<3>(section_, "initial_velocity_i_m_s", velocity_i_m_s);
  }

diff --git a/src/dynamics/orbit/orbit.cpp b/src/dynamics/orbit/orbit.cpp
@@ -50,6 +50,8 @@ OrbitInitializeMode SetOrbitInitializeMode(const std::string initialize_mode) {
  } else if (initialize_mode == "ORBITAL_ELEMENTS") {
  return OrbitInitializeMode::kOrbitalElements;
  } else {
+ std::cerr << "WARNINGS: orbit initialize mode is not defined!" << std::endl;
+ std::cerr << "The orbit is automatically initialized as default mode" << std::endl;
  return OrbitInitializeMode::kDefault;
  }
 }