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

[luis at geodynamics.org]

Author: luis
Date: 2009-02-18 08:14:26 -0800 (Wed, 18 Feb 2009)
New Revision: 14078

Modified:
   cs/cigma/trunk/src/vtk-residuals.cpp
Log:
Added normalization flags to vtk-residuals utility

Modified: cs/cigma/trunk/src/vtk-residuals.cpp
===================================================================
--- cs/cigma/trunk/src/vtk-residuals.cpp	2009-02-18 16:14:25 UTC (rev 14077)
+++ cs/cigma/trunk/src/vtk-residuals.cpp	2009-02-18 16:14:26 UTC (rev 14078)
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <string>
+#include <cmath>
 #include <valarray>
 
 #include <boost/version.hpp>
@@ -48,6 +49,9 @@
         ("mesh-connect", po::value<string>(&ebloc), "...connectivity for mesh")
         ("input,i", po::value<string>(&inloc), "HDF5 input file for residuals")
         ("output,o", po::value<string>(&outloc), "VTK output file for residuals")
+        ("divide-by-cell-volumes", "Divide residual by corresponding cell volume")
+        ("output-log-values", "Write logarithm of final results")
+        //("square-residuals", "Square residual values before storing")
         ;
 
     other.add_options()
@@ -176,13 +180,27 @@
         delete epsilon;
         return 4;
     }
+
     valarray<double> eps(epsilon->_data, epsilon->size());
     residuals->epsilon = eps;
     delete epsilon;
 
+    if (vm.count("divide-by-cell-volumes"))
+    {
+        valarray<double>& vol = mesh->volume;
+        residuals->epsilon /= vol;
+    }
+
+    if (vm.count("output-log-values"))
+    {
+        residuals->epsilon = log10(residuals->epsilon);
+    }
+
     TRI_LOG_STR(">> Writing residuals to VTK file");
     cout << "Writing residuals to VTK file '" << out.filename() << "'" << endl;
-    WriteResiduals(out, residuals, true);
+    const bool normalize = false;
+    const bool overwrite = true;
+    WriteResiduals(out, residuals, normalize, overwrite);
 
     return 0;
 }