diff --git a/RBBGCMuso/R/setupMuso.R b/RBBGCMuso/R/setupMuso.R index 8a9c60f..e2f05fd 100644 --- a/RBBGCMuso/R/setupMuso.R +++ b/RBBGCMuso/R/setupMuso.R @@ -245,8 +245,9 @@ setupMuso <- function(executable=NULL, file.copy(executable,inputloc) } - outputname <- unlist(strsplit(grep("output",grep("prefix",inifiles[[2]],value=TRUE),value=TRUE),"[\ \t]"))[1] - ##THIS IS AN UGLY SOLUTION, WHICH NEEDS AN UPGRADE!!! + outputname <- unlist(strsplit(inifiles[[2]][grep("OUTPUT_CONTROL",inifiles[[2]])+1],"[\ \t]"))[1] + ## outputname <- unlist(strsplit(grep("output",grep("prefix",inifiles[[2]],value=TRUE),value=TRUE),"[\ \t]"))[1] + ##THIS IS AN UGLY SOLUTION, WHICH NEEDS AN UPGRADE!!! FiXED (2017.09.11) ## outputname <- unlist(strsplit(grep("prefix for output files",inifiles[[2]],value=TRUE),"[\ \t]"))[1] if(is.null(outputname)){ cat("I cannot find outputname, in your default ini file \n Please make sure that the line wich contains the name alse contains the prefix and the outmut keywords!") diff --git a/RBBGCMuso_0.3.1.0-1.tar.gz b/RBBGCMuso_0.3.1.0-1.tar.gz new file mode 100644 index 0000000..5f46b53 Binary files /dev/null and b/RBBGCMuso_0.3.1.0-1.tar.gz differ diff --git a/TODOS b/TODOS index e88295a..5461d2e 100644 --- a/TODOS +++ b/TODOS @@ -1,16 +1,17 @@ DOCUMENTATIONS =========================================================== 1. Rewriting some of the man pages (for better english) -2. Description for the functions +#DONE 2. Description for the functions #Done 3. Details for the functions 4. Vignettes...-in progress PROGRAMING =========================================================== 1. Automatic handle for executable files-not sure to do -2. (#Fix the spinumMuso DONE), and the normalMuso functions +#Done 2. (#Fix the spinumMuso DONE), and the normalMuso functions 3. Fix the export functions. 4. Build in the mtclim43 to RBBGCMuso +#DONE 5. cleanupMuso bug TESTING =========================================================== diff --git a/TODOS.org b/TODOS.org index 24d9063..e73a1de 100644 --- a/TODOS.org +++ b/TODOS.org @@ -6,5 +6,5 @@ 1) 2) 3) - 2) + 4) ** Programozás