diff options
Diffstat (limited to '2.3-1/src/c/differential_calculus')
| -rw-r--r-- | 2.3-1/src/c/differential_calculus/includes/ode.h | 25 | ||||
| -rw-r--r-- | 2.3-1/src/c/differential_calculus/interfaces/int_ode.h | 25 | ||||
| -rw-r--r-- | 2.3-1/src/c/differential_calculus/ode/dodea.c | 49 | ||||
| -rw-r--r-- | 2.3-1/src/c/differential_calculus/ode/doded.c | 39 |
4 files changed, 75 insertions, 63 deletions
diff --git a/2.3-1/src/c/differential_calculus/includes/ode.h b/2.3-1/src/c/differential_calculus/includes/ode.h index f08909ce..0a870201 100644 --- a/2.3-1/src/c/differential_calculus/includes/ode.h +++ b/2.3-1/src/c/differential_calculus/includes/ode.h @@ -1,14 +1,15 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + #ifndef __ODE_H__ #define __ODE_H__ @@ -16,8 +17,8 @@ double dodes(double initial_value, double start_time, double end_time, \ char *ode_function, double nequs, double eps_abs, double eps_rel, \ double step_size); -void doded(double *initial_value, double start_time, double end_time, \ +void dodea(double *initial_value, double start_time, double end_time, \ char *ode_function, double nequs, double eps_abs, double eps_rel, \ - double step_size, double *out); + double step_size, int *params, double *out); #endif /*__ODE_H__*/
\ No newline at end of file diff --git a/2.3-1/src/c/differential_calculus/interfaces/int_ode.h b/2.3-1/src/c/differential_calculus/interfaces/int_ode.h index a27acbad..1cb64497 100644 --- a/2.3-1/src/c/differential_calculus/interfaces/int_ode.h +++ b/2.3-1/src/c/differential_calculus/interfaces/int_ode.h @@ -1,13 +1,14 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ #ifndef __INT_ODE_H__ #define __INT_ODE_H__ @@ -19,8 +20,8 @@ extern "C" { #define d0d0d0g2oded0(in1, in2, in3, in4) dodes(in1, in2, in3, in4, 1, 1.0e-2,\ 1.0e-2, 1.0e-6) -#define d2d0d0g2oded2(in1, size1, in2, in3, func_name, strsize, out) doded(in1, in2, in3, func_name \ - 1, 1.0e-2, 1.0e-2, 1.0e-6, out) +#define d2d0d0f0oded2(in1, size1, in2, in3, func_name, out) dodea(in1, in2, in3, func_name, \ + size1[1], 1.0e-2, 1.0e-2, 1.0e-6, size1, out) #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/differential_calculus/ode/dodea.c b/2.3-1/src/c/differential_calculus/ode/dodea.c new file mode 100644 index 00000000..ff3cbdec --- /dev/null +++ b/2.3-1/src/c/differential_calculus/ode/dodea.c @@ -0,0 +1,49 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +//Function for solving ODEs using GSL library + +#include "ode.h" +#include "types.h" +#include <gsl/gsl_errno.h> +#include <gsl/gsl_matrix.h> +#include <gsl/gsl_odeiv2.h> + + +void dodea(double *initial_value, double start_time, double end_time, \ + char *ode_function, double nequs, double eps_abs, double eps_rel, \ + double step_size, int *params, double *out) +{ + double t = start_time; + //Initialise output to initial state + int counter = 0; + for (counter = 0; counter<nequs;counter++) + { + out[counter] = initial_value[counter]; + } + + //Setup ODE related parameters + gsl_odeiv2_system sys = {ode_function, NULL, 2, params}; + + gsl_odeiv2_step *s = gsl_odeiv2_step_alloc (gsl_odeiv2_step_rkf45, nequs); + gsl_odeiv2_control *c = gsl_odeiv2_control_y_new (eps_abs, eps_rel); + gsl_odeiv2_evolve *e = gsl_odeiv2_evolve_alloc (nequs); + + while(t < end_time) + { + gsl_odeiv2_evolve_apply_fixed_step (e, c, s, &sys, &t, step_size, out); + } + + gsl_odeiv2_evolve_free (e); + gsl_odeiv2_control_free (c); + gsl_odeiv2_step_free (s); +} diff --git a/2.3-1/src/c/differential_calculus/ode/doded.c b/2.3-1/src/c/differential_calculus/ode/doded.c deleted file mode 100644 index b544c422..00000000 --- a/2.3-1/src/c/differential_calculus/ode/doded.c +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in - -#include "ode.h" -#include "types.h" -#include <gsl/gsl_errno.h> -#include <gsl/gsl_matrix.h> -#include <gsl/gsl_odeiv2.h> - - -void doded(double *initial_value, double start_time, double end_time, \ - char *ode_function, double nequs, double eps_abs, double eps_rel, \ - double step_size, double *out) -{ - double t = start_time; - //Setup ODE related parameters - gsl_odeiv2_system sys = {ode_function, NULL, 2, NULL}; - - gsl_odeiv2_step *s = gsl_odeiv2_step_alloc (gsl_odeiv2_step_rkf45, nequs); - gsl_odeiv2_control *c = gsl_odeiv2_control_y_new (eps_abs, eps_rel); - gsl_odeiv2_evolve *e = gsl_odeiv2_evolve_alloc (nequs); - - while(t < end_time) - { - gsl_odeiv2_evolve_apply_fixed_step (e, c, s, &sys, &t, step_size, &out); - } - - gsl_odeiv2_evolve_free (e); - gsl_odeiv2_control_free (c); - gsl_odeiv2_step_free (s); -} |