[Swift-commit] r7559 - SwiftApps/swift-galaxy/swift

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-02-03 22:39:41 -0600 (Mon, 03 Feb 2014)
New Revision: 7559

Removed:
   SwiftApps/swift-galaxy/swift/Illinois.tgz
   SwiftApps/swift-galaxy/swift/print_results_revised.inc
   SwiftApps/swift-galaxy/swift/set_data_ascii.inc
Modified:
   SwiftApps/swift-galaxy/swift/swiftforeach.xml
Log:
clean

Deleted: SwiftApps/swift-galaxy/swift/Illinois.tgz
===================================================================
(Binary files differ)

Deleted: SwiftApps/swift-galaxy/swift/print_results_revised.inc
===================================================================
--- SwiftApps/swift-galaxy/swift/print_results_revised.inc	2014-02-04 02:00:33 UTC (rev 7558)
+++ SwiftApps/swift-galaxy/swift/print_results_revised.inc	2014-02-04 04:39:41 UTC (rev 7559)
@@ -1,13 +0,0 @@
-# print results for analysis
-# V. M. Zavala - MCS/ANL 2010
-
-for{s in SCEN}{
-printf{t in 1..TH}: "%e ",  pricehis[s,t]  > Results/lmp_results.dat; 
-printf "\n " > Results/lmp_results.dat;
-} 
-close Results/lmp_results.dat;
-
-# print results for inference app
-                           printf: "%e ",           cost > stoch_model_obj.out; close stoch_model_obj.out;
-printf{t in TESTTIME,j in GEN}: "%e ",        yuc[t,j] > stoch_model_x.out; 
-printf{j in GEN}:                 "%e ", Pgen_initial[j] > stoch_model_x.out; close stoch_model_x.out;

Deleted: SwiftApps/swift-galaxy/swift/set_data_ascii.inc
===================================================================
--- SwiftApps/swift-galaxy/swift/set_data_ascii.inc	2014-02-04 02:00:33 UTC (rev 7558)
+++ SwiftApps/swift-galaxy/swift/set_data_ascii.inc	2014-02-04 04:39:41 UTC (rev 7559)
@@ -1,65 +0,0 @@
-# set ampl model data
-# V. M. Zavala - MCS/ANL 2012
-
-# read line data
-table Lines_data IN "./Illinois/Lines_data.tab": 
-LIN <- [LIN], status, snd_bus, rec_bus, X, V, Pmax, install_cost;
-read table Lines_data;
-
-# read bus data
-table bus_data IN "./Illinois/bus_data.tab": 
-BUS <- [BUS], lat_bus, lon_bus;
-read table bus_data;
-
-# read generator data
-table Gen_data IN "./Illinois/Gen_data.tab": 
-GEN <- [GEN], bus_gen, np_cap, sum_cap, win_cap, min_cap, fuel, min_hrate,
-              min_power, max_ur,  max_dr, lat_gen, lon_gen;
-read table Gen_data;
-
-# dispatch horizon data
-read TH < "./Illinois/dispatch_data.dat";
-read  T < "./Illinois/dispatch_data.dat";
-close "./Illinois/dispatch_data.dat"; 
-
-# python interface
-read NS < "stoch_model_par.in";
-read fix_x < "stoch_model_par.in";
-close "stoch_model_par.in"; 
-
-# read fuel data
-table fuel_data IN "./Illinois/fuel_data.tab":
-FUEL <- [FUEL], Description, HV, Unitprice, Units;
-read table fuel_data;
-
-# read load data
-table time_load IN "./Illinois/time_load.tab":     TIME <- [TIME];
-read table time_load;
-
-table load_load IN "./Illinois/load_load.tab":     LOAD <- [LOAD], bus_load;
-read table load_load;
-
-#table testtime_load IN "./Illinois/testtime_load.tab": TESTTIME <- [TESTTIME];
-#read table testtime_load;
-
-read{i in TIME,j in LOAD} loads[i,j] < "./Illinois/Loads.dat";
-close Illinois/Loads.dat;
-
-# initialize initial conditions for generators
-let{i in GEN} Pgen_init[i] := 0;
-
-# compute generation costs ($/MW)
-let{i in GEN} gen_cost[i] := 1e-3*(min_hrate[i]/HV[fuel[i]])*Unitprice[fuel[i]];
-
-# -------------- wind information
-table wind_data IN "./Illinois/wind_data.tab":
-WIND <- [WIND], bus_wind, wind_share;
-read table wind_data;
-
-# from inference app
-read{s in SCEN, t in TIME} wind_total[s,t] < "stoch_model_w.in";
-close stoch_model_w.in;
-
-# initialize wind info for moving horizon
-let{s in SCEN,t in TESTTIME}       wind_totalmh[s,t]:= wind_total[s,t+1];
-

Modified: SwiftApps/swift-galaxy/swift/swiftforeach.xml
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-04 02:00:33 UTC (rev 7558)
+++ SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-04 04:39:41 UTC (rev 7559)
@@ -2,33 +2,33 @@
     <description>A generic tool to run executable via Swift foreach parallel construct</description>
 
     <command interpreter="bash">
-        #if $rangeorlist.kind == "range" 
-         swiftforeachrange.sh
-         $site 
-         $interpreter
-         $executable
-         $rstart
-         $rend
-         $stepsize
-         $outloc
-         $logfile
-         $outlist
-         #for $a in $arg
-          ${a.argname}
-         #end for
-        #else
-         swiftforeachlist.sh
-         $site 
-         $interpreter
-         $executable
-         $listfile
-         $outloc
-         $logfile
-         $outlist
-         #for $a in $arg
-         ${a.argname}
-         #end for
-        #end if
+      #if $rangeorlist.kind == "range" 
+      swiftforeachrange.sh
+      $site 
+      $interpreter
+      $executable
+      $rstart
+      $rend
+      $stepsize
+      $outloc
+      $logfile
+      $outlist
+      #for $a in $arg
+      ${a.argname}
+      #end for
+      #else
+      swiftforeachlist.sh
+      $site 
+      $interpreter
+      $executable
+      $listfile
+      $outloc
+      $logfile
+      $outlist
+      #for $a in $arg
+      ${a.argname}
+      #end for
+      #end if
     </command>
 
     <inputs>