diff --git a/Battery.py b/Battery.py index b79ab6a..6f89298 100644 --- a/Battery.py +++ b/Battery.py @@ -382,7 +382,7 @@ class Battery: wall_lower.update_bc(T_oven=T_oven) wall_upper.update_bc(T_oven=T_oven) - with Pool(32) as pool: + with Pool(12) as pool: wall_sln = pool.starmap(wall_solve_wrapper, [((dt*60*60), w) for w in self.walls_0+self.walls_1]) # wall_lower.solve(dt * 60 * 60) # convert hours to seconds @@ -553,48 +553,13 @@ if __name__ == "__main__": gas_in_state = gas.TPX # Time(Hours) - GJ/rev - sample_program = np.array('''\ --3 81 -0 81 -0 69.61621622 -3.5 69.61621622 -3.5 58.83157895 -7 58.83157895 -7 48.6 -10.5 48.6 -10.5 42.039 -14.5 42.039 -14.5 38.88 -24.5 38.88 -24.5 42.039 -27.75 42.039 -27.75 48.6 -30.35 48.6 -30.35 58.83157895 -32.43 58.83157895 -32.43 69.61621622 -34.094 69.61621622 -34.094 81 -36.46688136 81 -36.46688136 72.9 -39.46688136 72.9 -39.46688136 67.23 -42.46688136 67.23 -42.46688136 62.37 -47.46688136 62.37 -47.46688136 67.23 -50.46688136 67.23 -50.46688136 72.9 -53.46688136 72.9 -53.46688136 81 -56.46688136 81 -'''.split(), dtype=np.double).reshape((-1,2)) + sample_program = np.array(open('sample_heat_221128_3A.txt').read().split(), dtype=np.double).reshape((-1,2)) heating_plan = HeatSchedule(*sample_program.T) - charging_plan = ChargeSchedule( 81, 9, 9, 1e-12, 24+13, 3, 1e-12 ) + charging_plan = ChargeSchedule( 82, 9, 13, 1e-12, 9+13+18, 4, 1e-12 ) n_doors = 66 - load_state = True + load_state = False bat3A = Battery("3A", n_doors, heating_plan, charging_plan, gas_in_state, hv, init_from_file=load_state) if not load_state: diff --git a/Heat_History_221128_3A.csv b/Heat_History_221128_3A.csv new file mode 100644 index 0000000..5cfc932 --- /dev/null +++ b/Heat_History_221128_3A.csv @@ -0,0 +1,14 @@ +Date Time Q +2022-11-27 20:00 85 +2022-11-28 0:00 75 +2022-11-28 2:00 65 +2022-11-28 4:00 55 +2022-11-28 19:00 50 +2022-11-29 4:00 60 +2022-11-29 8:00 55 +2022-11-29 15:00 65 +2022-11-29 19:40 75 +2022-11-29 21:40 85 +2022-11-30 0:40 65 +2022-11-30 4:40 62.5 +2022-11-30 5:40 85 \ No newline at end of file diff --git a/Heat_Plan_221128_3A-1.csv b/Heat_Plan_221128_3A-1.csv new file mode 100644 index 0000000..7fbe691 --- /dev/null +++ b/Heat_Plan_221128_3A-1.csv @@ -0,0 +1,8 @@ +Date Time Q +2022-11-27 20:00 85 +2022-11-28 0:00 75 +2022-11-28 2:00 65 +2022-11-28 4:00 55 +2022-11-29 13:00 65 +2022-11-29 18:00 75 +2022-11-30 00:00 85 \ No newline at end of file diff --git a/Heat_Plan_221128_3A-2.csv b/Heat_Plan_221128_3A-2.csv new file mode 100644 index 0000000..56365a8 --- /dev/null +++ b/Heat_Plan_221128_3A-2.csv @@ -0,0 +1,11 @@ +Date Time Q +2022-11-27 20:00 85 +2022-11-28 0:00 75 +2022-11-28 2:00 65 +2022-11-28 4:00 55 +2022-11-28 6:00 50 +2022-11-28 19:00 60 +2022-11-29 8:00 55 +2022-11-29 13:00 65 +2022-11-29 18:00 75 +2022-11-30 00:00 85 \ No newline at end of file diff --git a/Temperature_History_140205_4A.csv b/Temperature_History_140205_4A.csv index 7479c8c..9a07f19 100644 --- a/Temperature_History_140205_4A.csv +++ b/Temperature_History_140205_4A.csv @@ -6,4 +6,4 @@ Date Time T 2014-02-05 20:20:00 1215 2014-02-06 9:20:00 1263 2014-02-06 15:20:00 1230 -2014-02-06 24:20:00 1267 \ No newline at end of file +2014-02-07 00:20:00 1267 \ No newline at end of file diff --git a/result-221128-3A/coke.history b/result-221128-3A/coke.history new file mode 100644 index 0000000..6d1f218 Binary files /dev/null and b/result-221128-3A/coke.history differ diff --git a/result-221128-3A/coke.history2 b/result-221128-3A/coke.history2 new file mode 100644 index 0000000..dd88a4d Binary files /dev/null and b/result-221128-3A/coke.history2 differ diff --git a/result-221128-3A/gas.history b/result-221128-3A/gas.history new file mode 100644 index 0000000..9e6e779 Binary files /dev/null and b/result-221128-3A/gas.history differ diff --git a/result-221128-3A/gas.history2 b/result-221128-3A/gas.history2 new file mode 100644 index 0000000..755dfcf Binary files /dev/null and b/result-221128-3A/gas.history2 differ diff --git a/result-221128-3A/oven.state b/result-221128-3A/oven.state new file mode 100644 index 0000000..2aabe1f Binary files /dev/null and b/result-221128-3A/oven.state differ diff --git a/result-221128-3A/oven.state2 b/result-221128-3A/oven.state2 new file mode 100644 index 0000000..0c69031 Binary files /dev/null and b/result-221128-3A/oven.state2 differ diff --git a/result-221128-3A/wall.history b/result-221128-3A/wall.history new file mode 100644 index 0000000..36ac42a Binary files /dev/null and b/result-221128-3A/wall.history differ diff --git a/result-221128-3A/wall.history2 b/result-221128-3A/wall.history2 new file mode 100644 index 0000000..5a96d19 Binary files /dev/null and b/result-221128-3A/wall.history2 differ diff --git a/sample_heat_221128_3A-Plan1.txt b/sample_heat_221128_3A-Plan1.txt new file mode 100644 index 0000000..ac2f0e8 --- /dev/null +++ b/sample_heat_221128_3A-Plan1.txt @@ -0,0 +1,13 @@ +0.0 85.0 +4.0 85.0 +4.0 75.0 +6.0 75.0 +6.0 65.0 +8.0 65.0 +8.0 55.0 +41.0 55.0 +41.0 65.0 +46.0 65.0 +46.0 75.0 +52.0 75.0 +52.0 85.0 \ No newline at end of file diff --git a/sample_heat_221128_3A-Plan2.txt b/sample_heat_221128_3A-Plan2.txt new file mode 100644 index 0000000..6aff543 --- /dev/null +++ b/sample_heat_221128_3A-Plan2.txt @@ -0,0 +1,19 @@ +0.0 85.0 +4.0 85.0 +4.0 75.0 +6.0 75.0 +6.0 65.0 +8.0 65.0 +8.0 55.0 +10.0 55.0 +10.0 50.0 +23.0 50.0 +23.0 60.0 +36.0 60.0 +36.0 55.0 +41.0 55.0 +41.0 65.0 +46.0 65.0 +46.0 75.0 +52.0 75.0 +52.0 85.0 \ No newline at end of file diff --git a/sample_heat_221128_3A.txt b/sample_heat_221128_3A.txt new file mode 100644 index 0000000..2146c89 --- /dev/null +++ b/sample_heat_221128_3A.txt @@ -0,0 +1,25 @@ +0.0 85.0 +4.0 85.0 +4.0 75.0 +6.0 75.0 +6.0 65.0 +8.0 65.0 +8.0 55.0 +23.0 55.0 +23.0 50.0 +32.0 50.0 +32.0 60.0 +36.0 60.0 +36.0 55.0 +43.0 55.0 +43.0 65.0 +47.666666666666664 65.0 +47.666666666666664 75.0 +49.666666666666664 75.0 +49.666666666666664 85.0 +52.666666666666664 85.0 +52.666666666666664 65.0 +56.666666666666664 65.0 +56.666666666666664 62.5 +57.666666666666664 62.5 +57.666666666666664 85.0 \ No newline at end of file