Changeset 3198

Timestamp:

05/09/12 16:31:07 (14 months ago)

Author:

jcfuller

Message:

Temporary changes to the implicit_enduses. See ticket 571.

Files:

• branch/2.3/residential/house_e.cpp (modified) (8 diffs)

branch/2.3/residential/house_e.cpp

@@ -203 +203 @@
         {   "CLOTHESWASHER", 
                 {20, false, {0.0,0.0,1.0}, 0.9, 1.0},
-                "type:analog; schedule: residential-clotheswasher-default; energy: 0.75 kWh; power: 1 kW",
+                "type:analog; schedule: residential-clotheswasher-default; power: 1 kW", //energy: 0.75 kWh; 
                 "residential-clotheswasher-default", 
                 "positive; nonzero; weekday-summer {"
@@ -241 +241 @@
         {   "WATERHEATER", 
                 {30, true, {0.0,0.0,1.0}, 1.0, 0.5},
-                "type:analog; schedule: residential-waterheater-default; energy: 1 kWh; power: 5 kW",
+                "type:analog; schedule: residential-waterheater-default; power: 5 kW", //energy: 1 kWh; 
                 "residential-waterheater-default", 
                 "positive; nonzero; weekday-summer {"
@@ -279 +279 @@
         {   "REFRIGERATOR", 
                 {20, false, {0.1,0.0,0.9}, 0.9, 1.0},
-                "type:analog; schedule: residential-refrigerator-default; energy: 1 kWh; power: 750 W",
+                "type:analog; schedule: residential-refrigerator-default; power: 750 W", //energy: 1 kWh; 
                 "residential-refrigerator-default", 
                 "positive; nonzero; weekday-summer {"
@@ -317 +317 @@
         {   "DRYER", 
                 {30, true, {0.9,0.0,0.1}, 0.99, 0.15},
-                "type:analog; schedule: residential-dryer-default; energy: 2.5 kWh; power: 5 kW",
+                "type:analog; schedule: residential-dryer-default; power: 5 kW", //energy: 2.5 kWh; 
                 "residential-dryer-default", 
                 "positive; nonzero; weekday-summer {"
@@ -355 +355 @@
         {   "FREEZER", 
                 {20, false, {0.1,0.0,0.9}, 0.9, 1.0},
-                "type:analog; schedule: residential-freezer-default; energy: 750 Wh; power: 500 W",
+                "type:analog; schedule: residential-freezer-default; power: 500 W", //energy: 750 Wh; 
                 "residential-freezer-default", 
                 "positive; nonzero; weekday-summer {"
@@ -390 +390 @@
                 "}"             
                 },
-
         {   "DISHWASHER", 
                 {20, false, {0.8,0,0.2}, 0.98, 1.0},
-                "type:analog; schedule: residential-dishwasher-default; energy: 1.0 kWh; power: 1.0 kW",
+                "type:analog; schedule: residential-dishwasher-default; power: 1.0 kW", //energy: 1.0 kWh;
                 "residential-dishwasher-default", 
-                "positive; nonzero; weekday-summer {"
+                "normal; positive; nonzero; weekday-summer {"
                 "*  0 * 4-9 1-5 0.0068; *  1 * 4-9 1-5 0.0029; *  2 * 4-9 1-5 0.0016; *  3 * 4-9 1-5 0.0013;"
                 "*  4 * 4-9 1-5 0.0012; *  5 * 4-9 1-5 0.0037; *  6 * 4-9 1-5 0.0075; *  7 * 4-9 1-5 0.0129;"
@@ -430 +429 @@
         {   "RANGE", 
                 {40, true, {1,0,0}, 0.85, 0.8},
-                "type:analog; schedule: residential-range-default; energy: 1.0 kWh; power: 0.5 kW",
+                "type:analog; schedule: residential-range-default; power: 0.5 kW", //energy: 1.0 kWh; 
                 "residential-range-default", 
                 "positive; nonzero; weekday-summer {"
@@ -467 +466 @@
         {   "MICROWAVE", 
                 {40, false, {0,0,1}, 0.7, 0.8},
-                "type:analog; schedule: residential-microwave-default; energy: 1.0 kWh; power: 0.2 kW",
+                "type:analog; schedule: residential-microwave-default; power: 0.2 kW", //energy: 1.0 kWh; 
                 "residential-microwave-default", 
                 "positive; nonzero; weekday-summer {"