Changeset 21811

Timestamp:

07/18/17 17:55:04 (8 years ago)

Author:

schlegel

Message:

CHG: Add FloatingArea as a regional output

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Element.cpp (modified) (1 diff)
• Elements/Element.h (modified) (1 diff)
• Regionaloutput.h (modified) (1 diff)

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

@@ -843 +843 @@
         this->parameters->FindParam(pvalues,psize,paramenum);
 }/*}}}*/
+IssmDouble Element::FloatingArea(IssmDouble* mask){/*{{{*/
+
+        /*Retrieve values of the mask defining the element: */
+        for(int i=0;i<this->GetNumberOfVertices();i++){
+                if(mask[this->vertices[i]->Sid()]<=0.){
+                        return 0.;
+                }
+        }
+
+        /*Return: */
+        return this->FloatingArea();
+}
+/*}}}*/
 void       Element::GetDofList(int** pdoflist,int approximation_enum,int setenum){/*{{{*/
 

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

@@ -81 +81 @@
                 void               FindParam(IssmDouble* pvalue,int paramenum);
                 void               FindParam(int** pvalues,int* psize,int paramenum);
+                IssmDouble         FloatingArea(IssmDouble* mask);
                 void                 GetDofList(int** pdoflist,int approximation_enum,int setenum);
                 void                 GetDofListPressure(int** pdoflist,int setenum);

issm/trunk-jpl/src/c/classes/Regionaloutput.h

@@ -115 +115 @@
                                                 val_t+=element->GroundedArea(this->mask);
                                                 break;
+                                        case FloatingAreaEnum:
+                                                val_t+=element->FloatingArea(this->mask);
+                                                break;
                                         case IceMassEnum:
                                                 val_t+=element->IceMass(this->mask);