[cig-commits] [commit] master: Update solidus.cc (69946b2)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/a21aaa79d75b89a3d50d5c865e7dc51d309da9b9...b2eaff9e459f8351633e8b4b43c1284c90373873

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

commit 69946b2768f0791d7e986980f640512f1d666252
Author: SiqiZhang <SiqiZhang at users.noreply.github.com>
Date:   Thu May 15 16:58:13 2014 -0500

    Update solidus.cc


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

69946b2768f0791d7e986980f640512f1d666252
 source/initial_conditions/solidus.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/initial_conditions/solidus.cc b/source/initial_conditions/solidus.cc
index 4017a10..e69d913 100644
--- a/source/initial_conditions/solidus.cc
+++ b/source/initial_conditions/solidus.cc
@@ -29,13 +29,16 @@ namespace aspect
 {
 	namespace melting
 	{
-		Melting_curve::Melting_curve(){}
+		Melting_curve::Melting_curve(const std::string &filename)
+		{
+			read(filename);
+		}
 		void Melting_curve::read(const std::string &filename)
 		{
 			std::ifstream in(filename.c_str(), std::ios::in);
 			char temp[256];
 			std::string T_Unit,P_Unit;
-          	Num_points=0;
+          	        Num_points=0;
 			if(in.fail())return;
 			in.getline(temp,256);
 			in>>T_Unit>>P_Unit;
@@ -103,7 +106,7 @@ namespace aspect
 
 		AssertThrow(Solidus_curve.is_radius==true,ExcMessage("The solidus curve has to be depth dependent."));
 		AssertThrow(Solidus_curve.Num_points!=0,ExcMessage("Error eading solidus file."));
-        AssertThrow(dynamic_cast< const GeometryModel::SphericalShell<dim> *>( &this->get_geometry_model() )!=0,
+                AssertThrow(dynamic_cast< const GeometryModel::SphericalShell<dim> *>( &this->get_geometry_model() )!=0,
 				ExcMessage("This initial condition can only be work with sphereical shell geometry model."));
         R1=(dynamic_cast< const GeometryModel::SphericalShell<dim> &>(this->get_geometry_model())).R1;
 		T_min=(this->get_boundary_temperature()).minimal_temperature();