[cig-commits] [commit] master: Update solidus.h (1f8f13f)

[cig_noreply at geodynamics.org]

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

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

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

commit 1f8f13fa8ea6fd0f9c0c0b0fe121233992436d15
Author: SiqiZhang <SiqiZhang at users.noreply.github.com>
Date:   Thu May 15 17:01:21 2014 -0500

    Update solidus.h


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

1f8f13fa8ea6fd0f9c0c0b0fe121233992436d15
 include/aspect/initial_conditions/solidus.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/aspect/initial_conditions/solidus.h b/include/aspect/initial_conditions/solidus.h
index e0c551e..9b3a09b 100644
--- a/include/aspect/initial_conditions/solidus.h
+++ b/include/aspect/initial_conditions/solidus.h
@@ -44,7 +44,7 @@ namespace aspect
         /**
          * Constructor.
          */
-        Solidus (const std::string &filename);
+        Solidus ();
 
         /**
          * Return the initial temperature as a function of position.
@@ -89,7 +89,7 @@ namespace aspect
 		class Melting_curve
 		{
   		public:
-   			Melting_curve();
+   			Melting_curve(const std::string &filename);
 			void read(const std::string &filename);
     		double T(const double p, const double radius) const;
 			bool is_radius;