[cig-commits] [commit] master: Add net_translation, linear_momentum as options (728eb44)

[cig_noreply at geodynamics.org]

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

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

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

commit 728eb44d278bd1e081328e204d6ac19fcb745265
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Wed May 21 14:45:19 2014 -0500

    Add net_translation, linear_momentum as options


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

728eb44d278bd1e081328e204d6ac19fcb745265
 source/simulator/parameters.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/simulator/parameters.cc b/source/simulator/parameters.cc
index 1117c15..0241eb3 100644
--- a/source/simulator/parameters.cc
+++ b/source/simulator/parameters.cc
@@ -363,6 +363,7 @@ namespace aspect
 
       prm.declare_entry ("Remove nullspace", "",
                          Patterns::MultipleSelection("net rotation|angular momentum|"
+                                                     "net translation|linear momentum|"
                                                      "net x translation|net y translation|net z translation|"
                                                      "linear x momentum|linear y momentum|linear z momentum"),
                          "A selection of operations to remove certain parts of the nullspace from "
@@ -763,6 +764,9 @@ namespace aspect
             else if (nullspace_names[i]=="angular momentum")
               nullspace_removal = typename NullspaceRemoval::Kind(
                                     nullspace_removal | NullspaceRemoval::angular_momentum);
+            else if (nullspace_names[i]=="net translation")
+              nullspace_removal = typename NullspaceRemoval::Kind(
+                                    nullspace_removal | NullspaceRemoval::net_translation);
             else if (nullspace_names[i]=="net x translation")
               nullspace_removal = typename NullspaceRemoval::Kind(
                                     nullspace_removal | NullspaceRemoval::net_translation_x);
@@ -781,6 +785,9 @@ namespace aspect
             else if (nullspace_names[i]=="linear z momentum")
               nullspace_removal = typename       NullspaceRemoval::Kind(
                                     nullspace_removal | NullspaceRemoval::linear_momentum_z);
+            else if (nullspace_names[i]=="linear momentum")
+              nullspace_removal = typename NullspaceRemoval::Kind(
+                                    nullspace_removal | NullspaceRemoval::linear_momentum);
             else
               AssertThrow(false, ExcInternalError());
           }