[cig-commits] r14703 - in cs/cigma/trunk: . examples/laplace1 examples/laplace1/vtk
luis at geodynamics.org
luis at geodynamics.org
Tue Apr 14 15:15:57 PDT 2009
Author: luis
Date: 2009-04-14 15:15:55 -0700 (Tue, 14 Apr 2009)
New Revision: 14703
Added:
cs/cigma/trunk/examples/laplace1/cmp.out
cs/cigma/trunk/examples/laplace1/cmp.sh
cs/cigma/trunk/examples/laplace1/phi_2d.txt
cs/cigma/trunk/examples/laplace1/phi_3d.txt
cs/cigma/trunk/examples/laplace1/vtk/
cs/cigma/trunk/examples/laplace1/vtk/.keep
Removed:
cs/cigma/trunk/examples/laplace1/make-res-vtk.sh
Modified:
cs/cigma/trunk/.gitignore
Log:
Update comparison script & output
Modified: cs/cigma/trunk/.gitignore
===================================================================
--- cs/cigma/trunk/.gitignore 2009-04-14 22:15:49 UTC (rev 14702)
+++ cs/cigma/trunk/.gitignore 2009-04-14 22:15:55 UTC (rev 14703)
@@ -76,21 +76,23 @@
/examples/meshes/cgal
/examples/meshes/cgal/README
+/examples/laplace1/old
+/examples/laplace1/Makefile.dep
/examples/laplace1/laplace
-/examples/laplace1/Makefile.dep
/examples/laplace1/solution-*
-/examples/laplace1/res*
-/examples/laplace1/cube*.vtk
-/examples/laplace1/square*.vtk
+/examples/laplace1/phi_2d.h5
+/examples/laplace1/phi_3d.h5
+
/examples/laplace2/laplace
/examples/laplace2/solution-*
-/examples/citcomcu/*.vtr
-/examples/citcomcu/citcomcu.h5
-/examples/citcomcu/res*
-/examples/gale/*.vts
-/examples/gale/res*
-/examples/gale/bm_solutions.sh
+/examples/citcomcu/old
+/examples/citcomcu/steady-state.h5
+/examples/citcomcu/vtk/*.vtk
+
+/examples/gale/inclusion.h5
+/examples/gale/vtk/*.vtk
+
/examples/pylith/ssnog*
/examples/pylith/results
/examples/pylith/strikeslipnog.h5
@@ -103,12 +105,11 @@
/examples/test/integration-rules.h5
/examples/test/plot-mesh.py
+
# commit these
/examples/elements/reference-cells.h5
/examples/fiat/integration-rules.h5
-
-
# Autoconf patterns
aclocal.m4
configure
Added: cs/cigma/trunk/examples/laplace1/cmp.out
===================================================================
--- cs/cigma/trunk/examples/laplace1/cmp.out (rev 0)
+++ cs/cigma/trunk/examples/laplace1/cmp.out 2009-04-14 22:15:55 UTC (rev 14703)
@@ -0,0 +1,103 @@
+luis at stress:~/cigma/examples/laplace1$ ./cmp.sh
++ for r in 32 16 8
++ cigma compare vtk/phi_64x64.vtk vtk/phi_32x32.vtk --verbose
+
+Comparing vtk/phi_64x64.vtk and vtk/phi_32x32.vtk
+
+Progress of comparison
+ cells rate mins eta total progress
+ 4096 4096 0.016667 0 0.016667 100%
+
+Summary of comparison:
+ L2 = 0.00137848511068
+ Linf = 0.00244595268709
+ volume = 4
+ L2/sqrt(volume) = 0.000689242555339
+ h1 = 0.0441941738242
+ h2 = 0.0883883476483
+
++ for r in 32 16 8
++ cigma compare vtk/phi_64x64.vtk vtk/phi_16x16.vtk --verbose
+
+Comparing vtk/phi_64x64.vtk and vtk/phi_16x16.vtk
+
+Progress of comparison
+ cells rate mins eta total progress
+ 4096 4096 0.016667 0 0.016667 100%
+
+Summary of comparison:
+ L2 = 0.00631580624728
+ Linf = 0.00852916122015
+ volume = 4
+ L2/sqrt(volume) = 0.00315790312364
+ h1 = 0.0441941738242
+ h2 = 0.176776695297
+
++ for r in 32 16 8
++ cigma compare vtk/phi_64x64.vtk vtk/phi_8x8.vtk --verbose
+
+Comparing vtk/phi_64x64.vtk and vtk/phi_8x8.vtk
+
+Progress of comparison
+ cells rate mins eta total progress
+ 4096 4096 0.016667 0 0.016667 100%
+
+Summary of comparison:
+ L2 = 0.024625716993
+ Linf = 0.0266970654104
+ volume = 4
+ L2/sqrt(volume) = 0.0123128584965
+ h1 = 0.0441941738242
+ h2 = 0.353553390593
+
++ for r in 32 16 8
++ cigma compare vtk/phi_64x64x64.vtk vtk/phi_32x32x32.vtk --verbose
+
+Comparing vtk/phi_64x64x64.vtk and vtk/phi_32x32x32.vtk
+
+Progress of comparison
+ cells rate mins eta total progress
+ 262144 3495.3 1.25 0 1.25 100%
+
+Summary of comparison:
+ L2 = 0.00304031950347
+ Linf = 0.00352897372063
+ volume = 8
+ L2/sqrt(volume) = 0.00107491526894
+ h1 = 0.0541265877365
+ h2 = 0.108253175473
+
++ for r in 32 16 8
++ cigma compare vtk/phi_64x64x64.vtk vtk/phi_16x16x16.vtk --verbose
+
+Comparing vtk/phi_64x64x64.vtk and vtk/phi_16x16x16.vtk
+
+Progress of comparison
+ cells rate mins eta total progress
+ 262144 3692.2 1.1833 0 1.1833 100%
+
+Summary of comparison:
+ L2 = 0.0138572906973
+ Linf = 0.0118812532987
+ volume = 8
+ L2/sqrt(volume) = 0.00489929211046
+ h1 = 0.0541265877365
+ h2 = 0.216506350946
+
++ for r in 32 16 8
++ cigma compare vtk/phi_64x64x64.vtk vtk/phi_8x8x8.vtk --verbose
+
+Comparing vtk/phi_64x64x64.vtk and vtk/phi_8x8x8.vtk
+
+Progress of comparison
+ cells rate mins eta total progress
+ 262144 3318.3 1.3167 0 1.3167 100%
+
+Summary of comparison:
+ L2 = 0.0543204762424
+ Linf = 0.0433077463436
+ volume = 8
+ L2/sqrt(volume) = 0.0192051885541
+ h1 = 0.0541265877365
+ h2 = 0.433012701892
+
Added: cs/cigma/trunk/examples/laplace1/cmp.sh
===================================================================
--- cs/cigma/trunk/examples/laplace1/cmp.sh (rev 0)
+++ cs/cigma/trunk/examples/laplace1/cmp.sh 2009-04-14 22:15:55 UTC (rev 14703)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for r in 32 16 8; do
+ cigma compare vtk/phi_64x64.vtk vtk/phi_${r}x${r}.vtk --verbose
+done
+
+for r in 32 16 8; do
+ cigma compare vtk/phi_64x64x64.vtk vtk/phi_${r}x${r}x${r}.vtk --verbose
+done
+
Property changes on: cs/cigma/trunk/examples/laplace1/cmp.sh
___________________________________________________________________
Name: svn:executable
+ *
Deleted: cs/cigma/trunk/examples/laplace1/make-res-vtk.sh
===================================================================
--- cs/cigma/trunk/examples/laplace1/make-res-vtk.sh 2009-04-14 22:15:49 UTC (rev 14702)
+++ cs/cigma/trunk/examples/laplace1/make-res-vtk.sh 2009-04-14 22:15:55 UTC (rev 14703)
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -x
-
-#/cube_6_2 Dataset {262144, 1}
-#/cube_6_3 Dataset {262144, 1}
-#/cube_6_4 Dataset {262144, 1}
-#/cube_6_5 Dataset {262144, 1}
-#/square_6_2 Dataset {4096, 1}
-#/square_6_3 Dataset {4096, 1}
-#/square_6_4 Dataset {4096, 1}
-#/square_6_5 Dataset {4096, 1}
-
-dcv="--divide-by-cell-volumes"
-olv="--output-log-values"
-
-for i in 2 3 4 5; do
-
- vtk-residuals -m cube6.vtk -i res.h5:/cube_6_${i} -o res_cube_6_${i}.vtk
- vtk-residuals -m cube6.vtk -i res.h5:/cube_6_${i} -o log_res_cube_6_${i}.vtk $olv
- vtk-residuals -m cube6.vtk -i res.h5:/cube_6_${i} -o norm_res_cube_6_${i}.vtk $dcv
- vtk-residuals -m cube6.vtk -i res.h5:/cube_6_${i} -o log_norm_res_cube_6_${i}.vtk $dcv $olv
-
- vtk-residuals -m square6.vtk -i res.h5:/square_6_${i} -o res_square_6_${i}.vtk
- vtk-residuals -m square6.vtk -i res.h5:/square_6_${i} -o log_res_square_6_${i}.vtk $olv
- vtk-residuals -m square6.vtk -i res.h5:/square_6_${i} -o norm_res_square_6_${i}.vtk $dcv
- vtk-residuals -m square6.vtk -i res.h5:/square_6_${i} -o log_norm_res_square_6_${i}.vtk $dcv $olv
-
-done
Added: cs/cigma/trunk/examples/laplace1/phi_2d.txt
===================================================================
--- cs/cigma/trunk/examples/laplace1/phi_2d.txt (rev 0)
+++ cs/cigma/trunk/examples/laplace1/phi_2d.txt 2009-04-14 22:15:55 UTC (rev 14703)
@@ -0,0 +1,4 @@
+3
+0.0883883476483 0.000689242555339
+0.176776695297 0.00315790312364
+0.353553390593 0.0123128584965
Added: cs/cigma/trunk/examples/laplace1/phi_3d.txt
===================================================================
--- cs/cigma/trunk/examples/laplace1/phi_3d.txt (rev 0)
+++ cs/cigma/trunk/examples/laplace1/phi_3d.txt 2009-04-14 22:15:55 UTC (rev 14703)
@@ -0,0 +1,4 @@
+3
+0.108253175473 0.00107491526894
+0.216506350946 0.00489929211046
+0.433012701892 0.0192051885541
Added: cs/cigma/trunk/examples/laplace1/vtk/.keep
===================================================================
More information about the CIG-COMMITS
mailing list