Changeset 24941

Timestamp:

05/31/20 22:04:40 (5 years ago)

Author:

Eric.Larour

Message:

CHG: further optimizations based on availability of areas and masks.

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tria.cpp (modified) (3 diffs)
• FemModel.cpp (modified) (3 diffs)

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

@@ -5335 +5335 @@
         this->parameters->FindParam(&gsize,MeshNumberofverticesEnum);
 
-        /*compute area of element:*/
-        area=GetAreaSpherical();
+        /*Get area of element: precomputed in the sealevelrise_core_geometry:*/
+        this->GetInput2Value(&area,AreaEnum);
 
         /*element centroid (spherical): */
@@ -5455 +5455 @@
                 IssmDouble area;
 
-                /*Compute area of element:*/
-                area=GetAreaSpherical();
+                /*Get area of element:*/
+                this->GetInput2Value(&area,AreaEnum);
 
                 /*Average Sg over vertices:*/
@@ -5479 +5479 @@
         /*Compute area of element:*/
         IssmDouble area,eartharea;
-        area=GetAreaSpherical();
+        this->GetInput2Value(&area,AreaEnum);
 
         /*recover earth area: */

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -4640 +4640 @@
         ns = elements->Size();
 
-        /*First, figure out the surface area of Earth: */
-        for(int i=0;i<ns;i++){
-                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-        }
-
         /*Figure out max of ns: */
         ISSM_MPI_Reduce(&ns,&nsmax,1,ISSM_MPI_INT,ISSM_MPI_MAX,0,IssmComm::GetComm());
@@ -4694 +4689 @@
         IssmDouble  eustatic_cpu   = 0.;
         IssmDouble  eustatic_cpu_e = 0.;
+        IssmDouble  area      = 0.;
         IssmDouble  oceanarea      = 0.;
         IssmDouble  oceanarea_cpu  = 0.;
@@ -4707 +4703 @@
         for(int i=0;i<elements->Size();i++){
                 Element*   element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                IssmDouble area=element->GetAreaSpherical();
+                element->GetInput2Value(&area,AreaEnum);
                 if (masks->isoceanin[i]) oceanarea_cpu += area;
         }