Skip to content
Snippets Groups Projects
Commit 29956be7 authored by Marcus Mohr's avatar Marcus Mohr
Browse files

Merge branch 'dechant/issue55_fix' into 'main' 

Adjust manifold vector forms to use space dimension

Closes #55

See merge request !50
parents ce1b34fe 8a70f9fe
Branches
No related tags found
1 merge request!50Adjust manifold vector forms to use space dimension
Pipeline #78227 passed with warnings
Stage: test
Stage: integration
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 13 deletions
hog/manifold_forms.py
+ 13
− 13
View file @ 29956be7
...@@ -239,8 +239,8 @@ Weak formulation ...@@ -239,8 +239,8 @@ Weak formulation
for data in it: for data in it:
phi = data.trial_shape phi = data.trial_shape
psi = data.test_shape psi = data.test_shape
phi_vec = e_vec(geometry.dimensions, component_trial) * phi phi_vec = e_vec(geometry.space_dimension, component_trial) * phi
psi_vec = e_vec(geometry.dimensions, component_test) * psi psi_vec = e_vec(geometry.space_dimension, component_test) * psi
projected_phi = projection * phi_vec projected_phi = projection * phi_vec
projected_psi = projection * psi_vec projected_psi = projection * psi_vec
...@@ -314,8 +314,8 @@ Weak formulation ...@@ -314,8 +314,8 @@ Weak formulation
for data in it: for data in it:
phi = data.trial_shape phi = data.trial_shape
psi = data.test_shape psi = data.test_shape
phi_vec = e_vec(geometry.dimensions, component_trial) * phi phi_vec = e_vec(geometry.space_dimension, component_trial) * phi
psi_vec = e_vec(geometry.dimensions, component_test) * psi psi_vec = e_vec(geometry.space_dimension, component_test) * psi
phi_normal = dot(phi_vec, normal) phi_normal = dot(phi_vec, normal)
psi_normal = dot(psi_vec, normal) psi_normal = dot(psi_vec, normal)
...@@ -465,12 +465,12 @@ Weak formulation ...@@ -465,12 +465,12 @@ Weak formulation
it = element_matrix_iterator(trial, test, geometry) it = element_matrix_iterator(trial, test, geometry)
for data in it: for data in it:
ref_symbols_list = symbolizer.ref_coords_as_list(geometry.dimensions - 1) ref_symbols_list = symbolizer.ref_coords_as_list(geometry.dimensions)
if not transpose: if not transpose:
phi_vec = ( phi_vec = (
projection_mat projection_mat
* ( * (
e_vec(geometry.dimensions, component_index) * data.trial_shape e_vec(geometry.space_dimension, component_index) * data.trial_shape
).jacobian(ref_symbols_list) ).jacobian(ref_symbols_list)
).T ).T
phi = data.test_shape phi = data.test_shape
...@@ -479,7 +479,7 @@ Weak formulation ...@@ -479,7 +479,7 @@ Weak formulation
phi_vec = ( phi_vec = (
projection_mat projection_mat
* ( * (
e_vec(geometry.dimensions, component_index) * data.test_shape e_vec(geometry.space_dimension, component_index) * data.test_shape
).jacobian(ref_symbols_list) ).jacobian(ref_symbols_list)
).T ).T
...@@ -553,18 +553,18 @@ Weak formulation ...@@ -553,18 +553,18 @@ Weak formulation
it = element_matrix_iterator(trial, test, geometry) it = element_matrix_iterator(trial, test, geometry)
for data in it: for data in it:
ref_symbols_list = symbolizer.ref_coords_as_list(geometry.dimensions - 1) ref_symbols_list = symbolizer.ref_coords_as_list(geometry.dimensions)
phi = data.trial_shape phi = data.trial_shape
psi = data.test_shape psi = data.test_shape
unscaled_phi_projected_grad = ( unscaled_phi_projected_grad = (
projection_mat projection_mat
* (e_vec(geometry.dimensions, component_trial) * phi).jacobian( * (e_vec(geometry.space_dimension, component_trial) * phi).jacobian(
ref_symbols_list ref_symbols_list
) )
).T ).T
unscaled_psi_projected_grad = ( unscaled_psi_projected_grad = (
projection_mat projection_mat
* (e_vec(geometry.dimensions, component_test) * psi).jacobian( * (e_vec(geometry.space_dimension, component_test) * psi).jacobian(
ref_symbols_list ref_symbols_list
) )
).T ).T
...@@ -649,18 +649,18 @@ Weak formulation ...@@ -649,18 +649,18 @@ Weak formulation
it = element_matrix_iterator(trial, test, geometry) it = element_matrix_iterator(trial, test, geometry)
for data in it: for data in it:
ref_symbols_list = symbolizer.ref_coords_as_list(geometry.dimensions - 1) ref_symbols_list = symbolizer.ref_coords_as_list(geometry.dimensions)
phi = data.trial_shape phi = data.trial_shape
psi = data.test_shape psi = data.test_shape
unscaled_phi_projected_grad = ( unscaled_phi_projected_grad = (
projection_mat projection_mat
* (e_vec(geometry.dimensions, component_trial) * phi).jacobian( * (e_vec(geometry.space_dimension, component_trial) * phi).jacobian(
ref_symbols_list ref_symbols_list
) )
).T ).T
unscaled_psi_projected_grad = ( unscaled_psi_projected_grad = (
projection_mat projection_mat
* (e_vec(geometry.dimensions, component_test) * psi).jacobian( * (e_vec(geometry.space_dimension, component_test) * psi).jacobian(
ref_symbols_list ref_symbols_list
) )
).T ).T
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment