lapack checks

check-lapacksyms.sh

+#!/bin/sh
+
+for i in $(grep F77 /usr/lib/R/include/R_ext/Linpack.h | sed -e "s/(/ /g" -e "s/)/ /g"| awk '{print $4}'
+ ); do nm src/baykrig.so| grep $i >/dev/null && echo $i found; done

makefile

 
 all:
-	(cd ~/ ; R INSTALL -l $(R_LIBS) baykrig)
+	(cd ../ ; R INSTALL -l $(R_LIBS) baykrig)
 
 clean:
 	rm -f src/*.o src/*/*.o src/*/*/*.o src/*.so
 
 tar:
 	(cd ..; tar czvp -f baykrig_0.1-1.tar.gz --exclude=CVS baykrig/R baykrig/src baykrig/man baykrig/data baykrig/{DESCRIPTION,README,INDEX} baykrig/ChangeLog)
+
+# grep F77 /usr/lib/R/include/R_ext/Linpack.h | \
+# sed -e "s/(/ /g" -e "s/)/ /g"| awk '{print $4}'
+# 
+#
+rlapack:
+	./check-lapacksyms.sh

src/Makevars

@@ -105,6 +105,8 @@ slatec/src/xermsg.o
 
 
 OBJS=$(LINPACK) $(BLAS) $(LAPACK) $(SLATEC) \
+
+OBJS=$(LINPACK) $(LAPACK) $(SLATEC) \
 bkwrp.o \
 lsfit.o \
 design.o \

src/bk.f

@@ -251,12 +251,13 @@ c     determine search neighbourhood
       CALL SRCHNB(LON0,LAT0,DO0,INDDO,N0,NDO,LON,LAT,N,NS,
      .            RSEARCH,NSEARCH,NSMIN,NSMAX,
      .            INDSRT,INDSNB,INDSNW,DIST)
-
 c     prepare the design matrix
       CALL DESIGN(LON,LAT,N,INDSNB,NS,LON0,LAT0,N0,INDDO,NDO,
      .            FWORK,LDFWRK,F0WORK,LDF0WK,NTREND,TREND,IERR)
 c     make a copy in fwrk2
-      CALL DSUBMM(FWORK,NS,NTREND,1,1,NS,NTREND,LDFWRK,FWRK2,LDFWRK,1)
+      CALL DESIGN(LON,LAT,N,INDSNB,NS,LON0,LAT0,N0,INDDO,NDO,
+     .            FWRK2,LDFWRK,F0WORK,LDF0WK,NTREND,TREND,IERR)
+c      CALL DSUBMM(FWORK,NS,NTREND,1,1,NS,NTREND,LDFWRK,FWRK2,LDFWRK,1)
 c     extract appropriate parts of covariance matrix and Z
       DO 10 I=1,NS
          ZSRNB(I)=Z(INDSNB(I))
@@ -284,7 +285,8 @@ c     .            COVBTA,CHLUP,CMINV,WORK1,WORK,LWORK,IPVT,IWORK,IERR)
             RETURN
          END IF
       ELSE
-         CALL GLSFIT(FWORK,FWRK2,NS,NTREND,LDFWRK,ZSRNB,CVSRNB,LDCOV,
+c         CALL GLSFIT(FWORK,FWRK2,NS,NTREND,LDFWRK,ZSRNB,CVSRNB,LDCOV,
+         CALL GLSFIT(FWORK,FWork,NS,NTREND,LDFWRK,ZSRNB,CVSRNB,LDCOV,
      .               BETA,ERRBTA,DEV,ERRDEV,
      .               COVBTA,LDCVBT,SGSQR,
      .               CHLUP,LDCLUP,CMINV,LDCINV,
@@ -302,6 +304,7 @@ c      call matpr(name,beta,ntrend,1,ntrend,1)
 c      name="covbta\0"
 c      call matpr(name,covbta,ntrend,ntrend,ntrend,1)
       END IF
+      goto 123
 
 c     merge priors with search neighbourhood:
 c     average all prior guesses with estimation in search neighbourhood
@@ -515,6 +518,7 @@ c        Z0 = LAMBDA' * Z + LAMBD0
 c      name="z0"
 c      call matpr(z0,n0,1,n0,name,dbglvl)
       IWORK(1)=NS
+ 123  continue
       RETURN
       END
 

src/glsfit.f

@@ -343,6 +343,5 @@ c     final step
             COVBTA(I,J)=COVBTA(I,J)*SGSQR
  180     CONTINUE
  190  CONTINUE
-
       RETURN
       END