diff --git a/TIMES-DK_COMETS b/TIMES-DK_COMETS index 5962cc5..a73b903 160000 --- a/TIMES-DK_COMETS +++ b/TIMES-DK_COMETS @@ -1 +1 @@ -Subproject commit 5962cc5b069f5ed7562c0981812a059dc6054b6b +Subproject commit a73b903b59dee04145c299c0a36f9680bd056cfb diff --git a/TIMES_Demo b/TIMES_Demo index 36bca0f..64cc4b6 160000 --- a/TIMES_Demo +++ b/TIMES_Demo @@ -1 +1 @@ -Subproject commit 36bca0f09db5c5b8fcc8ec166cb98e21a6fe8b84 +Subproject commit 64cc4b642ac01f7cbb52ae1f215060231fd05727 diff --git a/renderer_times_miro/mirowidget_scenddmap.R b/renderer_times_miro/mirowidget_scenddmap.R index fc1d639..30fd961 100644 --- a/renderer_times_miro/mirowidget_scenddmap.R +++ b/renderer_times_miro/mirowidget_scenddmap.R @@ -131,10 +131,7 @@ mirowidget_scenddmapOutput <- function(id, height = NULL, options = NULL, path = tags$div(class = "col-sm-12 col-md-6 box-custom", tags$div(class = "table-styles", rHandsontableOutput(ns('boEoTime')) - ), - tags$div(id = ns("boEoTimeWarn"), class="config-message", style = "font-size: 11pt;", - "BOTIME (default: 1960) and EOTIME (default: 2200) usually do not need to be changed. - Be sure what you are doing!") + ) ) )), tags$div(class = "col-sm-12 col-md-4 col-lg-6 box-custom", @@ -155,7 +152,7 @@ mirowidget_scenddmapOutput <- function(id, height = NULL, options = NULL, path = min = 10, max = 36000, value = 1000L, step = 1) ), tags$div(class = "col-sm-6 custom-2 box-custom", - selectInput(ns("gmsobj"), tags$h4("Objective function formulation"), c("ALT", "AUTO", "LIN", "MOD", "STD"), selected = "MOD"), + selectInput(ns("gmsobj"), tags$h4("Objective function formulation"), c("ALT", "AUTO", "LIN", "MOD", "STD"), selected = "AUTO"), sliderInput(ns("gmsbratio"), tags$div( tags$h4("Basis indicator (bRatio)", tags$a("", @@ -200,10 +197,9 @@ mirowidget_scenddmapOutput <- function(id, height = NULL, options = NULL, path = tags$h4("Upload DD files and runfile here", class="highlight-block"), fileInput(ns("ddFilesUpload"), tags$h4("DD file(s):"), width = "100%", multiple = TRUE, - accept = c("text/plain", - ".gms", ".inc", "txt", ".dd", ".DD")), + accept = c(".dd", ".dds")), tags$div(id = "invalidFileExtensionDD", class="config-message custom-message", - "Invalid file extension! allowed are 'dd', 'DD', 'gms', 'inc', 'txt'."), + "Invalid file extension! allowed are 'dd', 'dds'."), tags$div(id = "attachmentAddedDD", class="config-message", "File(s) added as attachment."), fileInput(ns("gmsrunlocation"), tags$h4("RUN file:"), @@ -288,7 +284,7 @@ renderMirowidget_scenddmap <- function(input, output, session, data, options = N updateSelectInput(session, "gmsreslim", selected = if(length(rv$gmsreslim))rv$gmsreslim else 1000) updateSelectInput(session, "gmssolver", selected = if(length(rv$gmssolver)) rv$gmssolver else "cplex") rv$boEoTimeData <<- tibble(Time = c("BOTIME", "EOTIME"), - Value = c(if(length(rv$gmsbotime)) rv$gmsbotime else 1960, + Value = c(if(length(rv$gmsbotime)) rv$gmsbotime else 1850, if(length(rv$gmseotime)) rv$gmseotime else 2200)) }) @@ -297,7 +293,7 @@ renderMirowidget_scenddmap <- function(input, output, session, data, options = N attachments$save(zipFilePath, "dd_files.zip", overwrite = TRUE) attachmentsZip <- zip::zip_list(zipFilePath) attachmentsZip <- attachmentsZip[attachmentsZip$compressed_size > 0, ]$filename - rv$ddFiles <- attachmentsZip[grep(".dd", attachmentsZip, ignore.case = TRUE)] + rv$ddFiles <- attachmentsZip[grep(".dds?$", attachmentsZip, ignore.case = TRUE)] }, error = function(e){ print("An unexpected error occured.") }) @@ -381,7 +377,7 @@ renderMirowidget_scenddmap <- function(input, output, session, data, options = N rv$gmsbotime <<- as_tibble(hot_to_r(input$boEoTime)) %>% filter(Time == "BOTIME") %>% pull(Value) %>% unique() %>% as.numeric() }else{ - rv$gmsbotime <<- 1960 + rv$gmsbotime <<- 1850 } if(length(as_tibble(hot_to_r(input$boEoTime)))){ rv$gmseotime <<- as_tibble(hot_to_r(input$boEoTime)) %>% @@ -389,14 +385,9 @@ renderMirowidget_scenddmap <- function(input, output, session, data, options = N }else{ rv$gmseotime <<- 2200 } - if(rv$gmsbotime != 1960 || rv$gmseotime != 2200){ - showEl(session, paste0("#", session$ns("boEoTimeWarn"))) - }else{ - hideEl(session, paste0("#", session$ns("boEoTimeWarn"))) - } }else{ rv$boEoTimeData <<- rv$boEoTimeData[0,] - rv$gmsbotime <<- 1960 + rv$gmsbotime <<- 1850 rv$gmseotime <<- 2200 } }) @@ -438,9 +429,9 @@ renderMirowidget_scenddmap <- function(input, output, session, data, options = N filePath <- file$datapath fileName <- file$name ext <- tools::file_ext(file$datapath) - ddToAdd <- fileName[grep(".dd$", fileName, ignore.case = TRUE)] + ddToAdd <- fileName[grep(".dds?$", fileName, ignore.case = TRUE)] req(file) - if(any(!ext %in% c("gms", "txt", "inc", "dd", "DD"))){ + if(any(!tolower(ext) %in% c("dd", "dds"))){ showHideEl(session, "#invalidFileExtensionDD") return() } @@ -461,7 +452,7 @@ renderMirowidget_scenddmap <- function(input, output, session, data, options = N { attachmentsZip <- zip::zip_list(zipFilePath) attachmentsZip <- attachmentsZip[attachmentsZip$compressed_size > 0, ]$filename - ddFiles <- attachmentsZip[grep(".dd", attachmentsZip, ignore.case = TRUE)] + ddFiles <- attachmentsZip[grep(".dds?$", attachmentsZip, ignore.case = TRUE)] attachments$add(session, zipFilePath, "dd_files.zip", overwrite = TRUE, execPerm = TRUE) showHideEl(session, "#attachmentAddedDD") @@ -565,7 +556,7 @@ renderMirowidget_scenddmap <- function(input, output, session, data, options = N search = TRUE, height = 400) %>% hot_table(stretchH = "all", highlightRow = TRUE) %>% - hot_col(1, type = "autocomplete", source = c(if(length(rv$gmsbotime)) rv$gmsbotime else 1960:if(length(rv$gmseotime)) rv$gmseotime else 2200), strict = TRUE, allowInvalid = FALSE) %>% + hot_col(1, type = "autocomplete", source = c(if(length(rv$gmsbotime)) rv$gmsbotime else 1850:if(length(rv$gmseotime)) rv$gmseotime else 2200), strict = TRUE, allowInvalid = FALSE) %>% hot_cols(manualColumnResize = TRUE, columnSorting = TRUE) %>% hot_col(col = 'Text', colWidths=0.001) return(milestonyrTableTmp) diff --git a/times_miro.gms b/times_miro.gms index e380903..4a66fd8 100644 --- a/times_miro.gms +++ b/times_miro.gms @@ -152,6 +152,7 @@ FLO_BND .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,ALL_TS,LIM' // FLO_COST .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,ALL_TS,CUR' // 'Added variable O&M of using a commodity' FLO_CUM .'Par'.'ALL_REG,PRC,COM_GRP,ALLYEAR,1,LIM' // 'Bound on cumulative flow' FLO_DELIV .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,ALL_TS,CUR' // 'Delivery cost for using a commodity' +FLO_EFF .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,1,2' // 'General process flow-relation parameter' FLO_EMIS .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,1,ALL_TS' // 'General process emission 'Par'.' FLO_FR .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,ALL_TS,LIM' // 'Load-curve of availability of commodity to a process' FLO_FUNC .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,1,ALL_TS' // 'Relationship between 2 .'group of' flows' @@ -197,6 +198,7 @@ NCAP_AFM .'Par'.'ALL_REG,ALLYEAR,PRC' // NCAP_AFS .'Par'.'ALL_REG,ALLYEAR,PRC,ALL_TS,LIM' // 'Seasonal Availability of capacity' NCAP_AFX .'Par'.'ALL_REG,ALLYEAR,PRC' // 'Change in capacity availability' NCAP_BND .'Par'.'ALL_REG,ALLYEAR,PRC,LIM' // 'Bound on overall capacity in a period' +NCAP_CEH .'Par'.'ALL_REG,ALLYEAR,PRC' // 'Coefficient of electricity to heat' NCAP_CHPR .'Par'.'ALL_REG,ALLYEAR,PRC,LIM' // 'Combined heat:power ratio' NCAP_CLED .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP' // 'Leadtime of a commodity before new capacity ready' NCAP_COM .'Par'.'ALL_REG,ALLYEAR,PRC,COM_GRP,1' // 'Use .'but +' of commodity based upon capacity' @@ -454,6 +456,7 @@ $onMulti $onembeddedCode Python: import glob import os +import re import shutil import zipfile gams.wsWorkingDir = '.' @@ -477,16 +480,17 @@ if r'%gams.idcgdxinput% '.strip() == '_miro_gdxin_.gdx': shutil.rmtree(dirpath) with zipfile.ZipFile("dd_files.zip", 'r') as zip_ref: zip_ref.extractall("dd_files") -ddFiles = [f for f in os.listdir(r'%DDPREFIX% '.rstrip()) if f.endswith('.dd')] +ddFiles = [f for f in os.listdir(r'%DDPREFIX% '.rstrip()) if f.endswith(('.dd', '.dds'))] gams.printLog("Start writing myrun.gms") with open('myrun.gms','w') as frun: for l in rl: if len(l.rstrip()) == 0 or l[0]=="*": continue - if 'batinclude' in l.lower(): - if ('_ts.dd' in l.lower() or l.lower().split('batinclude ')[1].strip() == 'ts.dd') and len(isTS) == 0: - isTS = l.lower().split('batinclude ')[1].strip() + if 'include' in l.lower(): + ltmp = l.lower().split('include ')[1].strip() + if ('_ts.dd' in l.lower() or ltmp == 'ts.dd' or ltmp == 'ts.dds') and len(isTS) == 0: + isTS = ltmp frun.write(l) ddList.append(l.split(' ')[1].split('\n')[0]) elif '.dd' in l.lower(): @@ -525,8 +529,10 @@ db = gams.ws.add_database_from_gdx('myrun.gdx') db['ALL_TS'].copy_symbol(gams.db['TimeSlice']) dd = [] offeps = [] -for df in glob.glob(r'%DDPREFIX% '.rstrip()+'*.dd'): - if df[len(r'%DDPREFIX% '.rstrip()):].strip() != isTS: +filePathTmp = r'%DDPREFIX% '.rstrip() +filesTmp = [f for f in os.listdir(filePathTmp) if re.search(r'.*\.dds?$', f, re.IGNORECASE)] +for df in [os.path.join(filePathTmp, file) for file in filesTmp]: + if df[len(filePathTmp):].strip().lower() != isTS: ddbase = os.path.splitext(os.path.basename(df))[0] s = 'grep -i offeps "' + df + '" > ' + os.devnull rc = os.system(s) @@ -551,8 +557,9 @@ gams.printLog("Compile time variable report starts in line " + str(start)) end = [i for i, s in enumerate(rl) if 'End of Compile-time Variable List' in s][0] gams.printLog("Compile time variable report ends in line " + str(end-1)) -gams.set('gmsBOTime',[float(1960)]) +gams.set('gmsBOTime',[float(1850)]) gams.set('gmsEOTime',[float(2200)]) +gams.set('gmsObj',['AUTO']) while start "' + r'%gams.scrDir%mydd.%gams.scrExt%'+'"' + fileTmp = [f for f in os.listdir(r'%DDPREFIX% '.rstrip()) if re.search(dd + r'.dds?$', f, re.IGNORECASE)][0] + s = 'grep -iv offeps "' + r'%DDPREFIX% '.rstrip()+fileTmp+'" > "' + r'%gams.scrDir%mydd.%gams.scrExt%'+'"' rc = os.system(s) if not rc==0: raise NameError('probem executing: ' + s) @@ -597,7 +605,7 @@ for dd in gams.get('dd'): if not rc==0: raise NameError('probem executing: ' + s) dd_db[dd] = gams.ws.add_database_from_gdx(dd+'.gdx') - gams.printLog(str(dd) + ".dd --> " + str(dd) + ".gdx") + gams.printLog(str(fileTmp) + " --> " + str(dd) + ".gdx") noDD = [] for cdRec in cd_input: sym = cdRec[0] @@ -760,7 +768,7 @@ $eval.set GMSOBJ gmsObj.tl $eval.set GMSRUNOPT gmsRunOpt.tl $onecho > timesdriver.gms -$Title TIMES -- VERSION 4.5.9 +$Title TIMES -- VERSION 4.6.0 option resLim=%GMSRESLIM%, profile=1, solveOpt=REPLACE, bRatio=%GMSBRATIO%; option limRow=0, limCol=0, solPrint=OFF, solver=%GMSSOLVER%; $offListing diff --git a/times_miro.miroapp b/times_miro.miroapp index 3ed4bab..191c106 100644 Binary files a/times_miro.miroapp and b/times_miro.miroapp differ diff --git a/times_miro_files.txt b/times_miro_files.txt index aba44f9..b45bfe1 100644 --- a/times_miro_files.txt +++ b/times_miro_files.txt @@ -1,491 +1,254 @@ -times_model/eqflomrk.mod -times_model/powerflo.vda -times_model/eqobjfix.rpt -times_model/atlearn8.etl -times_model/powerflo.vda -times_model/ddfnew0.gms -times_model/eqstgflo.mod -times_model/eqactbnd.mod -times_model/eqactups.vda -times_model/bnd_ucw.mod -times_model/dumpsol.mod -times_model/bnd_macro.tm -times_model/dumpsol.mod -times_model/equ_ext.dsc -times_model/main_ext.mod -times_model/eqstgflo.mod +times_model/mod_ext.cli +times_model/readbprice.mod times_model/uc_cli.mod -times_model/eqashar.vda -times_model/eqmacro.tm -times_model/eqptrans.mod -times_model/pp_lvlbd.mod -times_model/solve.stc -times_model/eqobjels.mod -times_model/eqbndcom.mod -times_model/coef_nio.mod -times_model/recurrin.stc -times_model/ucbet.vda -times_model/mod_equa.mod -times_model/pp_lvlfc.mod -times_model/eqmrkcom.ier -times_model/prepret.dsc -times_model/mod_vars.msa -times_model/eqobjvar.rpt -times_model/cal_cap.mod -times_model/mod_ext.ier -times_model/coef_cpt.mod +times_model/eqflofr.mod +times_model/pp_lvlbr.mod +times_model/setglobs.gms +times_model/initmty.tm +times_model/par_uc.rpt times_model/pp_actef.vda -times_model/times2veda.vdd -times_model/eqobjels.rpt -times_model/fillparm.gms -times_model/solprep.msa -times_model/coef_ext.etl -times_model/pp_lvlpk.mod -times_model/pp_clean.mod -times_model/ddfupd.msa -times_model/dumpsol1.mod -times_model/coef_shp.mod -times_model/pp_off.mod -times_model/cal_red.red -times_model/initmty.abs -times_model/rpt_dam.mod +times_model/eqcumflo.mod times_model/Version-Old.rar -times_model/writeddf.msa -times_model/eqcombal.mod -times_model/initmty.abs -times_model/rpt_objc.rpt -times_model/equserco.mod -times_model/coef_obj.mod -times_model/coefmain.mod -times_model/wrtbprice.mod -times_model/bnd_flo.mod -times_model/atsc.etl -times_model/equserco.mod -times_model/Contributing.md +times_model/preppm.mod +times_model/rpt_ext.cli +times_model/atlearn9.etl times_model/bnd_act.mod -times_model/mod_ext.cli -times_model/eqobjels.mod -times_model/initsys.mod -times_model/preshape.gms -times_model/Version.log -times_model/eqchpelc.ier -times_model/eqobjcst.tm -times_model/prep_ext.tm -times_model/rptmisc.rpt -times_model/eqcapvac.mod -times_model/uc_pasti.mod -times_model/err_stat.mod -times_model/maindrv.mod -times_model/eqxbnd.mod -times_model/pp_lvlif.mod -times_model/equ_ext.abs -times_model/eqcumcom.mod -times_model/ppm_ext.dsc -times_model/bnd_ire.vda -times_model/eqashar.vda -times_model/filparam.gms -times_model/rpt_ext.msa +times_model/cal_cap.mod +times_model/rptmain.mod +times_model/pp_micro.mod +times_model/pp_prelv.vda +times_model/timslice.mod +times_model/gdxfilter.gms +times_model/pp_reduce.red times_model/sol_flo.red -times_model/eqstgips.lin -times_model/eqflomrk.mod -times_model/pp_chp.mod -times_model/ucbet.vda times_model/Contributing.md -times_model/coef_alt.lin -times_model/bnd_stg.mod -times_model/fillwave.gms -times_model/rpt_ext.cli -times_model/dynslite.vda -times_model/solsubta.ans -times_model/bnd_set.mod -times_model/equcrtp.vda -times_model/solsetv.v3 -times_model/rpt_par.cli -times_model/COPYING.txt +times_model/ucbet.vda +times_model/pp_chp.ier +times_model/pp_lvlfs.mod +times_model/maindrv.mod +times_model/eqstgaux.mod +times_model/fillvint.gms +times_model/eqstgaux.lin times_model/filshape.gms -times_model/bnd_ucv.mod -times_model/mod_vars.etl -times_model/fillcost.gms -times_model/pp_qafs.mod -times_model/prepxtra.mod -times_model/eqpeak.mod -times_model/eqirebnd.mod -times_model/sensis.stc -times_model/eqobjann.tm -times_model/mod_ext.etl -times_model/bnd_set.mod -times_model/LICENSE.txt -times_model/rpt_ext.ier +times_model/atsc.etl +times_model/initmty.vda +times_model/initmty.ier times_model/sol_ire.rpt +times_model/eqobjvar.mod times_model/mod_vars.abs -times_model/cal_red.red -times_model/eqdamage.mod -times_model/eqobjfix.mod -times_model/eqdeclr.mod -times_model/eqstgtss.mod -times_model/initmty.stc -times_model/prep_ext.tm -times_miro.gms +times_model/coef_csv.mod times_model/eqobjann.tm -times_model/solputta.ans -times_model/mod_equa.tm -times_model/timslice.mod -times_model/eqcapact.mod -times_model/eqpk_ect.ier -times_model/initmty.tm -times_model/eqstgips.mod -times_model/preppm.msa -times_model/solsysd.v3 -times_model/eqobj.tm -times_model/eqblnd.mod -times_model/rpt_obj.rpt -times_model/rptmain.mod -times_model/ddfupd.msa -times_model/fillvint.gms -times_model/prepret.dsc -times_model/initmty.mod -times_model/readbprice.mod -times_model/pp_lvlbd.mod -times_model/initmty.ier -times_model/initmty.etl -times_model/init_ext.dsc -times_model/prepparm.gms -times_model/spoint.mod -times_model/initmty.cli -times_model/solsubta.ans -times_model/eqire.mod -times_model/coef_cpt.mod -times_model/pp_shapr.mod -times_model/rpt_ext.ier -times_model/pp_lvlbr.mod -times_model/atlearn1.etl -times_model/AUTHORS.md -times_model/initmty.mod -times_model/eqobsalv.rpt -times_model/times2veda_stc.vdd -times_model/cal_stgn.mod -times_model/LICENSE.txt -times_model/pp_lvlbr.mod -times_model/eqobjinv.mod -times_model/preppm.mod -times_model/atlearn8.etl -times_model/uc_flo.mod -times_model/prep_ext.vda -times_model/uc_ire.mod +times_model/eqlducs.vda +times_model/equ_ext.msa +times_model/cal_caps.mod times_model/bnd_stg.mod -times_model/eqobj.mod -times_model/rptmain.rpt -times_model/rptmain.stc -times_model/equcwrap.mod -times_model/coef_ext.cli -times_model/initmty.dsc -times_model/eqcumflo.mod -times_model/eqobjvar.mod -times_model/solsetv.v3 -times_model/bnd_macro.tm -times_model/resloadc.vda -times_model/mod_ext.vda -times_model/COPYING.txt -times_model/eqcaflac.vda -times_model/solve.stp -times_model/pextlevs.stc times_model/timesrng.gms -times_model/globals.def -times_model/initmty.vda -times_model/eqmacro.tm -times_model/atsc.etl -times_model/init_ext.dsc -times_model/eqobjinv.rpt -times_model/coef_ext.vda -times_model/eqptrans.mod -times_model/equ_ext.vda -times_model/equ_ext.cli -times_model/pp_lvlus.mod -times_model/setglobs.gms -times_model/eqmain.mod -times_model/readbprice.mod +times_model/eqcombal.mod +times_model/mod_vars.cli +times_model/eqchpelc.ier +times_model/eqire.mod times_model/coef_ext.vda -times_model/rptlite.rpt -times_model/atlearn.etl -times_model/bnd_cum.mod -times_model/pp_clean.mod -times_model/equ_ext.abs -times_model/eqobsalv.rpt -times_model/prep_ext.stc -times_model/eqdeclr.tm +times_model/equ_ext.mlf +times_model/coef_ext.cli +times_model/initmty.mlf +times_model/uc_ncap.mod times_model/cost_ann.rpt -times_model/ppmain.tm +times_model/init_ext.dsc +times_model/eqstgtss.mod times_model/err_stat.mod -times_model/bnd_ucv.mod -times_model/cal_cap.mod -times_model/pp_shapr.mod -times_model/prep_ext.dsc -times_model/pp_lvlfs.mod -times_model/prep_ext.abs -times_model/uc_act.mod +times_model/eqobsalv.rpt +times_model/solsysd.v3 +times_model/spoint.mod +times_model/ppm_ext.mlf +times_model/prep_ext.stc times_model/init_ext.vda -times_model/eqstgaux.mod -times_model/initsys.mod -times_model/dumpsol1.mod -times_model/initmty.vda -times_model/initmty.msa -times_model/dumpsolv.mod -times_model/solputta.ans -times_model/rptmisc.rpt -times_model/pp_chp.ier -times_model/rpt_obj.rpt -times_model/uc_com.mod -times_model/units.def -times_model/bnd_elas.mod -times_model/eqcombal.mod -times_model/eqstgips.mod -times_model/globals.def -times_model/eqpeak.mod -times_model/eqobj.mod -times_model/pp_qack.mod +times_model/eqdeclr.mod +times_model/eqashar.vda +times_model/atlearn1.etl +times_model/rptmain.rpt +times_model/pp_chp.mod +times_model/initsys.mod +times_model/eqobj.tm +times_model/eqblnd.mod times_model/coefmain.mod -times_model/mod_vars.dsc -times_model/uc_act.mod -times_model/pp_micro.mod -times_model/uc_cap.mod -times_model/filparam.gms -times_model/eqbndcom.mod -times_model/uc_cli.mod -times_model/rpt_par.cli -times_model/eqcapvac.mod -times_model/pp_micro.mod -times_model/equ_ext.cli -times_model/mod_ext.dsc -times_model/coef_ptr.mod -times_model/cal_nored.red +times_model/equ_ext.vda times_model/pp_lvlpk.mod -times_model/maplists.def -times_model/preppm.mod -times_model/curex.gms -times_model/forcupd.cli -times_model/mod_vars.mod -times_model/rptmain.stc -times_model/eqobjfix.rpt -times_model/rpt_objc.rpt -times_model/cal_caps.mod -times_model/eqstgips.lin -times_model/pp_prelv.vda -times_model/ppm_ext.dsc -times_model/prep_ext.vda -times_model/clearsol.stp -times_model/ddfnew0.gms +times_model/ppmain.tm +times_model/cal_stgn.mod +times_model/main_ext.mod +times_model/pp_lvlif.mod +times_model/bndmain.mod +times_model/eqcaflac.vda +times_model/eqobjels.mod times_model/cal_fflo.mod +times_model/rptmisc.rpt +times_model/coef_ext.etl +times_model/prep_ext.ier +times_model/wrtbprice.mod times_model/clearsol.stc -times_model/mod_vars.tm -times_model/solve.msa -times_model/_times.g00 -times_model/init_ext.vda -times_model/_times.g00 -times_model/eqactflo.mod -times_model/solvcoef.msa -times_model/cal_caps.mod +times_model/mod_equa.mod +times_model/pp_lvlfc.mod +times_model/uc_ire.mod times_model/dumpsolv.mod +times_model/pp_shapr.mod +times_model/solve.stp times_model/initmty.etl -times_model/uc_flo.mod -times_model/rptlite.rpt -times_model/mod_vars.etl -times_model/pp_lvlfs.mod -times_model/eqactflo.mod -times_model/sensis.stc -times_model/initmty.stc -times_model/initmty.ier -times_model/uc_ncap.mod -times_model/bndmain.mod +times_model/curex.gms +times_model/preshape.gms +times_model/coef_ptr.mod +times_model/.gitattributes +times_model/prep_ext.abs times_model/uc_cap.mod -times_model/eqmrkcom.ier -times_model/eqcpt.mod -times_model/eqobjvar.rpt -times_model/prepparm.gms -times_model/equ_ext.msa -times_model/cal_stgn.mod -times_model/stages.stc -times_model/uc_pasti.mod -times_model/pp_qaput.mod -times_model/eqxbnd.mod -times_model/uc_com.mod -times_model/cal_ire.mod -times_model/mod_vars.cli -times_model/bnd_elas.mod -times_model/eqlducs.vda -times_model/mod_ext.ier -times_model/pp_lvlfc.mod -times_model/cal_fflo.mod -times_model/timesrng.gms -times_model/mod_ext.vda -times_model/preppm.msa -times_model/coef_nio.mod -times_model/fillparm.gms -times_model/solvcoef.msa -times_model/rptmain.tm -times_model/eqdamage.mod -times_model/prep_ext.dsc -times_model/atlearn1.etl -times_model/eqstgtss.mod -times_model/maindrv.mod +times_model/eqobjels.rpt +times_model/eqpeak.mod +times_model/uc_act.mod times_model/eqmain.mod -times_model/eqcumflo.mod -times_model/mod_ext.cli -times_model/bnd_ucw.mod -times_model/prep_ext.abs -times_model/equcrtp.vda -times_model/initmty.msa -times_model/eqbndcst.mod -times_model/eqpk_ect.ier -times_model/fillwave.gms +times_model/fillsow.stc +times_model/rpt_objc.rpt +times_model/coef_obj.mod +times_model/prepxtra.mod +times_model/eqdeclr.tm times_model/writeddf.msa +times_model/mod_ext.dsc +times_model/pp_off.mod +times_model/mod_ext.ier +times_model/equserco.mod +times_model/eqstgips.mod +times_model/eqstgflo.mod +times_model/uc_com.mod +times_model/fillparm.gms +times_model/pp_qafs.mod +times_model/bnd_set.mod +times_model/eqflobnd.mod times_model/mod_ext.abs -times_model/pp_reduce.red -times_model/eqbndcst.mod -times_model/maplists.def -times_model/rptmain.rpt -times_model/times2veda.vdd -times_model/coef_shp.mod -times_model/filshape.gms -times_model/pp_reduce.red -times_model/mod_equa.mod -times_model/pp_lvlff.mod -times_model/eqobjinv.rpt -times_model/eqirebnd.mod +times_model/forcupd.cli +times_model/pp_lvlbd.mod +times_model/prep_ext.tm +times_model/prepparm.gms +times_model/stages.stc +times_model/eqdamage.mod +times_model/solputta.ans +times_model/pextlevs.stc times_model/fillcost.gms -times_model/pp_actef.vda -times_model/par_uc.rpt -times_model/fillsow.stc -times_model/eqflofr.mod +times_model/mod_vars.tm +times_model/_times.g00 +times_model/pp_clean.mod +times_model/recurrin.stc +times_model/fillwave.gms +times_model/eqflomrk.mod +times_model/sensis.stc +times_model/equ_ext.ier +times_model/rptlite.rpt +times_model/mod_vars.msa +times_model/eqobjvar.rpt +times_model/bnd_flo.mod +times_model/AUTHORS.md times_model/initmty.dsc -times_model/coef_csv.mod -times_model/fillsow.stc -times_model/mod_equa.tm -times_model/eqdeclr.mod -times_model/uc_ire.mod -times_model/eqobjfix.mod +times_model/rptmain.stc +times_model/ddfupd.msa +times_model/eqobjcst.tm +times_model/COPYING.txt +times_model/dynslite.vda +times_model/eqobj.mod +times_model/eqactups.vda +times_model/eqcpt.mod times_model/pp_qaput.mod -times_model/eqcapact.mod -times_model/eqobj.tm -times_model/par_uc.rpt -times_model/timslice.mod -times_model/coef_ext.etl -times_model/coef_ptr.mod -times_model/eqire.mod -times_model/ppm_ext.vda -times_model/atlearn.etl -times_model/equ_ext.msa -times_model/eqstgaux.mod -times_model/eqcumcom.mod -times_model/bnd_flo.mod -times_model/eqobjinv.mod -times_model/stages.stc -times_model/prep_ext.ier -times_model/times2veda_v3.vdd -times_model/main_ext.mod -times_model/coef_alt.lin -times_model/pp_off.mod -times_model/spoint.mod -times_model/equ_ext.vda -times_model/ppm_ext.vda -times_model/uc_ncap.mod -times_model/equ_ext.etl -times_model/equ_ext.ier -times_model/bnd_ire.vda -times_model/eqobsalv.mod -times_model/coef_ext.cli -times_model/equcwrap.mod -times_model/eqactbnd.mod -times_model/forcupd.cli -times_model/curex.gms -times_model/eqobsalv.mod +times_model/prepret.dsc +times_model/eqobjinv.rpt +times_model/uc_pasti.mod +times_model/bnd_elas.mod +times_model/bnd_macro.tm +times_model/dumpsol1.mod +times_model/initmty.cli +times_model/initmty.abs +times_model/equ_ext.cli +times_model/solprep.msa +times_model/eqobjfix.mod +times_model/prep_ext.dsc times_model/clearsol.stp -times_model/cal_ire.mod -times_model/mod_ext.abs +times_model/eqmrkcom.ier +times_model/initmty.mod +times_model/eqobjfix.rpt +times_model/mod_vars.etl +times_model/solve.msa times_model/equ_ext.etl -times_model/sol_flo.red -times_model/AUTHORS.md -times_model/eqcpt.mod -times_model/coef_ext.abs -times_model/eqstgaux.lin -times_model/clearsol.stc -times_model/solsysd.v3 -times_model/pp_chp.mod -times_model/coef_ext.abs -times_model/ppmain.mod -times_model/cost_ann.rpt -times_model/mod_vars.dsc -times_model/pp_lvlus.mod -times_model/atlearn9.etl -times_model/init_ext.abs -times_model/eqfloshr.mod -times_model/bndmain.mod +times_model/mod_equa.tm +times_model/solsubta.ans +times_model/eqirebnd.mod +times_model/resloadc.vda +times_model/equcwrap.mod times_model/mod_ext.etl -times_model/prep_ext.stc -times_model/README.md +times_model/solve.stc +times_model/rpt_ext.ier +times_model/cal_nored.red +times_model/cal_red.red +times_model/powerflo.vda times_model/rpt_ext.msa -times_model/pp_qafs.mod -times_model/times2veda_v3.vdd -times_model/units.def -times_model/resloadc.vda -times_model/eqobjels.rpt -times_model/Version-Old.rar -times_model/preshape.gms -times_model/equ_ext.dsc -times_model/eqactups.vda +times_model/eqfloshr.mod +times_model/bnd_ire.vda +times_model/eqptrans.mod +times_model/calibase.mlf +times_model/times2veda.vdd +times_model/eqbndcst.mod +times_model/coef_cpt.mod times_model/bnd_cum.mod -times_model/equ_ext.ier -times_model/pp_prelv.vda -times_model/solve.mod -times_model/cal_nored.red -times_model/solve.mod -times_model/solve.stp -times_model/initmty.tm -times_model/fillvint.gms -times_model/eqflobnd.mod -times_model/eqobjvar.mod -times_model/mod_ext.dsc -times_model/prepxtra.mod -times_model/eqcaflac.vda -times_model/mod_vars.tm -times_model/solprep.msa -times_model/eqblnd.mod +times_model/times2veda_stc.vdd +times_model/times2veda_v3.vdd times_model/rpt_dam.mod -times_model/wrtbprice.mod -times_model/bnd_act.mod -times_model/coef_obj.mod -times_model/eqflofr.mod -times_model/initmty.cli +times_model/preppm.msa times_model/Version.log -times_model/pp_lvlff.mod -times_model/mod_vars.abs -times_model/ppmain.tm -times_model/sol_ire.rpt -times_model/times2veda_stc.vdd -times_model/recurrin.stc +times_model/atlearn.etl +times_model/eqxbnd.mod +times_model/init_ext.abs +times_model/ppmain.mod +times_model/LICENSE.txt +times_model/eqactflo.mod +times_model/initmty.stc +times_model/mod_vars.dsc +times_model/prep_ext.vda +times_model/bnd_ucv.mod +times_model/coef_ext.abs +times_model/mod_ext.vda +times_model/coef_nio.mod +times_model/cal_ire.mod +times_miro.gms +times_model/presolve.mlf +times_model/eqmacro.tm +times_model/maplists.def +times_model/dumpsol.mod +times_model/eqpk_ect.ier +times_model/uc_flo.mod +times_model/eqstgips.lin +times_model/filparam.gms +times_model/equ_ext.abs +times_model/bnd_ucw.mod +times_model/solvcoef.msa +times_model/coef_shp.mod +times_model/units.def +times_model/ppm_ext.dsc times_model/README.md -times_model/setglobs.gms -times_model/rptmain.mod -times_model/eqobjcst.tm -times_model/mod_vars.msa -times_model/solve.stc -times_model/eqchpelc.ier -times_model/pp_chp.ier +times_model/globals.def +times_model/equ_ext.dsc +times_model/eqcumcom.mod +times_model/pp_lvlff.mod +times_model/equcrtp.vda +times_model/atlearn8.etl +times_model/eqactbnd.mod +times_model/prep_ext.mlf +times_model/coef_alt.lin +times_model/rpt_ext.mlf +times_model/solve.mod +times_model/eqobsalv.mod +times_model/eqcapact.mod +times_model/mod_vars.mod times_model/rptmain.tm -times_model/eqdeclr.tm -times_model/rpt_ext.cli +times_model/solsetv.v3 +times_model/initmty.msa +times_model/rpt_obj.rpt +times_model/eqcapvac.mod times_model/pp_qack.mod -times_model/pp_lvlif.mod -times_model/atlearn9.etl -times_model/pextlevs.stc -times_model/mod_vars.mod -times_model/eqlducs.vda -times_model/init_ext.abs -times_model/eqfloshr.mod -times_model/eqstgaux.lin -times_model/ppmain.mod -times_model/coef_csv.mod -times_model/mod_vars.cli -times_model/dynslite.vda -times_model/eqflobnd.mod -times_model/prep_ext.ier -times_model/solve.msa +times_model/eqobjinv.mod +times_model/pp_lvlus.mod +times_model/ppm_ext.vda +times_model/rpt_par.cli +times_model/eqbndcom.mod diff --git a/times_model b/times_model index d9194ff..dfd6772 160000 --- a/times_model +++ b/times_model @@ -1 +1 @@ -Subproject commit d9194ff363bb1ec6bde313119d10fde357dc666f +Subproject commit dfd67724dc32f7424b330803b41cbd5c07146f90