Parabolic mortars for P4estMesh
#1662
Conversation
… into Parabolic_AMR_1D
… into Parabolic_AMR_1D
Co-authored-by: Michael Schlottke-Lakemper <[email protected]>
… into Parabolic_AMR_1D
…amr_parabolic_p4est
| i_small_start, i_small_step = index_to_start_step_2d(small_indices[1], | ||
| index_range) | ||
| j_small_start, j_small_step = index_to_start_step_2d(small_indices[2], | ||
| index_range) | ||
|
|
||
| for position in 1:2 | ||
| i_small = i_small_start | ||
| j_small = j_small_start | ||
| for node in eachnode(dg) | ||
|
|
||
| for v in eachvariable(equations) | ||
| viscous_flux_normal_ll = cache.mortars.u[1, v, position, node, mortar] | ||
| viscous_flux_normal_rr = cache.mortars.u[2, v, position, node, mortar] | ||
|
|
||
| # TODO: parabolic; only BR1 at the moment | ||
| fstar[position][v, node] = 0.5 * (viscous_flux_normal_ll + viscous_flux_normal_rr) | ||
| end | ||
|
|
||
| i_small += i_small_step | ||
| j_small += j_small_step |
There was a problem hiding this comment.
| i_small_start, i_small_step = index_to_start_step_2d(small_indices[1], | |
| index_range) | |
| j_small_start, j_small_step = index_to_start_step_2d(small_indices[2], | |
| index_range) | |
| for position in 1:2 | |
| i_small = i_small_start | |
| j_small = j_small_start | |
| for node in eachnode(dg) | |
| for v in eachvariable(equations) | |
| viscous_flux_normal_ll = cache.mortars.u[1, v, position, node, mortar] | |
| viscous_flux_normal_rr = cache.mortars.u[2, v, position, node, mortar] | |
| # TODO: parabolic; only BR1 at the moment | |
| fstar[position][v, node] = 0.5 * (viscous_flux_normal_ll + viscous_flux_normal_rr) | |
| end | |
| i_small += i_small_step | |
| j_small += j_small_step | |
| for position in 1:2 | |
| for node in eachnode(dg) | |
| for v in eachvariable(equations) | |
| viscous_flux_normal_ll = cache.mortars.u[1, v, position, node, mortar] | |
| viscous_flux_normal_rr = cache.mortars.u[2, v, position, node, mortar] | |
| # TODO: parabolic; only BR1 at the moment | |
| fstar[position][v, node] = 0.5 * (viscous_flux_normal_ll + viscous_flux_normal_rr) | |
| end |
|
@jlchan How bad are the merge conflicts? Does it make sense to stay with this or start from main again? |
I don't think they're bad. Since your PR supercedes ours, we should mostly just be using your commits. Thanks for making the second PR. I'll take a look hopefully tomorrow. |
Sure, reason for this was that this PR contains some stuff that we disregarded when doing TreeMesh PR. |
|
With #1691 being merged, this should be reduced to only adding the 3D part. |
|
@apey236 would you mind making a separate PR for your 3D parabolic mortar implementation? We can then close this PR |
This PR should not be merged until #1629 is merged.
This overlaps with the PR in #1661 as well