[Swift-commit] r3020 - SwiftApps/SEE/trunk/site_pack

[noreply at svn.ci.uchicago.edu]

Author: aespinosa
Date: 2009-07-26 22:17:04 -0500 (Sun, 26 Jul 2009)
New Revision: 3020

Modified:
   SwiftApps/SEE/trunk/site_pack/run_ampl
Log:
Mods to extract_expend as requested by Joshua

Modified: SwiftApps/SEE/trunk/site_pack/run_ampl
===================================================================
--- SwiftApps/SEE/trunk/site_pack/run_ampl	2009-07-23 21:21:17 UTC (rev 3019)
+++ SwiftApps/SEE/trunk/site_pack/run_ampl	2009-07-27 03:17:04 UTC (rev 3020)
@@ -207,20 +207,22 @@
 # Expend
 extract_expend()
 {
-  echo 'YEAR REGION PROD CON1 '
+  echo 'YEAR REGION CON1 PROD CEM STL NFM MAN'
 
-  egrep '\+|^  *ELC|AGF.*OIL' $1 | sed -e 's/AGF.*OIL.*//' | egrep -v 'LND|LAB|CAP|NAT' |
+  egrep '\+|^  *ELC|AGF.*OIL' $1 | sed -e 's/AGF.*OIL.*//' |
 
   awk '
 
   BEGIN { regnum=0; year=2003 }
 
   NF==1 { region=$1; if ( regnum % 16 == 0 ) year++; regnum++}
-  NF!=1 { print year, region, $1, $19 }
+  NF!=1 { print year, region, $19, $1, $8, $9, $10, $11, $7 }
 
   '
 }
 
+#
+
 # Price
 extract_price()
 {