Commit 245edfa7 authored by khornik's avatar khornik
Browse files

New version is 0.2-4

COMMON/IDLC/N -> COMMON/IDLC/NIT, idummy in idbvip.f
Fix problems with \example in interp.Rd
parent 9be3c222
Package: akima
Version: 0.2-3
Version: 0.2-4
Author: Fortran code by H. Akima.
R port by Albrecht Gebhardt <albrecht.gebhardt@uni-klu.ac.at>.
R port by Albrecht Gebhardt <albrecht.gebhardt@uni-klu.ac.at>.
Description: Linear or cubic spline interpolation for irregular gridded data
License: ??? Fortran code available at netlib
License: Fortran code available at netlib
......@@ -154,8 +154,8 @@ contour(akima.smooth$x,akima.smooth$y,akima.smooth$z,add=T)
points(akima$x,akima$y)
# use triangulation library to
# show underlying triangulation:
library(tripack)
plot(tri.mesh(akima),add=T,lty="dashed")
if(library(tripack, logical.return=T))
plot(tri.mesh(akima),add=T,lty="dashed")
# use only 15 points (interpolation only within convex hull!)
akima.part <- interp(akima$x[1:15],akima$y[1:15],akima$z[1:15])
......@@ -164,7 +164,8 @@ contour(akima.part$x,akima.part$y,akima.part$z,add=T)
points(akima$x[1:15],akima$y[1:15])
# spline interpolation, use 5 points to calculate derivatives
akima.spl <- interp(akima$x, akima$y, akima$z,
# interp gives `linear interpolation not yet implemented with interp.new()'
akima.spl <- interp.old(akima$x, akima$y, akima$z,
xo=seq(0,25, length=100), yo=seq(0,20, length=100),ncp=5)
image(akima.spl$x,akima.spl$y,akima.spl$z)
contour(akima.spl$x,akima.spl$y,akima.spl$z,add=T)
......
LIBNAME=akima
#LD=ld
#FFLAGS=-g
#SHLIBLDFLAGS=-shared
OBJS= idbvip.o idgrid.o idpdrv.o idsfft.o idxchg.o idcldp.o \
idlctn.o idptip.o idtang.o idptli.o akima.new.o tripack.subset.o
$(LIBNAME): $(OBJS)
@$(LD) $(SHLIBLDFLAGS) -o $(LIBNAME).so $(OBJS) # -lf2c
clean:
@rm -f *.o *.so ttidbs driver fort.2 WFSD3P
realclean:
@rm -f Makefile *.o *.so
# Test programs from original Fortran distribution:
test: ttidbs driver
ttidbs: ttidbs.f $(OBJS)
$(F77) $(FFLAGS) ttidbs.f idbvip.o idgrid.o idpdrv.o idsfft.o idxchg.o \
idcldp.o idlctn.o idptip.o idtang.o idptli.o -o ttidbs
driver: driver.f akima.new.o
$(F77) $(FFLAGS) driver.f akima.new.o tripack.subset.o -o driver
# compilation with f77 -g -fpic fails on Linux with g77 0.5.19.1!
# (assembler complains about unknown i386 instructions, so it seems to be
# an g77 internal problem)
# But it works when the PICFLAG is omitted:
#%.o: %.f
# $(F77) -g -c $< -o $@
# compilation with f77 -O2 -fpic works, but now interpp() (it calls idbvip)
# crashes R!
......@@ -57,7 +57,7 @@ C DECLARATION STATEMENTS
LOGICAL MISSI, LINEAR
DIMENSION XD(NDP),YD(NDP),ZD(NDP),XI(NIP),YI(NIP),
1 ZI(NIP),MISSI(NIP),IWK((31+NCP)*NDP+NIP),WK(8*NDP)
COMMON/IDLC/NIT
COMMON/IDLC/NIT, idummy
COMMON/IDPI/ITPV
DATA LUN/6/
C SETTING OF SOME INPUT PARAMETERS TO LOCAL VARIABLES.
......
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