From noreply at r-forge.r-project.org Tue Oct 1 08:13:07 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 1 Oct 2013 08:13:07 +0200 (CEST) Subject: [Rodbcext-commits] r44 - pkg/geoclimate/R Message-ID: <20131001061307.2313D18418A@r-forge.r-project.org> Author: jaunario Date: 2013-10-01 08:13:06 +0200 (Tue, 01 Oct 2013) New Revision: 44 Modified: pkg/geoclimate/R/gsod.r Log: Changed file check of ISH-HISTORY.CSV Modified: pkg/geoclimate/R/gsod.r =================================================================== --- pkg/geoclimate/R/gsod.r 2013-09-16 02:37:20 UTC (rev 43) +++ pkg/geoclimate/R/gsod.r 2013-10-01 06:13:06 UTC (rev 44) @@ -40,13 +40,15 @@ } else { show.message("Checking file date.", appendLF=TRUE) online <- unlist(strsplit(getURL("ftp://ftp.ncdc.noaa.gov/pub/data/inventories/"),"\r\n")) - oinfo <- unlist(strsplit(online[grep("ISH-HISTORY.CSV",online)],"[[:space:]]+"))[6:7] + oinfo <- unlist(strsplit(online[grep("ISH-HISTORY.CSV$",online)],"[[:space:]]+")) - age <- difftime(as.Date(paste(oinfo, collapse=" "), "%b %d"),file.info(system.file("gsod_stations.csv", package="geoclimate"))$ctime, units="weeks") - if (age<2){ + age <- difftime(as.Date(paste(oinfo[6:7], collapse=" "), "%b %d"),file.info(system.file("gsod_stations.csv", package="geoclimate"))$ctime, units="weeks") + size <- as.numeric(oinfo[5])-file.info(system.file("gsod_stations.csv", package="geoclimate"))$size + if (age<2 | size==0){ show.message("GSOD station file is upto date.", appendLF=TRUE) success <- TRUE } else { + if(!file.copy(system.file("gsod_stations.csv", package="geoclimate"),paste(system.file("gsod_stations.csv", package="geoclimate"),".bck",sep=""),overwrite=TRUE)){ show.message("Unable to create station data backup file. GSOD update process aborted.", appendLF=TRUE) } else { From noreply at r-forge.r-project.org Tue Oct 1 08:23:35 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 1 Oct 2013 08:23:35 +0200 (CEST) Subject: [Rodbcext-commits] r45 - pkg/geoclimate/R Message-ID: <20131001062335.AEE4C185151@r-forge.r-project.org> Author: jaunario Date: 2013-10-01 08:23:35 +0200 (Tue, 01 Oct 2013) New Revision: 45 Modified: pkg/geoclimate/R/gsod.r Log: Solved GSOD.updateStations error on parsing getURL result in non-windows systems. Modified: pkg/geoclimate/R/gsod.r =================================================================== --- pkg/geoclimate/R/gsod.r 2013-10-01 06:13:06 UTC (rev 44) +++ pkg/geoclimate/R/gsod.r 2013-10-01 06:23:35 UTC (rev 45) @@ -39,7 +39,7 @@ show.message("Error: RCurl package not found.", appendLF=TRUE) } else { show.message("Checking file date.", appendLF=TRUE) - online <- unlist(strsplit(getURL("ftp://ftp.ncdc.noaa.gov/pub/data/inventories/"),"\r\n")) + online <- unlist(strsplit(getURL("ftp://ftp.ncdc.noaa.gov/pub/data/inventories/"),ifelse(Sys.info()["sysname"]=="Windows","\r\n","\n"))) oinfo <- unlist(strsplit(online[grep("ISH-HISTORY.CSV$",online)],"[[:space:]]+")) age <- difftime(as.Date(paste(oinfo[6:7], collapse=" "), "%b %d"),file.info(system.file("gsod_stations.csv", package="geoclimate"))$ctime, units="weeks") From noreply at r-forge.r-project.org Tue Oct 1 08:38:51 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 1 Oct 2013 08:38:51 +0200 (CEST) Subject: [Rodbcext-commits] r46 - pkg/geoclimate/R Message-ID: <20131001063851.BBAFF1841F6@r-forge.r-project.org> Author: jaunario Date: 2013-10-01 08:38:51 +0200 (Tue, 01 Oct 2013) New Revision: 46 Modified: pkg/geoclimate/R/gsod.r Log: Reversed condition when updating GSOD.stations (if online date newer or size diff is not zero then download else flag as updated) Modified: pkg/geoclimate/R/gsod.r =================================================================== --- pkg/geoclimate/R/gsod.r 2013-10-01 06:23:35 UTC (rev 45) +++ pkg/geoclimate/R/gsod.r 2013-10-01 06:38:51 UTC (rev 46) @@ -38,17 +38,14 @@ if(!require(RCurl)){ show.message("Error: RCurl package not found.", appendLF=TRUE) } else { - show.message("Checking file date.", appendLF=TRUE) + show.message("Checking file differences.", appendLF=TRUE) online <- unlist(strsplit(getURL("ftp://ftp.ncdc.noaa.gov/pub/data/inventories/"),ifelse(Sys.info()["sysname"]=="Windows","\r\n","\n"))) oinfo <- unlist(strsplit(online[grep("ISH-HISTORY.CSV$",online)],"[[:space:]]+")) age <- difftime(as.Date(paste(oinfo[6:7], collapse=" "), "%b %d"),file.info(system.file("gsod_stations.csv", package="geoclimate"))$ctime, units="weeks") size <- as.numeric(oinfo[5])-file.info(system.file("gsod_stations.csv", package="geoclimate"))$size - if (age<2 | size==0){ - show.message("GSOD station file is upto date.", appendLF=TRUE) - success <- TRUE - } else { - + + if (age>2 | size!=0){ if(!file.copy(system.file("gsod_stations.csv", package="geoclimate"),paste(system.file("gsod_stations.csv", package="geoclimate"),".bck",sep=""),overwrite=TRUE)){ show.message("Unable to create station data backup file. GSOD update process aborted.", appendLF=TRUE) } else { @@ -61,6 +58,10 @@ show.message("GSOD Stations info file update complete.", EL=TRUE, appendLF=TRUE) success <- TRUE } + + } else { + show.message("GSOD station file is upto date.", appendLF=TRUE) + success <- TRUE } } } From noreply at r-forge.r-project.org Fri Oct 18 12:21:29 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 18 Oct 2013 12:21:29 +0200 (CEST) Subject: [Rodbcext-commits] r47 - pkg/geoclimate/R Message-ID: <20131018102129.5B9CA18513A@r-forge.r-project.org> Author: jaunario Date: 2013-10-18 12:21:29 +0200 (Fri, 18 Oct 2013) New Revision: 47 Modified: pkg/geoclimate/R/trmm.r Log: Changed condition for flagging values as NA Modified: pkg/geoclimate/R/trmm.r =================================================================== --- pkg/geoclimate/R/trmm.r 2013-10-01 06:38:51 UTC (rev 46) +++ pkg/geoclimate/R/trmm.r 2013-10-18 10:21:29 UTC (rev 47) @@ -68,7 +68,8 @@ cell <- cellFromXY(baseraster, txy) prec <- matrix(readBin(rawtrmm, double(), endian="big", size=4, n=ncell(trmmraster)), ncol=ncol(trmmraster), nrow=nrow(trmmraster), byrow=TRUE) - prec[prec==min(prec)] <- NA + prec[prec<0] <- NA + # TODO: review why this was done prec <- prec[nrow(prec):1,] trmmraster[] <- prec