From ffd37d6aa9ef210a0587c6a74dbbea3dd8070e99 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 28 Sep 2013 18:15:46 +0200 Subject: [PATCH] Rename constinterp.h to constinterp.h.f. It was confusing tools and developers. Change-Id: Ic9afe64104e64eab22c83c628b870b88aec8cf04 --- .../interpolation/src/fortran/constinterp.h | 16 ---------------- .../interpolation/src/fortran/constinterp.h.f | 16 ++++++++++++++++ .../modules/interpolation/src/fortran/somespline.f | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 scilab/modules/interpolation/src/fortran/constinterp.h create mode 100644 scilab/modules/interpolation/src/fortran/constinterp.h.f diff --git a/scilab/modules/interpolation/src/fortran/constinterp.h b/scilab/modules/interpolation/src/fortran/constinterp.h deleted file mode 100644 index aeffd74..0000000 --- a/scilab/modules/interpolation/src/fortran/constinterp.h +++ /dev/null @@ -1,16 +0,0 @@ -* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -* Copyright (C) INRIA -* -* 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.1-en.txt - -* various constant used in somespline.f - integer NOT_A_KNOT, NATURAL, CLAMPED, PERIODIC - parameter (NOT_A_KNOT=0, NATURAL=1, CLAMPED=2, PERIODIC=3) - integer FAST, FAST_PERIODIC, MONOTONE, BY_ZERO - parameter (FAST=4, FAST_PERIODIC=5, MONOTONE=6, BY_ZERO=7) - integer C0, LINEAR, BY_NAN - parameter (C0=8, LINEAR=9, BY_NAN=10) diff --git a/scilab/modules/interpolation/src/fortran/constinterp.h.f b/scilab/modules/interpolation/src/fortran/constinterp.h.f new file mode 100644 index 0000000..aeffd74 --- /dev/null +++ b/scilab/modules/interpolation/src/fortran/constinterp.h.f @@ -0,0 +1,16 @@ +* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +* Copyright (C) INRIA +* +* 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.1-en.txt + +* various constant used in somespline.f + integer NOT_A_KNOT, NATURAL, CLAMPED, PERIODIC + parameter (NOT_A_KNOT=0, NATURAL=1, CLAMPED=2, PERIODIC=3) + integer FAST, FAST_PERIODIC, MONOTONE, BY_ZERO + parameter (FAST=4, FAST_PERIODIC=5, MONOTONE=6, BY_ZERO=7) + integer C0, LINEAR, BY_NAN + parameter (C0=8, LINEAR=9, BY_NAN=10) diff --git a/scilab/modules/interpolation/src/fortran/somespline.f b/scilab/modules/interpolation/src/fortran/somespline.f index d0965fb..484ce3a 100644 --- a/scilab/modules/interpolation/src/fortran/somespline.f +++ b/scilab/modules/interpolation/src/fortran/somespline.f @@ -54,7 +54,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt double precision x(n), y(n), d(n), A_d(n), A_sd(n-1), qdy(n-1), $ lll(n-1) - include 'constinterp.h' + include 'constinterp.h.f' integer i double precision r @@ -285,7 +285,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt double precision t(m), st(m), dst(m), d2st(m), d3st(m), $ x(n), y(n), d(n) - include 'constinterp.h' + include 'constinterp.h.f' integer i, j integer isearch, isanan external isearch, isanan @@ -532,7 +532,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt double precision x(nx), y(ny), u(nx, ny), C(4,4,nx-1,ny-1), $ p(nx, ny), q(nx, ny), r(nx, ny) integer i, j - include 'constinterp.h' + include 'constinterp.h.f' if (type .eq. MONOTONE) then * approximation des derivees par SUBROUTINE DPCHIM(N,X,F,D,INCFD) @@ -584,7 +584,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt double precision x(nx), y(ny), u(nx, ny), C(4,4,nx-1,ny-1), $ p(nx, ny), q(nx, ny), r(nx, ny), A_d(*), $ A_sd(*), d(ny), ll(*), qdu(*), u_temp(ny) - include 'constinterp.h' + include 'constinterp.h.f' integer i, j ! compute du/dx @@ -661,7 +661,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt integer n, inc, type double precision x(n), u(inc,*), du(inc,*) - include 'constinterp.h' + include 'constinterp.h.f' double precision dx_l, du_l, dx_r, du_r, w_l, w_r integer i, k @@ -876,7 +876,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt double precision xx, yy integer i, j, k - include 'constinterp.h' + include 'constinterp.h.f' integer isanan double precision EvalBicubic external isanan, returnananfortran, EvalBicubic @@ -940,7 +940,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt double precision xx, yy integer k, i, j - include 'constinterp.h' + include 'constinterp.h.f' integer isanan double precision EvalBicubic external isanan, returnananfortran, EvalBicubic @@ -1033,7 +1033,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt double precision xx, yy integer k, i, j - include 'constinterp.h' + include 'constinterp.h.f' integer isanan double precision EvalBicubic external isanan, returnananfortran, EvalBicubic @@ -1136,7 +1136,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt integer k logical flag_x, flag_y, flag_z double precision x, y, z - include 'constinterp.h' + include 'constinterp.h.f' integer isanan double precision db3val external isanan, returnananfortran, db3val @@ -1209,7 +1209,7 @@ c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt integer k logical flag_x, flag_y, flag_z double precision x, y, z - include 'constinterp.h' + include 'constinterp.h.f' integer isanan double precision db3val external isanan, returnananfortran, db3val -- 1.7.9.5