[cig-commits] [commit] master: Update the header (48c4b48)

[cig_noreply at geodynamics.org]

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

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

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

commit 48c4b4812bd1430c128f45b634ccbad18fc2ffcb
Author: Siqi Zhang <siqi.zhang at mq.edu.au>
Date:   Fri May 16 17:41:51 2014 -0500

    Update the header


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

48c4b4812bd1430c128f45b634ccbad18fc2ffcb
 include/aspect/initial_conditions/solidus.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/aspect/initial_conditions/solidus.h b/include/aspect/initial_conditions/solidus.h
index 9b3a09b..7f0476f 100644
--- a/include/aspect/initial_conditions/solidus.h
+++ b/include/aspect/initial_conditions/solidus.h
@@ -74,13 +74,17 @@ namespace aspect
 
       private:
         /**
-         * A function object representing the temperature.
+         * Returns spherical coordinates of a cartesian position.
          */
+        const Tensor<1,dim>
+        spherical_surface_coordinates(const Tensor<1,dim> &position) const;
+
 		double       litho_thick;
 		double       Magnitude_T;
 		double       Magnitude_lith;
 		double       deltaT;
-		int          n;
+		int          lateral_wave_number_1;
+		int          lateral_wave_number_2;
 		std::string  solidus_filename;
     };
   }