Last updates

.triton/exe/opt/array_opt_batch.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 #SBATCH --time=48:00:00
 #SBATCH --mem-per-cpu=2G
-#SBATCH --array=1-3360
-#SBATCH --output=slurm_array_out/new/%A_%a.out
+#SBATCH --array=1-10
+#SBATCH --output=slurm_out/new/%A_%a.out
 
 n=$SLURM_ARRAY_TASK_ID
-instance=`sed -n "${n} p" instances1.txt`      # Get n-th line (1-indexed) of the file
+instance=`sed -n "${n} p" instances_test.txt`      # Get n-th line (1-indexed) of the file
 
 srun julia /scratch/work/condeil1/EnergySystemModeling.jl/.triton/exe/opt/run_clust.jl ${instance}
 srun julia /scratch/work/condeil1/EnergySystemModeling.jl/.triton/exe/opt/run_fix.jl ${instance}

.triton/exe/opt/instances_test.txt

@@ -1,10 +1,40 @@
-08n8760h0001c2b_mm
-08n8760h0002c2b_mm
-08n8760h0003c2b_mm
-08n8760h0004c2b_mm
-08n8760h0005c2b_mm
-08n8760h0006c2b_mm
-08n8760h0007c2b_mm
-08n8760h0008c2b_mm
-08n8760h0009c2b_mm
-08n8760h0010c2b_mm
+08n8760h0011c2b_mm
+08n8760h0012c2b_mm
+08n8760h0013c2b_mm
+08n8760h0014c2b_mm
+08n8760h0015c2b_mm
+08n8760h0016c2b_mm
+08n8760h0017c2b_mm
+08n8760h0018c2b_mm
+08n8760h0019c2b_mm
+08n8760h0020c2b_mm
+08n8760h0021c2b_mm
+08n8760h0022c2b_mm
+08n8760h0023c2b_mm
+08n8760h0024c2b_mm
+08n8760h0025c2b_mm
+08n8760h0026c2b_mm
+08n8760h0027c2b_mm
+08n8760h0028c2b_mm
+08n8760h0029c2b_mm
+08n8760h0030c2b_mm
+08n8760h0031c2b_mm
+08n8760h0032c2b_mm
+08n8760h0033c2b_mm
+08n8760h0034c2b_mm
+08n8760h0035c2b_mm
+08n8760h0036c2b_mm
+08n8760h0037c2b_mm
+08n8760h0038c2b_mm
+08n8760h0039c2b_mm
+08n8760h0040c2b_mm
+08n8760h0041c2b_mm
+08n8760h0042c2b_mm
+08n8760h0043c2b_mm
+08n8760h0044c2b_mm
+08n8760h0045c2b_mm
+08n8760h0046c2b_mm
+08n8760h0047c2b_mm
+08n8760h0048c2b_mm
+08n8760h0049c2b_mm
+08n8760h0050c2b_mm

.triton/exe/opt/run_fix.jl

@@ -13,7 +13,7 @@ opt_tlim = 60*60*72
 
 # Instance including clustering info
 instance_clust = ARGS[1]                # Clustering instance with info
-clust_method = ARGS[2]                  # Clustering method ("","dc"/"dc_new"/"dc_nosun"/"day")
+clust_method = ARGS[2]                  # Clustering method ("","dc"/"dc_new"/"dc_nosun"/"day"/etc.)
 nosun = parse(Bool,ARGS[3])             # Boolean regarding solar availability
 
 WRKDIR = "/scratch/work/condeil1/EnergySystemModeling.jl/examples"

src/EnergySystemModeling.jl

@@ -1,3 +1,5 @@
+__precompile__(false)
+
 module EnergySystemModeling
 
 include("model.jl")