Comments in SAIntegrator.hh. #1070

This commit is contained in:
Penn, John M 047828115 2020-11-04 21:14:58 -06:00
parent d109dfe949
commit 3bffe16e2c

View File

@ -3,8 +3,8 @@ namespace SA {
class Integrator { class Integrator {
protected: protected:
double X_in; // Independent Variable In double X_in; // Independent Variable In
double X_out; // Independent Variable Out double X_out; // Independent Variable Out
double default_h; // Default step-size double default_h; // Default step-size
void* user_data; // User data void* user_data; // User data
public: public:
@ -21,13 +21,13 @@ namespace SA {
class FirstOrderODEIntegrator : public Integrator { class FirstOrderODEIntegrator : public Integrator {
protected: protected:
unsigned int state_size; // size of the state vector. unsigned int state_size; // Size of the state vector.
double* inState; double* inState; // State vector prior to integration step.
double* outState; double* outState; // State vector result of integration step.
double** inVars; double** inVars; // Array of pointers to the variables whose values comprise the input state vector.
double** outVars; double** outVars; // Array of pointers to the variables to which the output state vector values are to be disseminated.
DerivsFunc derivs_func; DerivsFunc derivs_func; // Pointer to the function that calculates the derivatives to be integrated.
double last_h; // What was the last step-size? For undo_step(). double last_h; // What was the last step-size? For undo_step().
public: public:
FirstOrderODEIntegrator( double h, int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata); FirstOrderODEIntegrator( double h, int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata);
@ -51,8 +51,6 @@ namespace SA {
virtual void variable_step( double h); virtual void variable_step( double h);
void add_Rootfinder( RootFinder* root_finder, RootErrorFunc rfunc); void add_Rootfinder( RootFinder* root_finder, RootErrorFunc rfunc);
void step(); void step();
// protected:
// void advanceIndyVar( double h );
private: private:
void find_roots(double h, unsigned int depth); void find_roots(double h, unsigned int depth);
}; };