ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-21 01:31:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add load_from_ostate() function to SA::FirstOrderODEIntegrator. #1061

Browse Source
This commit is contained in:
Penn, John M 047828115 2020-10-12 12:48:48 -05:00
parent 50039dd8e9
commit da4888a1b7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/trick_utils/SAIntegrator/include/SAIntegrator.hh
View File

@ -36,6 +36,7 @@ namespace SA {
virtual void undo_step();
void load();
void unload();
void load_from_ostate();
void set_in_vars( double* in_vars[]);
void set_out_vars( double* out_vars[]);
};
@ -126,7 +127,6 @@ namespace SA {
void unload();
};
// AdamsBashforthMoulton 4
// class ABMIntegrator : public FirstOrderODEIntegrator {
// protected:
// double ** deriv_history;

11
trick_source/trick_utils/SAIntegrator/src/SAIntegrator.cpp
View File

@ -22,7 +22,7 @@ SA::FirstOrderODEIntegrator::~FirstOrderODEIntegrator() {
void SA::FirstOrderODEIntegrator::load() {
reset = false;
if (orig_vars != NULL) {
for (int i=0 ; i<state_size; i++ ) {
for (unsigned int i=0 ; i<state_size; i++ ) {
istate[i] = *(orig_vars[i]);
}
} else {
@ -31,13 +31,18 @@ void SA::FirstOrderODEIntegrator::load() {
}
void SA::FirstOrderODEIntegrator::unload() {
if (dest_vars != NULL) {
for (int i=0 ; i<state_size; i++ ) {
for (unsigned int i=0 ; i<state_size; i++ ) {
*(dest_vars[i]) = ostate[i];
}
} else {
std::cerr << "Error: SA::FirstOrderODEIntegrator::load(). dest_vars is not set." << std::endl;
}
}
void SA::FirstOrderODEIntegrator::load_from_ostate(){
for (unsigned int i=0 ; i<state_size; i++ ) {
istate[i] = ostate[i];
}
}
void SA::FirstOrderODEIntegrator::set_in_vars( double* in_vars[]){
orig_vars = in_vars;
}
@ -46,7 +51,7 @@ void SA::FirstOrderODEIntegrator::set_out_vars( double* out_vars[]){
}
void SA::FirstOrderODEIntegrator::undo_step() {
if (!reset) { // If we've not already reset the integrator, then reset it.
for (int i=0 ; i<state_size; i++ ) {
for (unsigned int i=0 ; i<state_size; i++ ) {
*(orig_vars[i]) = istate[i]; // Copy istate values back to the state variables from whence they came.
}
indyVar -= last_h; // Undo the last step.