diff options
| -rw-r--r-- | 04-bbmd-jor.mac | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/04-bbmd-jor.mac b/04-bbmd-jor.mac index 4062a8e..8aa7245 100644 --- a/04-bbmd-jor.mac +++ b/04-bbmd-jor.mac @@ -110,6 +110,7 @@ sim_facts : ev([ /* From Equation 4 (1/r^2 term) */ diff(Φc[0],θ)=0, diff(Φc[0],θ, 2)=0, + diff(Φc[0],θ, 3)=0, diff(diff(Φc[0],θ),u)=0, diff(diff(Φc[0],u),θ)=0, diff(diff(Φc[0],u),θ,2)=0], @@ -199,8 +200,8 @@ ce_ev_eqs[2][1]; /* TODO: D_u * c = c_u * D ??? */ /* Supplementary Condition 1 */ e_sc_eqs[1] : expand_equation(expand(exp(2*β)*sc_eqs[1]), coeffs)$ -/* BUG */ e_sc_eqs[1] : subst(sim_facts, e_sc_eqs[1])$ + eq_mono : block( [eq : coeff(e_sc_eqs[1], r, -2)=0, sim_facts:sim_facts], push(subst(sim_facts, expand(diff(Φu_coeffs[2],u))), sim_facts), @@ -209,15 +210,15 @@ eq_mono : block( trigreduce(expand(trigsimp(eq)))); /* Supplementary Condition 2 */ -e_sc_eqs[2] : block( - /* BUG: Single A with no further factors crashes */ - [tmp : lhs(expand(exp(2*β)*sc_eqs[2]+A))=0], - tmp : expand_equation(tmp, coeffs), - expand(tmp - expand(subst(append(main_ansatz, coeffs), A)))); +e_sc_eqs[2] : expand_equation(expand(exp(2*β)*sc_eqs[2]), coeffs)$ +e_sc_eqs[2] : subst(sim_facts, e_sc_eqs[2])$ eq_dipo : block( - [eq : coeff(e_sc_eqs[2], r, -2)=0], - subst(sim_facts, trigreduce(expand(-3*solve(eq, diff(N,u)))))); + [eq : coeff(e_sc_eqs[2], r, -2)=0, sim_facts:sim_facts], + push(subst(sim_facts, expand(diff(Φu_coeffs[2],θ))), sim_facts), + eq : -3*solve(eq, diff(N,u))[1], + eq : subst(sim_facts, eq), + trigreduce(expand(eq))); /* Cache */ |