Changeset 19061

Timestamp:

02/02/15 14:45:51 (10 years ago)

Author:

Eric.Larour

Message:

CHG: added IceMass computation.

Location:

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

Files:

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

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

@@ -204 +204 @@
                 virtual void       GetVerticesCoordinatesBase(IssmDouble** xyz_list)=0;
                 virtual void       GetVerticesCoordinatesTop(IssmDouble** xyz_list)=0;
+                virtual IssmDouble IceMass(void)=0;
                 virtual IssmDouble IceVolume(void)=0;
                 virtual IssmDouble IceVolumeAboveFloatation(void)=0;

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

@@ -1287 +1287 @@
 
 }/*}}}*/
+IssmDouble Penta::IceMass(void){/*{{{*/
+
+        IssmDouble rho_ice; 
+        
+        if(!IsIceInElement())return 0.; //do not contribute to the volume of the ice!
+
+        /*recover ice density: */
+        rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
+
+        return rho_ice*this->IceVolume();
+}
+/*}}}*/
 IssmDouble Penta::IceVolume(void){/*{{{*/
 

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

@@ -87 +87 @@
                 void           GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
                 void           GetVerticesCoordinatesTop(IssmDouble** pxyz_list);
+                IssmDouble     IceMass(void);
                 IssmDouble     IceVolume(void);
                 IssmDouble     IceVolumeAboveFloatation(void);

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

@@ -78 +78 @@
                 void        GetVerticesCoordinatesBase(IssmDouble** pxyz_list){_error_("not implemented yet");};
                 void        GetVerticesCoordinatesTop(IssmDouble** pxyz_list){_error_("not implemented yet");};
+                IssmDouble  IceMass(void){_error_("not implemented yet");};
                 IssmDouble  IceVolume(void){_error_("not implemented yet");};
                 IssmDouble  IceVolumeAboveFloatation(void){_error_("not implemented yet");};

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

@@ -84 +84 @@
                 bool        HasFaceOnBase();
                 bool        HasFaceOnSurface();
+                IssmDouble  IceMass(void){_error_("not implemented yet");};
                 IssmDouble  IceVolume(void){_error_("not implemented yet");};
                 IssmDouble  IceVolumeAboveFloatation(void){_error_("not implemented yet");};

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

@@ -1622 +1622 @@
                 return false;
         }
+}
+/*}}}*/
+IssmDouble Tria::IceMass(void){/*{{{*/
+
+        IssmDouble rho_ice; 
+        
+        if(!IsIceInElement())return 0.; //do not contribute to the volume of the ice!
+
+        /*recover ice density: */
+        rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
+
+        return rho_ice*this->IceVolume();
 }
 /*}}}*/

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

@@ -90 +90 @@
                 bool        HasEdgeOnBase();
                 bool        HasEdgeOnSurface();
+                IssmDouble  IceMass(void);
                 IssmDouble  IceVolume(void);
                 IssmDouble  IceVolumeAboveFloatation(void);