[cig-commits] r13821 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2009-01-12 14:09:42 -0800 (Mon, 12 Jan 2009)
New Revision: 13821

Modified:
   cs/cigma/trunk/src/cli_compare_cmd.cpp
Log:
Report more information in "cigma compare" command

Modified: cs/cigma/trunk/src/cli_compare_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_compare_cmd.cpp	2009-01-12 22:09:41 UTC (rev 13820)
+++ cs/cigma/trunk/src/cli_compare_cmd.cpp	2009-01-12 22:09:42 UTC (rev 13821)
@@ -158,8 +158,11 @@
 
     int status = op.run();
 
-    double L2 = op.residuals->L2();
-    double max_residual = op.residuals->max();
+    double L2 = op.residuals->norm_L2();
+    double Linf = op.residuals->norm_Linf();
+    double relative_L2 = op.residuals->relative_norm_L2();
+    double volume = op.residuals->total_volume;
+    double h = op.residuals->max_cell_diameter();
 
     if (L2 > threshold)
     {
@@ -174,9 +177,12 @@
     {
         // report errors
         cout << setprecision(12) << endl;
-        cout << "Global Norms" << endl;
-        cout << "  L2 = " << L2 << endl;
-        cout << "  MaxResidual = " << max_residual << endl;
+        cout << "Summary of comparison: " << endl;
+        cout << "  L2   = " << L2 << endl;
+        cout << "  Linf = " << Linf << endl;
+        cout << "  h    = " << h << endl;
+        cout << "  volume of domain    = " << volume << endl;
+        cout << "  sqrt((L2)^2/volume) = " << relative_L2 << endl;
         cout << endl;
 
         // write out data