From 5a48436baa355e495162ecf21af17f6438287ce7 Mon Sep 17 00:00:00 2001 From: agebhard <> Date: Mon, 9 Sep 2002 06:14:20 +0000 Subject: [PATCH] DEC cc ... --- devel/fresh/.Rhistory | 16 ++++++++-------- src/bk_grid.c | 18 +++++++----------- src/bk_grid.h | 2 +- src/bk_point.c | 34 +++++++++++++++------------------- src/bk_point.h | 2 +- 5 files changed, 32 insertions(+), 40 deletions(-) diff --git a/devel/fresh/.Rhistory b/devel/fresh/.Rhistory index c4850cf..2eb5a65 100644 --- a/devel/fresh/.Rhistory +++ b/devel/fresh/.Rhistory @@ -1,10 +1,3 @@ -library(baykrig) -library(baykrig) -leman.bk<- bk.grid(point = leman.88.pt , at = "cadpbm", prior=leman.prior,var.mod.obj = leman.88.vmsph, xsw=min(leman.bank$x),ysw=min(leman.bank$y), xne=max(leman.bank$x), yne=max(leman.bank$y), nx=100, ny=100, trend=1, rsearch = 10, extrap = F,border=leman.bank, duplicate="mean") -library(baykrig) -leman.bk<- bk.grid(point = leman.88.pt , at = "cadpbm", prior=leman.prior,var.mod.obj = leman.88.vmsph, xsw=min(leman.bank$x),ysw=min(leman.bank$y), xne=max(leman.bank$x), yne=max(leman.bank$y), nx=100, ny=100, trend=1, rsearch = 10, extrap = F,border=leman.bank, duplicate="mean") -library(baykrig) -library(baykrig) leman.bk<- bk.grid(point = leman.88.pt , at = "cadpbm", prior=leman.prior,var.mod.obj = leman.88.vmsph, xsw=min(leman.bank$x),ysw=min(leman.bank$y), xne=max(leman.bank$x), yne=max(leman.bank$y), nx=100, ny=100, trend=1, rsearch = 10, extrap = F,border=leman.bank, duplicate="mean",method="ols") library(baykrig) library(baykrig) @@ -22,7 +15,6 @@ leman.bk.2<- bk.grid(point = leman.88.pt , at = "cadpbm", prior=leman.prior,var. library(baykrig) leman.bk<- bk.grid(point = leman.88.pt , at = "cadpbm", prior=leman.prior,var.mod.obj = leman.88.vmsph, xsw=min(leman.bank$x),ysw=min(leman.bank$y), xne=max(leman.bank$x), yne=max(leman.bank$y), nx=10, ny=10, trend=1, rsearch = 10, extrap = F,border=leman.bank, duplicate="mean") plot(leman.bk) -q() library(baykrig) leman.bk<- bk.grid(point = leman.88.pt , at = "cadpbm", prior=leman.prior,var.mod.obj = leman.88.vmsph, xsw=min(leman.bank$x),ysw=min(leman.bank$y), xne=max(leman.bank$x), yne=max(leman.bank$y), nx=50, ny=50, trend=1, rsearch = 10, extrap = F,border=leman.bank, duplicate="mean") plot(leman.bk) @@ -30,3 +22,11 @@ plot(leman.bk,show.snb=T) plot(leman.bk,show.snb=T,bias=T) dev.print(file="bias.ps") q() +library(baykrig) +plot(leman.bk,show.snb=T,bias=T) +ls() +library(baykrig) +leman.bk.pt <- bk.points(point = leman.88.pt , at = "cadpbm", prior=leman.prior, var.mod.obj = leman.88.vmsph, x=c(530,550),y=c(142,147), trend=1, rsearch = 10, extrap = F,border=leman.bank, duplicate="mean") +ls() +library(baykrig) +leman.bk.pt <- bk.points(point = leman.88.pt , at = "cadpbm", prior=leman.prior, var.mod.obj = leman.88.vmsph, x=c(530,550),y=c(142,147), trend=1, rsearch = 10, extrap = F,border=leman.bank, duplicate="mean") diff --git a/src/bk_grid.c b/src/bk_grid.c index 4f20b4a..e5a9104 100644 --- a/src/bk_grid.c +++ b/src/bk_grid.c @@ -44,7 +44,7 @@ void bk_grid(double *xsw, int *glsmth){ int nz=(*nx)*(*ny), ldcov=(*n), ldc0=(*n),ldphwk=(*ntrend), - ldfwrk=(*n), ldlmbd=(*n), ldkwrk=(*n), // ldcvbt=(*ntrend)*(*ntrend), + ldfwrk=(*n), ldlmbd=(*n), ldkwrk=(*n), ldcvbt=(*ntrend), ldclup=(*n),ldcinv=(*n),ldzg=(*nx); double *covmat, *c0vec, *muwrk, *phiwrk, *beta, errbta, @@ -52,8 +52,8 @@ void bk_grid(double *xsw, *fwork, *fwrk2, *f0work, *dist, *kwork, *rhswork, *fpwork, *fpfwork, *fpf0wrk, *chlup, *cminv, *work, *ferr, *berr, - *mu, // *lambda, - cov0; // lambd0 + *mu, + cov0; int *indsnb, *indsnw, *indsrt, *ipiv, *ipvt, *iwork; @@ -61,7 +61,7 @@ void bk_grid(double *xsw, #ifndef TRANSIENT covmat =Calloc((size_t)(*n)*(*n),double); c0vec =Calloc((size_t)(*n),double); - muwrk =Calloc((size_t)((*ntrend)*(*npr)),double); + muwrk =Calloc((size_t)(*ntrend),double); phiwrk =Calloc((size_t)((*ntrend)*(*ntrend)),double); covbta =Calloc((size_t)((*ntrend)*(*ntrend)),double); beta =Calloc((size_t)(*ntrend),double); @@ -89,11 +89,10 @@ void bk_grid(double *xsw, berr =Calloc((size_t)(*n),double); iwork =Calloc((size_t)(3*(*n)),int); mu =Calloc((size_t)(*ntrend),double); - // lambda =Calloc((size_t)(*n),double); #else covmat =(double *) R_alloc((*n)*(*n),sizeof(double)); c0vec =(double *) R_alloc((*n),sizeof(double)); - muwrk =(double *) R_alloc((*ntrend)*(*npr),sizeof(double)); + muwrk =(double *) R_alloc((*ntrend),sizeof(double)); phiwrk =(double *) R_alloc((*ntrend)*(*ntrend),sizeof(double)); covbta =(double *) R_alloc((*ntrend)*(*ntrend),sizeof(double)); beta =(double *) R_alloc((*ntrend),sizeof(double)); @@ -121,7 +120,6 @@ void bk_grid(double *xsw, berr =(double *) R_alloc((*n),sizeof(double)); iwork =(int *) R_alloc(3*(*n),sizeof(int)); mu =(double *) R_alloc((*ntrend),sizeof(double)); - // lambda =(double *) R_alloc((*n),sizeof(double)); #endif F77_CALL(bkgrid)(xsw, @@ -211,7 +209,6 @@ void bk_grid(double *xsw, glsmth); #ifndef TRANSIENT - // Free(lambda); Free(mu); Free(iwork); Free(berr); @@ -232,13 +229,13 @@ void bk_grid(double *xsw, Free(dist); Free(f0work); - Free(fwrk2); // crash bei trend=0 + Free(fwrk2); Free(fwork); Free(zsrnb); Free(cvsrnb); Free(dev); Free(beta); - Free(covbta); // crash bei trend=1 + Free(covbta); Free(phiwrk); Free(muwrk); Free(c0vec); @@ -247,7 +244,6 @@ void bk_grid(double *xsw, #else /* - // free(lambda); free(mu); free(iwork); free(berr); diff --git a/src/bk_grid.h b/src/bk_grid.h index f2ae3e3..1778b76 100644 --- a/src/bk_grid.h +++ b/src/bk_grid.h @@ -1,7 +1,7 @@ #include #include -// #define TRANSIENT +/* #define TRANSIENT */ void bk_grid(double *xsw, double *ysw, diff --git a/src/bk_point.c b/src/bk_point.c index a5c1df1..1fcf752 100644 --- a/src/bk_point.c +++ b/src/bk_point.c @@ -36,7 +36,7 @@ void bk_point(double *xp, int *glsmth){ int ldcov=(*n), ldc0=(*n),ldphwk=(*ntrend), - ldfwrk=(*n), ldlmbd=(*n), ldkwrk=(*n), // ldcvbt=(*ntrend)*(*ntrend), + ldfwrk=(*n), ldlmbd=(*n), ldkwrk=(*n), ldcvbt=(*ntrend), ldclup=(*n),ldcinv=(*n), usesbbt; double *covmat, *c0vec, *muwrk, *phiwrk, *beta, errbta, @@ -44,8 +44,8 @@ void bk_point(double *xp, *fwork, *fwrk2, *f0work, *dist, *kwork, *rhswork, *fpwork, *fpfwork, *fpf0wrk, *chlup, *cminv, *work, *ferr, *berr, - *mu, // *lambda, - cov0; // lambd0 + *mu, + cov0; int *indsnb, *indsnw, *indsrt, *ipiv, *ipvt, *iwork, *inddop, *nap, *snb; @@ -55,7 +55,7 @@ void bk_point(double *xp, #ifndef TRANSIENT covmat =Calloc((size_t)(*n)*(*n),double); c0vec =Calloc((size_t)(*n),double); - muwrk =Calloc((size_t)((*ntrend)*(*npr)),double); + muwrk =Calloc((size_t)(*ntrend),double); phiwrk =Calloc((size_t)((*ntrend)*(*ntrend)),double); covbta =Calloc((size_t)((*ntrend)*(*ntrend)),double); beta =Calloc((size_t)(*ntrend),double); @@ -63,7 +63,7 @@ void bk_point(double *xp, cvsrnb =Calloc((size_t)(*n)*(*n),double); zsrnb =Calloc((size_t)(*n),double); fwork =Calloc((size_t)(*n)*(*ntrend),double); - fwrk2 =Calloc((size_t)(*n)*(*ntrend),double); + fwrk2 =Calloc((size_t)(*n)*(*ntrend),double); f0work =Calloc((size_t)(*ntrend),double); dist =Calloc((size_t)(*n),double); indsnb =Calloc((size_t)(*n),int); @@ -85,11 +85,10 @@ void bk_point(double *xp, berr =Calloc((size_t)(*n),double); iwork =Calloc((size_t)(3*(*n)),int); mu =Calloc((size_t)(*ntrend),double); - // lambda =Calloc((size_t)(*n),double); #else covmat =(double *) R_alloc((*n)*(*n),sizeof(double)); c0vec =(double *) R_alloc((*n),sizeof(double)); - muwrk =(double *) R_alloc((*ntrend)*(*npr),sizeof(double)); + muwrk =(double *) R_alloc((*ntrend),sizeof(double)); phiwrk =(double *) R_alloc((*ntrend)*(*ntrend),sizeof(double)); covbta =(double *) R_alloc((*ntrend)*(*ntrend),sizeof(double)); beta =(double *) R_alloc((*ntrend),sizeof(double)); @@ -118,13 +117,12 @@ void bk_point(double *xp, berr =(double *) R_alloc((*n),sizeof(double)); iwork =(int *) R_alloc(3*(*n),sizeof(int)); mu =(double *) R_alloc((*ntrend),sizeof(double)); - // lambda =(double *) R_alloc((*n),sizeof(double)); #endif F77_CALL(bk)(xp, yp, dop, - inddop, // + inddop, np, lon, lat, @@ -135,7 +133,7 @@ void bk_point(double *xp, covmat, &ldcov, c0vec, - n, // + n, &cov0, trend, ntrend, @@ -166,7 +164,7 @@ void bk_point(double *xp, fwrk2, &ldfwrk, f0work, - ntrend, // + ntrend, dist, indsnb, indsnw, @@ -190,20 +188,19 @@ void bk_point(double *xp, iwork, mode, mu, - ntrend, // + ntrend, zp, - nap, // + nap, lambda, &ldlmbd, lambd0, varp, - searchnb, // - &usesbbt, // + searchnb, + &usesbbt, ierr, glsmth); #ifndef TRANSIENT - // Free(lambda); Free(mu); Free(iwork); Free(berr); @@ -226,13 +223,13 @@ void bk_point(double *xp, Free(dist); Free(f0work); - Free(fwrk2); // crash bei trend=0 + Free(fwrk2); Free(fwork); Free(zsrnb); Free(cvsrnb); Free(dev); Free(beta); - Free(covbta); // crash bei trend=1 + Free(covbta); Free(phiwrk); Free(muwrk); Free(c0vec); @@ -241,7 +238,6 @@ void bk_point(double *xp, #else /* - // free(lambda); free(mu); free(iwork); free(berr); diff --git a/src/bk_point.h b/src/bk_point.h index 3fc8fcd..685d4d9 100644 --- a/src/bk_point.h +++ b/src/bk_point.h @@ -1,7 +1,7 @@ #include #include -// #define TRANSIENT +/* #define TRANSIENT */ void bk_point(double *xp, double *yp, -- GitLab