[cig-commits] [commit] master: Change the order of two assertions. (dd39235)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue May 20 13:50:58 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/0586ab6f9cf6ec525c331a8c0113ca155a3f1f87...d148500eae3d92d6094ffdbb7fa3f87712d1deac
>---------------------------------------------------------------
commit dd392355d9de3415123cc7dbd7afcb98c7fbee45
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date: Tue May 20 14:48:07 2014 -0500
Change the order of two assertions.
>---------------------------------------------------------------
dd392355d9de3415123cc7dbd7afcb98c7fbee45
source/initial_conditions/solidus.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/initial_conditions/solidus.cc b/source/initial_conditions/solidus.cc
index 279c205..82ab9c6 100644
--- a/source/initial_conditions/solidus.cc
+++ b/source/initial_conditions/solidus.cc
@@ -120,8 +120,8 @@ namespace aspect
double lateral_perturbation;
double Depth=this->geometry_model->depth(position);
+ AssertThrow(solidus_curve.n_points!=0,ExcMessage("Error reading solidus file."));
AssertThrow(solidus_curve.is_radius==true,ExcMessage("The solidus curve has to be radius dependent."));
- AssertThrow(solidus_curve.n_points!=0,ExcMessage("Error eading solidus file."));
const GeometryModel::SphericalShell<dim> *spherical_geometry_model=
dynamic_cast< const GeometryModel::SphericalShell<dim> *>(this->geometry_model);
AssertThrow(spherical_geometry_model!=0,
More information about the CIG-COMMITS
mailing list