Commit 71ef9a4e authored by Nicolas Van der Noot's avatar Nicolas Van der Noot
Browse files

Mbs added to dopri5 fields

parent 24d6d0bf
......@@ -39,8 +39,8 @@ MbsDirdyn* mbs_new_dirdyn_aux(MbsData* mbs_data, MbsAux* mbs_aux){
MbsDirdyn *dirdyn;
MbsDirdynOptions* opts;
DirdynDopri5 *dopr;
DirdynOptDopri5 *dopr_opt;
MbsDirdynDopri5 *dopr;
MbsDirdynOptDopri5 *dopr_opt;
// Initialize the direct dynamic structure
dirdyn = (MbsDirdyn*) malloc(sizeof(MbsDirdyn));
......@@ -63,7 +63,7 @@ MbsDirdyn* mbs_new_dirdyn_aux(MbsData* mbs_data, MbsAux* mbs_aux){
opts->accelred = 0;
// adaptive time step integrator
dopr_opt = (DirdynOptDopri5*) malloc(sizeof(DirdynOptDopri5));
dopr_opt = (MbsDirdynOptDopri5*) malloc(sizeof(MbsDirdynOptDopri5));
dopr_opt->flag_use = 0;
dopr_opt->flag_waypoint = 0;
dopr_opt->flag_solout_wp = 0;
......@@ -81,7 +81,7 @@ MbsDirdyn* mbs_new_dirdyn_aux(MbsData* mbs_data, MbsAux* mbs_aux){
dirdyn->savePeriodCounter = 0;
// adaptive time step
dopr = (DirdynDopri5*) malloc(sizeof(DirdynDopri5));
dopr = (MbsDirdynDopri5*) malloc(sizeof(MbsDirdynDopri5));
dopr->flag_save = 0;
dirdyn->dopri5 = dopr;
......@@ -272,7 +272,7 @@ void mbs_dirdyn_loop(MbsDirdyn* dd, MbsData* mbs_data){
FILE *animFile;
FILE *fileout_dopri5;
DirdynOptDopri5 *dopr_opt;
MbsDirdynOptDopri5 *dopr_opt;
int i;
double **dopri5_alloc_tab;
double cur_t0, cur_tf;
......
......@@ -22,7 +22,7 @@
/**
* Dopri5 structure for dirdyn options
*/
typedef struct DirdynOptDopri5
typedef struct MbsDirdynOptDopri5
{
int flag_use; ///< 1 to use dopri5 (adaptive time step), 0 to use runge kutta 4 (fixed time step)
int flag_waypoint; ///< 1 to use waypoints, 0 otherwise
......@@ -36,7 +36,7 @@ typedef struct DirdynOptDopri5
double dt_max; ///< maximal time step [s]
double delta_t_wp; ///< time interval between two waypoints [s]
} DirdynOptDopri5;
} MbsDirdynOptDopri5;
/**
* Structure defining the option of a direct dynamic
......@@ -83,14 +83,14 @@ typedef struct MbsDirdynOptions
int accelred; ///< 1 to use accelred, 0 otherwise
DirdynOptDopri5 *dopri5; ///< Dopri5 structure for dirdyn options
MbsDirdynOptDopri5 *dopri5; ///< Dopri5 structure for dirdyn options
} MbsDirdynOptions;
/**
* Dopri5 structure for dirdyn
*/
typedef struct DirdynDopri5
typedef struct MbsDirdynDopri5
{
int flag_save; ///< 1 if first dydt save done, 0 otherwise
......@@ -98,7 +98,7 @@ typedef struct DirdynDopri5
double *dydt_save; ///< save dydt of the last time step
} DirdynDopri5;
} MbsDirdynDopri5;
/**
* General structure of the direct dynamic module
......@@ -131,7 +131,7 @@ typedef struct MbsDirdyn
/** counter for checking wheter results must be saved */
int savePeriodCounter;
DirdynDopri5 *dopri5; ///< Dopri5 structure for dirdyn
MbsDirdynDopri5 *dopri5; ///< Dopri5 structure for dirdyn
} MbsDirdyn;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment