Commit e711bb807cee3a51f1eae75b9041469bcb96f2af
1 parent
41811905dd
Exists in
master
and in
2 other branches
ChW 02/2010 for typing errors between sp_kind and ip_kind
git-svn-id: https://lxsd.femto-st.fr/svn/fvn@68 b657c933-2333-4658-acf2-d3c7c2708721
Showing 1 changed file with 20 additions and 19 deletions Side-by-side Diff
fvn_interpol/fvn_interpol.f90
... | ... | @@ -52,11 +52,11 @@ |
52 | 52 | ! a simple dichotomy method is used |
53 | 53 | |
54 | 54 | real(kind=sp_kind), intent(in) :: x |
55 | - integer(kind=sp_kind), intent(in) :: n | |
55 | + integer(kind=ip_kind), intent(in) :: n | |
56 | 56 | real(kind=sp_kind), intent(in), dimension(n) :: xdata |
57 | - integer(kind=sp_kind), intent(out) :: i | |
57 | + integer(kind=ip_kind), intent(out) :: i | |
58 | 58 | |
59 | - integer(kind=sp_kind) :: imin,imax,imoyen | |
59 | + integer(kind=ip_kind) :: imin,imax,imoyen | |
60 | 60 | |
61 | 61 | ! special case is where x=xdata(n) then n-1 is returned so |
62 | 62 | ! we will not exclude the upper limit |
63 | 63 | |
64 | 64 | |
... | ... | @@ -106,11 +106,11 @@ |
106 | 106 | ! a simple dichotomy method is used |
107 | 107 | |
108 | 108 | real(kind=dp_kind), intent(in) :: x |
109 | - integer(kind=sp_kind), intent(in) :: n | |
109 | + integer(kind=ip_kind), intent(in) :: n | |
110 | 110 | real(kind=dp_kind), intent(in), dimension(n) :: xdata |
111 | - integer(kind=sp_kind), intent(out) :: i | |
111 | + integer(kind=ip_kind), intent(out) :: i | |
112 | 112 | |
113 | - integer(kind=sp_kind) :: imin,imax,imoyen | |
113 | + integer(kind=ip_kind) :: imin,imax,imoyen | |
114 | 114 | |
115 | 115 | ! special case is where x=xdata(n) then n-1 is returned so |
116 | 116 | ! we will not exclude the upper limit |
117 | 117 | |
... | ... | @@ -156,12 +156,12 @@ |
156 | 156 | ! xdata must be increasingly ordered |
157 | 157 | ! x must be within xdata(1) and xdata(n) to actually do interpolation |
158 | 158 | ! otherwise extrapolation is done |
159 | - integer(kind=sp_kind), intent(in) :: n | |
159 | + integer(kind=ip_kind), intent(in) :: n | |
160 | 160 | real(kind=sp_kind), intent(in), dimension(n) :: xdata,ydata |
161 | 161 | real(kind=sp_kind), intent(in) :: x |
162 | 162 | real(kind=sp_kind) :: fvn_s_quad_interpol |
163 | 163 | |
164 | - integer(kind=sp_kind) :: iinf,base,i,j | |
164 | + integer(kind=ip_kind) :: iinf,base,i,j | |
165 | 165 | real(kind=sp_kind) :: p |
166 | 166 | |
167 | 167 | call fvn_s_find_interval(x,iinf,xdata,n) |
168 | 168 | |
... | ... | @@ -211,12 +211,12 @@ |
211 | 211 | ! xdata must be increasingly ordered |
212 | 212 | ! x must be within xdata(1) and xdata(n) to actually do interpolation |
213 | 213 | ! otherwise extrapolation is done |
214 | - integer(kind=sp_kind), intent(in) :: n | |
214 | + integer(kind=ip_kind), intent(in) :: n | |
215 | 215 | real(kind=dp_kind), intent(in), dimension(n) :: xdata,ydata |
216 | 216 | real(kind=dp_kind), intent(in) :: x |
217 | 217 | real(kind=dp_kind) :: fvn_d_quad_interpol |
218 | 218 | |
219 | - integer(kind=sp_kind) :: iinf,base,i,j | |
219 | + integer(kind=ip_kind) :: iinf,base,i,j | |
220 | 220 | real(kind=dp_kind) :: p |
221 | 221 | |
222 | 222 | call fvn_d_find_interval(x,iinf,xdata,n) |
223 | 223 | |
... | ... | @@ -267,14 +267,14 @@ |
267 | 267 | ! the couple (x,y) must be as x within xdata(1) and xdata(nx) and |
268 | 268 | ! y within ydata(1) and ydata(ny) to actually do interpolation |
269 | 269 | ! otherwise extrapolation is done |
270 | - integer(kind=sp_kind), intent(in) :: nx,ny | |
270 | + integer(kind=ip_kind), intent(in) :: nx,ny | |
271 | 271 | real(kind=sp_kind), intent(in) :: x,y |
272 | 272 | real(kind=sp_kind), intent(in), dimension(nx) :: xdata |
273 | 273 | real(kind=sp_kind), intent(in), dimension(ny) :: ydata |
274 | 274 | real(kind=sp_kind), intent(in), dimension(nx,ny) :: zdata |
275 | 275 | real(kind=sp_kind) :: fvn_s_quad_2d_interpol |
276 | 276 | |
277 | - integer(kind=sp_kind) :: ixinf,iyinf,basex,basey,i | |
277 | + integer(kind=ip_kind) :: ixinf,iyinf,basex,basey,i | |
278 | 278 | real(kind=sp_kind),dimension(3) :: ztmp |
279 | 279 | !real(kind=4), external :: fvn_s_quad_interpol |
280 | 280 | |
281 | 281 | |
... | ... | @@ -335,14 +335,14 @@ |
335 | 335 | ! the couple (x,y) must be as x within xdata(1) and xdata(nx) and |
336 | 336 | ! y within ydata(1) and ydata(ny) to actually do interpolation |
337 | 337 | ! otherwise extrapolation is done |
338 | - integer(kind=sp_kind), intent(in) :: nx,ny | |
338 | + integer(kind=ip_kind), intent(in) :: nx,ny | |
339 | 339 | real(kind=dp_kind), intent(in) :: x,y |
340 | 340 | real(kind=dp_kind), intent(in), dimension(nx) :: xdata |
341 | 341 | real(kind=dp_kind), intent(in), dimension(ny) :: ydata |
342 | 342 | real(kind=dp_kind), intent(in), dimension(nx,ny) :: zdata |
343 | 343 | real(kind=dp_kind) :: fvn_d_quad_2d_interpol |
344 | 344 | |
345 | - integer(kind=sp_kind) :: ixinf,iyinf,basex,basey,i | |
345 | + integer(kind=ip_kind) :: ixinf,iyinf,basex,basey,i | |
346 | 346 | real(kind=dp_kind),dimension(3) :: ztmp |
347 | 347 | !real(kind=8), external :: fvn_d_quad_interpol |
348 | 348 | |
... | ... | @@ -402,7 +402,7 @@ |
402 | 402 | ! xdata, ydata and zdata must be increasingly ordered |
403 | 403 | ! The triplet (x,y,z) must be within xdata,ydata and zdata to actually |
404 | 404 | ! perform an interpolation, otherwise extrapolation is done |
405 | - integer(kind=sp_kind), intent(in) :: nx,ny,nz | |
405 | + integer(kind=ip_kind), intent(in) :: nx,ny,nz | |
406 | 406 | real(kind=sp_kind), intent(in) :: x,y,z |
407 | 407 | real(kind=sp_kind), intent(in), dimension(nx) :: xdata |
408 | 408 | real(kind=sp_kind), intent(in), dimension(ny) :: ydata |
... | ... | @@ -410,7 +410,7 @@ |
410 | 410 | real(kind=sp_kind), intent(in), dimension(nx,ny,nz) :: tdata |
411 | 411 | real(kind=sp_kind) :: fvn_s_quad_3d_interpol |
412 | 412 | |
413 | - integer(kind=sp_kind) :: ixinf,iyinf,izinf,basex,basey,basez,i,j | |
413 | + integer(kind=ip_kind) :: ixinf,iyinf,izinf,basex,basey,basez,i,j | |
414 | 414 | !real(kind=4), external :: fvn_s_quad_interpol,fvn_s_quad_2d_interpol |
415 | 415 | real(kind=sp_kind),dimension(3,3) :: ttmp |
416 | 416 | |
... | ... | @@ -490,7 +490,7 @@ |
490 | 490 | ! xdata, ydata and zdata must be increasingly ordered |
491 | 491 | ! The triplet (x,y,z) must be within xdata,ydata and zdata to actually |
492 | 492 | ! perform an interpolation, otherwise extrapolation is done |
493 | - integer(kind=sp_kind), intent(in) :: nx,ny,nz | |
493 | + integer(kind=ip_kind), intent(in) :: nx,ny,nz | |
494 | 494 | real(kind=dp_kind), intent(in) :: x,y,z |
495 | 495 | real(kind=dp_kind), intent(in), dimension(nx) :: xdata |
496 | 496 | real(kind=dp_kind), intent(in), dimension(ny) :: ydata |
... | ... | @@ -498,7 +498,7 @@ |
498 | 498 | real(kind=dp_kind), intent(in), dimension(nx,ny,nz) :: tdata |
499 | 499 | real(kind=dp_kind) :: fvn_d_quad_3d_interpol |
500 | 500 | |
501 | - integer(kind=sp_kind) :: ixinf,iyinf,izinf,basex,basey,basez,i,j | |
501 | + integer(kind=ip_kind) :: ixinf,iyinf,izinf,basex,basey,basez,i,j | |
502 | 502 | !real(kind=8), external :: fvn_d_quad_interpol,fvn_d_quad_2d_interpol |
503 | 503 | real(kind=dp_kind),dimension(3,3) :: ttmp |
504 | 504 |