Changeset 16914

Timestamp:

11/24/13 12:49:28 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved more stuff to Element.cpp

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.cpp (modified) (1 diff)
• Element.h (modified) (2 diffs)
• Penta.cpp (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -104 +104 @@
         return shelf;
 }/*}}}*/
+IssmDouble Element::TMeltingPoint(IssmDouble pressure){/*{{{*/
+        _assert_(matpar);
+        return this->matpar->TMeltingPoint(pressure);
+}/*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -62 +62 @@
                 IssmDouble GetMaterialParameter(int enum_in);
                 bool       IsFloating(); 
+                IssmDouble TMeltingPoint(IssmDouble pressure);
 
                 /*Virtual functions*/
@@ -179 +180 @@
                 virtual void   SmbGradients(void)=0;
            virtual Element*   SpawnBasalElement(void)=0;
-                virtual IssmDouble TMeltingPoint(IssmDouble pressure)=0;
                 virtual void   ReduceMatrices(ElementMatrix* Ke,ElementVector* pe)=0;
                 virtual void   ResetCoordinateSystem()=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -3012 +3012 @@
           /*Update inputs*/
           this->inputs->AddInput(new PentaInput(SurfaceforcingsMassBalanceEnum,&smb[0],P1Enum));
-}
-/*}}}*/
-/*FUNCTION Penta::TMeltingPoint{{{*/
-IssmDouble Penta::TMeltingPoint(IssmDouble pressure){
-
-        _assert_(matpar);
-        return this->matpar->TMeltingPoint(pressure);
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -116 +116 @@
                 void   SmbGradients();
            Element* SpawnBasalElement(void);
-                IssmDouble  TMeltingPoint(IssmDouble pressure);
                 IssmDouble SurfaceArea(void);
                 void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -192 +192 @@
                 void        ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){_error_("not implemented yet");};
                 void          SmbGradients(){_error_("not implemented yet");};
-                IssmDouble  TMeltingPoint(IssmDouble pressure){_error_("not implemented yet");};
                 IssmDouble  SurfaceArea(void){_error_("not implemented yet");};
                 void        Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2659 +2659 @@
           /*Update inputs*/
           this->inputs->AddInput(new TriaInput(SurfaceforcingsMassBalanceEnum,&smb[0],P1Enum));
-}
-/*}}}*/
-/*FUNCTION Tria::TMeltingPoint{{{*/
-IssmDouble Tria::TMeltingPoint(IssmDouble pressure){
-
-        _assert_(matpar);
-        return this->matpar->TMeltingPoint(pressure);
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -119 +119 @@
                 void          SmbGradients();
            Element*    SpawnBasalElement(void);
-                IssmDouble  TMeltingPoint(IssmDouble pressure);
                 int         VelocityInterpolation();
                 IssmDouble  PureIceEnthalpy(IssmDouble pressure){_error_("not implemented yet");};