[cig-commits] [commit] master: Roll back, make it so that net_translation and linear_momentum are just sums (e0b601b)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/2df080f4905a6be43fd1729ea0d6a7a956cce070...a7135c1f7697d39efff2f47a79ca1e1395cff504

>---------------------------------------------------------------

commit e0b601b23e559f82e04c6c994fb639bc659bc8e7
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Wed May 21 14:41:35 2014 -0500

    Roll back, make it so that net_translation and linear_momentum are just sums


>---------------------------------------------------------------

e0b601b23e559f82e04c6c994fb639bc659bc8e7
 cookbooks/future/periodic_box.prm | 2 +-
 include/aspect/simulator.h        | 2 ++
 source/simulator/core.cc          | 2 +-
 source/simulator/nullspace.cc     | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cookbooks/future/periodic_box.prm b/cookbooks/future/periodic_box.prm
index 5bca9f7..cbf846d 100644
--- a/cookbooks/future/periodic_box.prm
+++ b/cookbooks/future/periodic_box.prm
@@ -91,7 +91,7 @@ subsection Model settings
   set Prescribed velocity boundary indicators =
   set Tangential velocity boundary indicators = 2,3
   set Zero velocity boundary indicators       = 
-  set Remove nullspace = net translation
+  set Remove nullspace = net x translation
 end
 
 subsection Postprocess
diff --git a/include/aspect/simulator.h b/include/aspect/simulator.h
index d985cbc..f7865dd 100644
--- a/include/aspect/simulator.h
+++ b/include/aspect/simulator.h
@@ -116,9 +116,11 @@ namespace aspect
           net_translation_x = 0x1,
           net_translation_y = 0x2,
           net_translation_z = 0x4,
+          net_translation   = 0x1+0x2+0x4,
           linear_momentum_x = 0x8,
           linear_momentum_y = 0x10,
           linear_momentum_z = 0x20,
+          linear_momentum   = 0x8+0x10+0x20,
           net_rotation      = 0x40,
           angular_momentum  = 0x80
         };
diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index 5cbdb9d..fd75282 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -1464,7 +1464,7 @@ namespace aspect
                 initial_stokes_residual = stokes_residual;
               else
                 {
-                  pcout << "Nonlinear iteration " << i+1 << "; residual: " << stokes_residual/initial_stokes_residual << std::endl;
+                  pcout << "   Residual after nonlinear iteration " << i+1 << ": " << stokes_residual/initial_stokes_residual << std::endl;
                   if (stokes_residual/initial_stokes_residual < parameters.nonlinear_tolerance)
                     {
                       break; // convergence reached, exist nonlinear iteration.
diff --git a/source/simulator/nullspace.cc b/source/simulator/nullspace.cc
index 440293a..5691733 100644
--- a/source/simulator/nullspace.cc
+++ b/source/simulator/nullspace.cc
@@ -117,16 +117,16 @@ namespace aspect
       }
 
     if (parameters.nullspace_removal & NullspaceRemoval::net_translation_x)
-      funcs.push_back(std_cxx1x::shared_ptr<TensorFunction<1,dim> >(new internal::Translation<dim>(0))); //x dir
+      funcs.push_back(std_cxx1x::shared_ptr<TensorFunction<1,dim> >(new internal::Translation<dim>(0))); 
 
     if (parameters.nullspace_removal & NullspaceRemoval::net_translation_y)
-      funcs.push_back(std_cxx1x::shared_ptr<TensorFunction<1,dim> >(new internal::Translation<dim>(1))); //y dir
+      funcs.push_back(std_cxx1x::shared_ptr<TensorFunction<1,dim> >(new internal::Translation<dim>(1)));
 
     if (parameters.nullspace_removal & NullspaceRemoval::net_translation_z)
     { 
       //Only do z direction if dim == 3
       AssertThrow( dim == 3, ExcMessage("Can't remove z translational mode in 2 dimensions"));
-      funcs.push_back(std_cxx1x::shared_ptr<TensorFunction<1,dim> >(new internal::Translation<dim>(2))); //z dir
+      funcs.push_back(std_cxx1x::shared_ptr<TensorFunction<1,dim> >(new internal::Translation<dim>(2)));
     }
 
     if (funcs.size()>0)