hollorol/RBBGCMuso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating description

Browse Source
This commit is contained in:
Hollos Roland 2019-12-16 14:03:22 +01:00
parent 96f98dba48
commit 3b0891af3f
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RBBGCMuso/DESCRIPTION
View File

@ -24,7 +24,8 @@ Imports:
tidyr,
tcltk,
digest,
jsonlite
jsonlite,
data.table
LinkingTo: Rcpp
SystemRequirements: C++11
Maintainer: Roland Hollo's <hollorol@gmail.com>

48
RBBGCMuso/R/setupMuso.R
View File

@ -198,32 +198,6 @@ setupMuso <- function(executable=NULL,
}
}
# browser()
# if(getOption("RMuso_version")==6){
# manFile <- scan(iniInput[2],what="",n=1,skip=44,sep=" ") # HARDCODED -> UNTIL JSON VERSION
# mgm <- readLines(manFile)
# mgmConn <- file(manFile,open="r")
# manTypes <- c("planting","thinning","mowing","grazing","harvesting","ploughing","fertilizing","irrigating")
# mgmFiles <- rep("none",length(manTypes))
# if(scan(mgmConn,skip=3,n=1,what=integer())==1){
# mgmFiles[1] <- scan(mgmConn,skip=1,n=1,what="", sep = " ")
# }
# for(i in 2:length(mgmFiles)){
# if(scan(mgmConn,skip=2,n=1,what=integer())==1){
# mgmFiles[i] <- scan(mgmConn,skip=1,n=1,what="", sep =" " )
# } else {
# blackhole<-readLines(mgmConn,n=1)
# }
# }
# management <- list()
# Map(function(mt,dm){
# if(dm == 1){
# management[[mt]] <-
# }
# },manTypes,doManagement)
# manFile <- iniFiles[[2]]
# close(mgmConn)
# }
outputName <- character(2)
outputName[1] <- basename(unlist(strsplit(iniFiles[[1]][grep("OUTPUT_CONTROL",iniFiles[[1]])+1],"[\ \t]"))[1])
@ -320,6 +294,28 @@ setupMuso <- function(executable=NULL,
dailyVarCodes= gsub("\\s.*","",dailyVarCodes),
annualVarCodes = gsub("\\s.*","",annualVarCodes)
)
if(getOption("RMuso_version")==6){
manFile <- scan(iniInput[2],what="",n=1,skip=44,sep=" ") # HARDCODED -> UNTIL JSON VERSION
mgm <- readLines(manFile)
mgmConn <- file(manFile,open="r")
manTypes <- c("planting","thinning","mowing","grazing","harvesting","ploughing","fertilizing","irrigating")
mgmFiles <- rep("none",length(manTypes))
if(scan(mgmConn,skip=3,n=1,what=integer())==1){
mgmFiles[1] <- scan(mgmConn,skip=1,n=1,what="", sep = " ")
}
for(i in 2:length(mgmFiles)){
if(scan(mgmConn,skip=2,n=1,what=integer())==1){
mgmFiles[i] <- scan(mgmConn,skip=1,n=1,what="", sep =" " )
} else {
blackhole<-scan(mgmConn,skip =1, n=1,what="")
}
}
names(mgmFiles) <- manTypes
settings[["management"]] <- mgmFiles
close(manConn)
}
# if(writep!=nrow(grepHelper)){
# writeLines(iniFiles[[1]],iniInput[[1]])