|
24 | 24 | T = symbols('Period') |
25 | 25 | Re = symbols('Re') |
26 | 26 | As_1, As_2, As_3 = symbols('As_1 As_2 As_3') |
27 | | -Pb = symbols('Pb') |
| 27 | +Acp_1, Acp_2 = symbols('Acp_1 Acp_2') |
28 | 28 | rho = symbols('Rho') |
29 | 29 |
|
30 | 30 | # Definition of default values |
31 | 31 | if case == "0": |
32 | 32 | global_vars = [(Re, 10**7), |
33 | | - (Pb, 0.25), |
34 | 33 | (As_1, -45), |
35 | 34 | (As_2, 20), |
36 | | - (As_3, 10)] |
| 35 | + (As_3, 10), |
| 36 | + (Acp_2, 0.25), |
| 37 | + ] |
37 | 38 | if case == "A": |
38 | 39 | global_vars = [(Re, 10**7), |
39 | | - (Pb, 0.25), |
40 | 40 | (As_1, -140), |
41 | 41 | (As_2, 40), |
42 | | - (As_3, 16)] |
| 42 | + (As_3, 16), |
| 43 | + (Acp_2, 0.25), |
| 44 | + ] |
43 | 45 | if case == "B": |
44 | 46 | global_vars = [(Re, 10**7), |
45 | | - (Pb, -0.25), |
46 | 47 | (As_1, -80), |
47 | 48 | (As_2, 20), |
48 | | - (As_3, 50)] |
| 49 | + (As_3, 50), |
| 50 | + (Acp_2, -0.25), |
| 51 | + ] |
49 | 52 | if case == "C": |
50 | 53 | global_vars = [(Re, 10**8), |
51 | | - (Pb, -0.1), |
52 | 54 | (As_1, -200), |
53 | 55 | (As_2, 60), |
54 | | - (As_3, 10)] |
| 56 | + (As_3, 10), |
| 57 | + (Acp_2, -0.1), |
| 58 | + ] |
55 | 59 | if case == "D": |
56 | 60 | global_vars = [(Re, 10**9), |
57 | | - (Pb, 0.1), |
58 | 61 | (As_1, -60), |
59 | 62 | (As_2, 20), |
60 | | - (As_3, 5)] |
| 63 | + (As_3, 5), |
| 64 | + (Acp_2, 0.1), |
| 65 | + ] |
61 | 66 |
|
| 67 | +global_vars.append((Acp_1, 500)) |
62 | 68 | global_vars.append((T, 50)) |
63 | 69 | global_vars.append((rho, 1)) |
64 | 70 |
|
|
82 | 88 | Al = Array([0.0792, 0.000063, 0.005]) |
83 | 89 | Bl = Array([0.2, 0.2, 0.2]) |
84 | 90 | Alf = Array([0.35, 0.4, 0.25]) |
85 | | -Acp = Array([500, 0.25]) |
86 | 91 | Aem = Array([0.4, 0.6, 10]) |
87 | 92 |
|
88 | 93 | A1 = Al[i]*Re**(1-Bl[i]) |
|
127 | 132 | Pcpsx = 1.5*(x-Xmin)*pi/(Xmax-Xmin) |
128 | 133 | Pcpsy = 0.5*pi*y/Ymax |
129 | 134 |
|
130 | | -Cpms = Acp[0]*log(Pcpx)*log(Pcpy) + Acp[1]*(cos(Pcpsx)**2 * cos(Pcpsy)**2)*sin(pi*z)**2*Ftime |
| 135 | +Cpms = Acp_1*log(Pcpx)*log(Pcpy) + Acp_2*(cos(Pcpsx)**2 * cos(Pcpsy)**2)*sin(pi*z)**2*Ftime |
131 | 136 |
|
132 | 137 | ############################### |
133 | 138 | # Nu_t_tild |
|
0 commit comments