Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/expose arguments #135

Closed
wants to merge 2 commits into from
Closed

Feature/expose arguments #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5589958
Remove deprecated functions
soufyanR1 Dec 15, 2023
6a0dbc5
Expose arguments panelled_radiation_target
soufyanR1 Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
262 changes: 131 additions & 131 deletions ...se_numerical_simulation/expose_environment_setup/expose_aerodynamic_coefficient_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,137 +275,137 @@ namespace aerodynamic_coefficients {
//////////////// DEPRECATED /////////////////////////////////////
/////////////////////////////////////////////////////////////////

m.def("custom",
&tss::customAerodynamicCoefficientSettingsDeprecatedPy,
py::arg("force_coefficient_function"),
py::arg("reference_area"),
py::arg("independent_variable_names"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true );

m.def("constant",
py::overload_cast<const double, const Eigen::Vector3d &, const bool,
const bool>(
&tss::constantAerodynamicCoefficientSettingsDeprecated ),
py::arg("reference_area"),
py::arg("constant_force_coefficient"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true );

m.def("custom_aerodynamic_force_coefficients",
py::overload_cast<
const std::function<Eigen::Vector3d(const std::vector<double> &)>,
const double, const std::vector<ta::AerodynamicCoefficientsIndependentVariables>,
const bool, const bool>(&tss::customAerodynamicCoefficientSettingsDeprecated),
py::arg("force_coefficient_function"),
py::arg("reference_area"),
py::arg("independent_variable_names"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true );

m.def("custom_aerodynamic_force_and_moment_coefficients",
py::overload_cast<
const std::function< Eigen::Vector3d( const std::vector< double >& ) >,
const std::function< Eigen::Vector3d( const std::vector< double >& ) >,
const double,
const double,
const Eigen::Vector3d&,
const std::vector< ta::AerodynamicCoefficientsIndependentVariables >,
const bool,
const bool >(&tss::customAerodynamicCoefficientSettingsDeprecated),
py::arg("force_coefficient_function"),
py::arg("moment_coefficient_function"),
py::arg("reference_length"),
py::arg("reference_area"),
py::arg("moment_reference_point"),
py::arg("independent_variable_names"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true );


m.def("tabulated",
py::overload_cast<
const std::vector<double>,
const std::vector<Eigen::Vector3d>,
const std::vector<Eigen::Vector3d>,
const double,
const double,
const double,
const Eigen::Vector3d &,
const ta::AerodynamicCoefficientsIndependentVariables,
const bool,
const bool,
const std::shared_ptr<ti::InterpolatorSettings>>
(&tss::oneDimensionalTabulatedAerodynamicCoefficientSettingsDeprecated),
py::arg("independent_variables"),
py::arg("force_coefficients"),
py::arg("moment_coefficients"),
py::arg("reference_length"),
py::arg("reference_area"),
py::arg("lateral_reference_length"),
py::arg("moment_reference_point"),
py::arg("independent_variable_name"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true,
py::arg("interpolator_settings") = nullptr);

m.def("tabulated_force_only",
py::overload_cast<
const std::vector<double>,
const std::vector<Eigen::Vector3d>,
const double,
const ta::AerodynamicCoefficientsIndependentVariables,
const bool,
const bool,
const std::shared_ptr<ti::InterpolatorSettings>>
(&tss::oneDimensionalTabulatedAerodynamicCoefficientSettingsDeprecated),
py::arg("independent_variables"),
py::arg("force_coefficients"),
py::arg("reference_area"),
py::arg("independent_variable_name"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true,
py::arg("interpolator_settings") = nullptr);

m.def("tabulated_force_only_from_files",
py::overload_cast<
const std::map< int, std::string >,
const double,
const std::vector< ta::AerodynamicCoefficientsIndependentVariables >,
const bool,
const bool,
const std::shared_ptr< ti::InterpolatorSettings > >
(&tss::readTabulatedAerodynamicCoefficientsFromFilesDeprecated),
py::arg("force_coefficient_files"),
py::arg("reference_area"),
py::arg("independent_variable_names"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true,
py::arg("interpolator_settings") = nullptr );

m.def("tabulated_from_files",
py::overload_cast<
const std::map< int, std::string >,
const std::map< int, std::string >,
const double,
const double,
const double,
const Eigen::Vector3d &,
const std::vector< ta::AerodynamicCoefficientsIndependentVariables >,
const bool,
const bool,
const std::shared_ptr< ti::InterpolatorSettings > >
(&tss::readTabulatedAerodynamicCoefficientsFromFilesDeprecated),
py::arg("force_coefficient_files"),
py::arg("moment_coefficient_files"),
py::arg("reference_length"),
py::arg("reference_area"),
py::arg("lateral_reference_length"),
py::arg("moment_reference_point"),
py::arg("independent_variable_names"),
py::arg("are_coefficients_in_aerodynamic_frame") = true,
py::arg("are_coefficients_in_negative_axis_direction") = true,
py::arg("interpolator_settings") = nullptr );
// m.def("custom",
// &tss::customAerodynamicCoefficientSettingsDeprecatedPy,
// py::arg("force_coefficient_function"),
// py::arg("reference_area"),
// py::arg("independent_variable_names"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true );

// m.def("constant",
// py::overload_cast<const double, const Eigen::Vector3d &, const bool,
// const bool>(
// &tss::constantAerodynamicCoefficientSettingsDeprecated ),
// py::arg("reference_area"),
// py::arg("constant_force_coefficient"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true );

// m.def("custom_aerodynamic_force_coefficients",
// py::overload_cast<
// const std::function<Eigen::Vector3d(const std::vector<double> &)>,
// const double, const std::vector<ta::AerodynamicCoefficientsIndependentVariables>,
// const bool, const bool>(&tss::customAerodynamicCoefficientSettingsDeprecated),
// py::arg("force_coefficient_function"),
// py::arg("reference_area"),
// py::arg("independent_variable_names"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true );

// m.def("custom_aerodynamic_force_and_moment_coefficients",
// py::overload_cast<
// const std::function< Eigen::Vector3d( const std::vector< double >& ) >,
// const std::function< Eigen::Vector3d( const std::vector< double >& ) >,
// const double,
// const double,
// const Eigen::Vector3d&,
// const std::vector< ta::AerodynamicCoefficientsIndependentVariables >,
// const bool,
// const bool >(&tss::customAerodynamicCoefficientSettingsDeprecated),
// py::arg("force_coefficient_function"),
// py::arg("moment_coefficient_function"),
// py::arg("reference_length"),
// py::arg("reference_area"),
// py::arg("moment_reference_point"),
// py::arg("independent_variable_names"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true );


// m.def("tabulated",
// py::overload_cast<
// const std::vector<double>,
// const std::vector<Eigen::Vector3d>,
// const std::vector<Eigen::Vector3d>,
// const double,
// const double,
// const double,
// const Eigen::Vector3d &,
// const ta::AerodynamicCoefficientsIndependentVariables,
// const bool,
// const bool,
// const std::shared_ptr<ti::InterpolatorSettings>>
// (&tss::oneDimensionalTabulatedAerodynamicCoefficientSettingsDeprecated),
// py::arg("independent_variables"),
// py::arg("force_coefficients"),
// py::arg("moment_coefficients"),
// py::arg("reference_length"),
// py::arg("reference_area"),
// py::arg("lateral_reference_length"),
// py::arg("moment_reference_point"),
// py::arg("independent_variable_name"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true,
// py::arg("interpolator_settings") = nullptr);

// m.def("tabulated_force_only",
// py::overload_cast<
// const std::vector<double>,
// const std::vector<Eigen::Vector3d>,
// const double,
// const ta::AerodynamicCoefficientsIndependentVariables,
// const bool,
// const bool,
// const std::shared_ptr<ti::InterpolatorSettings>>
// (&tss::oneDimensionalTabulatedAerodynamicCoefficientSettingsDeprecated),
// py::arg("independent_variables"),
// py::arg("force_coefficients"),
// py::arg("reference_area"),
// py::arg("independent_variable_name"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true,
// py::arg("interpolator_settings") = nullptr);

// m.def("tabulated_force_only_from_files",
// py::overload_cast<
// const std::map< int, std::string >,
// const double,
// const std::vector< ta::AerodynamicCoefficientsIndependentVariables >,
// const bool,
// const bool,
// const std::shared_ptr< ti::InterpolatorSettings > >
// (&tss::readTabulatedAerodynamicCoefficientsFromFilesDeprecated),
// py::arg("force_coefficient_files"),
// py::arg("reference_area"),
// py::arg("independent_variable_names"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true,
// py::arg("interpolator_settings") = nullptr );

// m.def("tabulated_from_files",
// py::overload_cast<
// const std::map< int, std::string >,
// const std::map< int, std::string >,
// const double,
// const double,
// const double,
// const Eigen::Vector3d &,
// const std::vector< ta::AerodynamicCoefficientsIndependentVariables >,
// const bool,
// const bool,
// const std::shared_ptr< ti::InterpolatorSettings > >
// (&tss::readTabulatedAerodynamicCoefficientsFromFilesDeprecated),
// py::arg("force_coefficient_files"),
// py::arg("moment_coefficient_files"),
// py::arg("reference_length"),
// py::arg("reference_area"),
// py::arg("lateral_reference_length"),
// py::arg("moment_reference_point"),
// py::arg("independent_variable_names"),
// py::arg("are_coefficients_in_aerodynamic_frame") = true,
// py::arg("are_coefficients_in_negative_axis_direction") = true,
// py::arg("interpolator_settings") = nullptr );

}

Expand Down
1 change: 1 addition & 0 deletions .../expose_numerical_simulation/expose_environment_setup/expose_radiation_pressure_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ namespace radiation_pressure {

m.def("panelled_radiation_target",
&tss::paneledRadiationPressureTargetModelSettingsWithOccultationMap,
py::arg("source_to_target_occulting_bodies") = std::map<std::string, std::vector<std::string>>( ),
get_docstring("panelled_radiation_target").c_str()
);

Expand Down
Loading