Fixed definition of ellip_p, add dirty LINEAR macro

Exponent should be (p-2)/2 instead of p-2 since gamma = (1/2)|Du|^2. Updated forcing terms for exact solutions and tests. For performance comparison, it is useful to just assemble the matrix as if the problem is linear (to avoid computing 'pow' and other expensive operations that are not needed in the linear case). This is ugly and should remain deactivated.
jedbrown · Jun 2, 2009 · 9e02615 · 9e02615
1 parent 82980da
commit 9e02615
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 12 deletions.
diff --git a/src/fs/tests/CMakeLists.txt b/src/fs/tests/CMakeLists.txt
@@ -11,8 +11,8 @@ dohp_add_test (fs-mf-op-proj-1  1 fs-ex1 -const_BDeg 7 -snes_mf_operator -ksp_co
 
 dohp_add_test (bu-0 1 bu -dmesh_in "${Dohp_DATA_DIR}/dblock211.h5m" -dfs_ordering_type natural)
 
-dohp_add_test (ellip-e0-b2-p18 1 ellip -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -snes_monitor -ksp_monitor -pc_type lu -exact_a 1.6 -exact_b 1.7 -exact_c 1.8 -exact 0 -const_bdeg 2 -ellip_p 1.8 -dfs_ordering_type natural)
-dohp_add_test (ellip-e0-b4-p18 1 ellip -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -snes_monitor -ksp_monitor -pc_type lu -exact_a 1.6 -exact_b 1.7 -exact_c 1.8 -exact 0 -const_bdeg 4 -ellip_p 1.8 -djac_tensor_no_unroll -dfs_ordering_type natural)
-dohp_add_test (ellip-e0-b4-p17-sse 1 ellip -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -snes_monitor -ksp_monitor -pc_type lu -exact_a 1.6 -exact_b 1.7 -exact_c 1.8 -exact 0 -const_bdeg 4 -ellip_p 1.7 -dfs_ordering_type natural)
+dohp_add_test (ellip-e0-b2-p18 1 ellip -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -snes_monitor -ksp_monitor -pc_type lu -exact_a 1.6 -exact_b 1.7 -exact_c 1.8 -exact 0 -const_bdeg 2 -ellip_p 1.6 -dfs_ordering_type natural)
+dohp_add_test (ellip-e0-b4-p18 1 ellip -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -snes_monitor -ksp_monitor -pc_type lu -exact_a 1.6 -exact_b 1.7 -exact_c 1.8 -exact 0 -const_bdeg 4 -ellip_p 1.6 -djac_tensor_no_unroll -dfs_ordering_type natural)
+dohp_add_test (ellip-e0-b4-p17-sse 1 ellip -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -snes_monitor -ksp_monitor -pc_type lu -exact_a 1.6 -exact_b 1.7 -exact_c 1.8 -exact 0 -const_bdeg 4 -ellip_p 1.4 -dfs_ordering_type natural)
 dohp_add_test (ellip-morph 1 ellip -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -morph 1 -twist 0.4 -ksp_monitor_short -snes_max_it 1 -ksp_rtol 1e-8 -ksp_type cg -pc_type lu)
 dohp_add_test (elast-e0-b4-g01 1 elast -dmesh_in "${Dohp_DATA_DIR}/dblock4.h5m" -snes_monitor_short -ksp_monitor_short -pc_type ilu -exact_a 0.98 -exact_b 1.01 -exact_c 1.01 -exact 0 -const_bdeg 4 -elast_gamma 0.1)