move scripts for magicc into the folder core/magicc, delete outdated script...

move scripts for magicc into the folder core/magicc, delete outdated script performance_test.R, integrate script submit_compare.cmd into multiComparison.R

config/default.cfg

@@ -426,15 +426,15 @@ cfg$files2export$start <- c("config/conopt3.opt",
                             "config/conopt3.op2",
                             "config/conopt3.op3",
                             "config/conopt3.op9",
-                            "scripts/run_submit/run_magicc.R",
-                            "scripts/run_submit/run_magicc_temperatureImpulseResponse.R",
-                            "scripts/run_submit/read_DAT_TOTAL_ANTHRO_RF.R",
-                            "scripts/run_submit/read_DAT_SURFACE_TEMP.R",
+                            "core/magicc/run_magicc.R",
+                            "core/magicc/run_magicc_temperatureImpulseResponse.R",
+                            "core/magicc/read_DAT_TOTAL_ANTHRO_RF.R",
+                            "core/magicc/read_DAT_SURFACE_TEMP.R",
                             "core/input/historical/historical.mif",
                             "scripts/input/exoGAINSAirpollutants.R",
                             "config/input.gdx",
                             "config/input_ref.gdx",
-							              "core/magicc",
+                            "core/magicc",
                             ".Rprofile",
                             "config/mappingEDGEtoREMINDsectors.csv")
 

scripts/output/comparison/multiComparison.R

@@ -66,7 +66,7 @@ compareScenTable <- function(listofruns){
 
   if(system("hash sbatch 2>/dev/null") == 0){
     cat("Submitting comparison Jobs:\n")
-    system("sbatch scripts/run_submit/submit_compare.cmd")
+     system(paste0("sbatch --job-name=rem-compare --output=log-%j.out --mail-type=END --cpus-per-task=2 --qos=priority --wrap=\"Rscript scripts/utils/compareParallel.R \""))
   }else{
     source("scripts/utils/compareParallel.R")
   }

scripts/performance_test.R

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
-source("scripts/start_functions.R")
-
-
-performance_start <- function(cfg="default.cfg",modulepath="modules/",id="performance",sequential=NULL) {
-  require(lucode)
-  
-  if(!is.list(cfg)) {
-    if(is.character(cfg)) {
-      source(path("config",cfg),local=TRUE)
-      if(!is.list(cfg)) stop("Wrong input file format: config file does not contain a cfg list!")
-    } else {
-      stop("Wrong input format: cfg is neither a list nor a character!")
-    }
-  }
-  
-  cfg$results_folder <- "output/:title:"
-
-  cfg$sequential <- sequential
-  cfg$logoption <- 2
-  
-  #LB# funzt erstmal nicht in REMIND
-  #svn <- system("svn info",intern=TRUE) 
-  #save(svn,file="svn.rda")
-  #cfg$files2export$start <- c(cfg$files2export$start,"svn.rda")
- 
-  #start default run
-  cfg$title <- paste(id,"default",sep="__")
-  cat(cfg$title,"\n")
-  start_run(cfg) 
- 
-  m <- getModules(modulepath)
-  for(i in 1:dim(m)[1]) {
-  #for(i in c(1,3,4)) {    
-    default <- cfg$gms[[m[i,"name"]]]
-    r <- strsplit(m[i,"realizations"],",")[[1]]
-    r <- r[r!=default]  #remove default case
-    for(j in r) {
-      cfg$gms[[m[i,"name"]]] <- j
-      cfg$title <- paste(id,m[i,"name"],j,sep="__")
-      cat(cfg$title,"\n")
-      start_functions(cfg)  # for REMIND
-      # start_run(cfg)  # for MAGPIE
-    }
-    cfg$gms[[m[i,"name"]]] <- default  
-  } 
-}
-
-performance_collect <- function(id="performance",results_folder="output/",plot=TRUE) {
-  require(magpie)
-  require(lucode)
-  maindir <- getwd()
-  cat("\n wir sind in ", maindir,"\n")
-  on.exit(setwd(maindir))
-  setwd(results_folder) 
-  cat("\n wir sind in ",results_folder,"\n")
-  folders <- grep(paste("^",id,"__",sep=""),list.dirs(),value=TRUE)
-  tmp <- grep(paste("^",id,"__default",sep=""),folders)
-  default <- folders[tmp]
-  if(length(default)==0) stop("No default folder found which fits to the given id (",id,")")
-  folders <- folders[-tmp]
-  if(length(folders)==0) stop("No folders found which fit to the given id (",id,")")
- 
-  .modelstats <- function(f,colMeans=TRUE) {
-#    logfile <- path(f,"log.txt")   # for MAGPIE
-    logfile <- path(f,"full.log")   # for REMIND
-    tmp <- readLines(logfile)
-    l1 <- grep("rows",tmp,value=TRUE)
-    l2 <- grep("nl-code",tmp,value=TRUE)
-    
-    if(length(l1)==0 & length(l2)==0) return(NA)
-    
-    p1 <- "---   ([^ ]*) rows  ([^ ]*) columns  ([^ ]*) non-zeroes"
-    rows <- as.integer(gsub(",","",gsub(p1,"\\1",l1)))
-    columns <- as.integer(gsub(",","",gsub(p1,"\\2",l1)))
-    nonzeroes <- as.integer(gsub(",","",gsub(p1,"\\3",l1)))
-    
-    p2 <- "---   ([^ ]*) nl-code  ([^ ]*) nl-non-zeroes"
-    nlcode <- as.integer(gsub(",","",gsub(p2,"\\1",l2)))
-    nlnonzeroes <- as.integer(gsub(",","",gsub(p2,"\\2",l2)))
-    
-    out <- cbind(rows,columns,nonzeroes,nlcode,nlnonzeroes)
-    rownames(out) <- paste("t",1:dim(out)[1],sep="")
-    if(colMeans) out <- colMeans(out)
-    return(out)
-    
-  }
-  
-  .infescheck <- function(gdx) {
-    if(!file.exists(gdx)) return(3)
-    tmp <- modelstat(gdx)
-    if(any(tmp!=2 & tmp!=7)) {
-      x <- 2
-    } else if(any(tmp!=2 & tmp==7)) {
-      x <- 1      
-    } else {
-      x <- 0            
-    }
-    return(x)
-    
-  }
-  
-  .gettime <- function(rdata) {
-    load(rdata)   
-   # tmp <- as.double(validation$technical$time$magpie.gms,unit="mins") # for MAGPIE
-    tmp <- as.double(validation$technical$time$full.gms,unit="mins") # for REMIND
-    return(tmp)
-   
-  }
-  
-  
-  results <- NULL
-  infes <- list()
-  cat("\n folgende folder werden gleich bearbeitet ",folders,"\n")
-  for(f in folders){
-    tmp <- strsplit(f,"__")[[1]]
-    ms <- .modelstats(f,colMeans=TRUE) 
-    cat("\n module ",tmp[2],"\n")
-    cat("\n realization ",tmp[3],"\n")
-    # for MAGPIE
-    #tmp2 <- data.frame(module=tmp[2],realization=tmp[3],default=FALSE,runtime=.gettime(path(f,f,ftype="RData")),infes=.infescheck(path(f,"fulldata.gdx")),
-    #                   rows=ms["rows"],columns=ms["columns"],nonzeroes=ms["nonzeroes"],nlcode=ms["nlcode"],nlnonzeroes=ms["nlnonzeroes"])
-    # for REMIND
-    tmp2 <- data.frame(module=tmp[2],realization=tmp[3],default=FALSE,runtime=.gettime(path(f,f,ftype="RData")),infes=.infescheck(path(f,"optim.gdx")),
-                       rows=ms["rows"],columns=ms["columns"],nonzeroes=ms["nonzeroes"],nlcode=ms["nlcode"],nlnonzeroes=ms["nlnonzeroes"])
-    results <- rbind(results,tmp2)
-  }
-  
-  load(path(default,"config.Rdata"))
-  for(n in unique(results$module)) {
-    ms <- .modelstats(default,colMeans=TRUE)
-    # for MAGPIE
-    # tmp <- data.frame(module=n,realization=cfg$gms[[n]],default=TRUE,runtime=.gettime(path(default,default,ftype="RData")),infes=.infescheck(path(default,"fulldata.gdx")),
-    #                  rows=ms["rows"],columns=ms["columns"],nonzeroes=ms["nonzeroes"],nlcode=ms["nlcode"],nlnonzeroes=ms["nlnonzeroes"])
-    # for REMIND
-    tmp <- data.frame(module=n,realization=cfg$gms[[n]],default=TRUE,runtime=.gettime(path(default,default,ftype="RData")),infes=.infescheck(path(default,"optim.gdx")),
-                      rows=ms["rows"],columns=ms["columns"],nonzeroes=ms["nonzeroes"],nlcode=ms["nlcode"],nlnonzeroes=ms["nlnonzeroes"])
-    results <- rbind(results,tmp)    
-  }  
-  
-  results$info <- paste(results$module,results$realization,sep=": ")
-  results$relative_runtime <- results$runtime/results[results$default,"runtime"][1] - 1
-  results$more_info[results$default] <- "default"
-  results$more_info[results$infes==0 & !results$default] <- paste(round(results$relative_runtime[results$infes==0 & !results$default]*100),"%",sep="")
-  results$more_info[results$infes==1] <- "non-optimal solution"
-  results$more_info[results$infes==2] <- "infeasible solution"
-  results$more_info[results$infes==3] <- "compilation error"
-  results$relative_rows <- results$rows/results[results$default,"rows"][1] - 1
-  results$relative_columns <- results$columns/results[results$default,"columns"][1] - 1
-  results$relative_nonzeroes <- results$nonzeroes/results[results$default,"nonzeroes"][1] - 1
-  results$relative_nlcode <- results$nlcode/results[results$default,"nlcode"][1] - 1
-  results$relative_nlnonzeroes <- results$nlnonzeroes/results[results$default,"nlnonzeroes"][1] - 1
-  attr(results,"default_cfg") <- cfg
-  attr(results,"id") <- id
-  
-  #if(file.exists(path(default,"svn.rda"))) {
-  #  load(path(default,"svn.rda"))
-  #  attr(results,"svn") <- svn
-  #}
-  
-  setwd(maindir)
-  if(plot) performance_plot(results)
-  return(results)
-}
-
-
-performance_plot <- function(x) {
-  require(ggplot2)
-  require(lusweave)
-  
-  .create_plot <- function(x,weight="relative_runtime",label="runtime/default_runtime2") {
-    p <- ggplot(x, aes_string(x="info",weight=weight,fill="module")) + geom_bar(position="dodge")+coord_flip()+labs(y=label,x="",size=2)
-    p <- p +  geom_text(aes(y=0,label=more_info), hjust=0, size = 3) + theme(legend.position="none")
-    print(p)
-  }
-  
-  .tmptable <- function(sw,tmp) {
-    nrow <- ceiling(length(tmp)/2)
-    if(nrow*2 > length(tmp)) tmp <- c(tmp,"")
-    swtable(sw,matrix(tmp,nrow),align="l",include.colnames=FALSE,include.rownames=FALSE,vert.lines=0,hor.lines=0)
-    return(sw)
-  }
-  
-  sw_option <- "width=11,height=12"
-  
-  sw <- swopen(paste("performance_check_",attr(x,"id"),".pdf",sep=""))
-  swlatex(sw,c("\\title{Performance test results}","\\author{Model Operations Group}","\\maketitle","\\tableofcontents"))
-
-  swlatex(sw,"\\newpage")
-  
-  swlatex(sw,"\\section{General information}")
-  swlatex(sw,"\\subsection{Settings default run}")
-  
-  sw <- .tmptable(sw,x$info[x$more_info =="default"])
-  
-  swlatex(sw,"\\subsection{Run information default run}")
-  tmp <- x[x$more_info=="default",][1,c("runtime","rows","columns","nonzeroes","nlcode","nlnonzeroes")]
-  tmp2 <- cbind(format(round(as.vector(as.matrix(tmp)),2),nsmall=2),names(tmp))
-  rownames(tmp2) <- names(tmp)
-  colnames(tmp2) <- c("data","description")
-  tmp2[,"description"] <- c(" minutes (total runtime)",
-                            " (average over all optimizations)",
-                            " (average over all optimizations)",
-                            " (average over all optimizations)",
-                            " (average over all optimizations)",
-                            " (average over all optimizations)")
-  
-  swtable(sw,tmp2,align="r")
-  
-  
-  swlatex(sw,"\\newpage")
-  
-  #remove default run from results
-  x <- x[x$more_info!="default",]
-  
-  tmp <- x$info[x$more_info =="compilation error"]
-  if(length(tmp)>0){
-    swlatex(sw,"\\subsection{Compilation errors}")
-    sw <- .tmptable(sw,tmp)
-    #remove runs with compilation error from results
-    x <- x[x$more_info!="compilation error",]
-  }
-
-  tmp <- x$info[x$more_info =="infeasible solution"]
-  if(length(tmp)>0){
-    swlatex(sw,"\\subsection{Infeasible solutions}")
-    sw <- .tmptable(sw,tmp)
-  }
-  
-  .tmp <- function(sw,x) {
-     swlatex(sw,"\\subsection{relative runtime}")
-     swfigure(sw,.create_plot,x,weight="relative_runtime",label="runtime relative to default run",sw_option=sw_option)
-     swlatex(sw,"\\subsection{relative number of rows}")
-     swfigure(sw,.create_plot,x,weight="relative_rows",label="No. of rows relative to default",sw_option=sw_option)
-     swlatex(sw,"\\subsection{relative number of columns}")
-     swfigure(sw,.create_plot,x,weight="relative_columns",label="No. of columns relative to default",sw_option=sw_option)
-     swlatex(sw,"\\subsection{relative number of nonzeroes}")
-     swfigure(sw,.create_plot,x,weight="relative_nonzeroes",label="No. of nonzeroes relative to default",sw_option=sw_option)
-     swlatex(sw,"\\subsection{relative number of nl code}")
-     swfigure(sw,.create_plot,x,weight="relative_nlcode",label="Lines of NL code relative to default",sw_option=sw_option)
-     swlatex(sw,"\\subsection{relative number of nl nonzeroes}")
-     swfigure(sw,.create_plot,x,weight="relative_nlnonzeroes",label="No. of NL nonzeroes relative to default",sw_option=sw_option)
-    return(sw)
-  }
-  
-  swlatex(sw,"\\section{Results sorted by module}")
-  sw <- .tmp(sw,x)
-  
-  x <- x[order(x$runtime,decreasing=TRUE),]
-  x$info <- factor(x$info,x$info)
-  
-  swlatex(sw,"\\section{Results sorted by runtime}")
-  sw <- .tmp(sw,x)
-
-  if(!is.null(attr(x,"svn"))){ 
-    swlatex(sw,"\\section{SVN info}")
-    sw <- .tmptable(sw,c(attr(x,"svn"),rep("",length(attr(x,"svn")))))
-  }
-
-  swlatex(sw,"\\newpage\\section{Full default config}")
-  tmp <- unlist(attr(x,"default_cfg"))
-  n <- 35
-  while(length(tmp)>n) {
-    sw <- .tmptable(sw,c(names(tmp)[1:n],tmp[1:n]))
-    tmp <- tmp[-(1:n)]
-  }
-  sw <- .tmptable(sw,c(names(tmp),tmp))
- 
-
-  swclose(sw)
-}
-

scripts/run_submit/submit_compare.cmd

-#!/bin/bash
-#SBATCH --qos=priority
-#SBATCH --job-name=rem-compare
-#SBATCH --output=log-%j.out
-#SBATCH --mail-type=END
-#SBATCH --mem=32000
-#SBATCH --cpus-per-task=2
-
-Rscript scripts/utils/compareParallel.R