Changeset 24917

Timestamp:

05/29/20 07:46:58 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (3 diffs)

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

@@ -4693 +4693 @@
         IssmDouble  oceanarea_cpu  = 0.;
         IssmDouble  eartharea      = 0.;
-        IssmDouble  eartharea_cpu  = 0.;
-        IssmDouble* RSLgi  = NULL;
-        int* indices = NULL;
-        int         gsize;
-
-        /*Initialize temporary vector that will be used to sum eustatic components on all local elements, prior 
-         * to assembly:*/
-        gsize = this->nodes->NumberOfDofs(GsetEnum);
-        RSLgi=xNewZeroInit<IssmDouble>(gsize);
-        indices=xNew<int>(gsize); for (int i=0;i<gsize;i++)indices[i]=i;
+        IssmDouble  eartharea_cpu = 0.;
+
+   /*Initialize temporary vector that will be used to sum eustatic components
+    * on all local elements, prior to assembly:*/
+        int gsize = this->nodes->NumberOfDofs(GsetEnum);
+        IssmDouble* RSLgi=xNewZeroInit<IssmDouble>(gsize);
+        int* indices=xNew<int>(gsize);
+   for(int i=0;i<gsize;i++) indices[i]=i;
 
         /*First, figure out the area of the ocean, which is needed to compute the eustatic component: */
         for(int i=0;i<elements->Size();i++){
-                IssmDouble area;
-                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                area=element->GetAreaSpherical();
+                Element*   element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+                IssmDouble area=element->GetAreaSpherical();
                 eartharea_cpu += area;
-                if (element->IsOceanInElement()) oceanarea_cpu += area;
+                if(element->IsOceanInElement()) oceanarea_cpu += area;
         }
         ISSM_MPI_Reduce (&oceanarea_cpu,&oceanarea,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
@@ -4725 +4722 @@
                 eustatic_cpu+=eustatic_cpu_e;
         }
+
         /*Plug values once and assemble: */
         pRSLgi->SetValues(gsize,indices,RSLgi,ADD_VAL);
@@ -4739 +4737 @@
 
         /*Assign output pointers:*/
-        *peartharea=eartharea;
-        *poceanarea=oceanarea;
-        *peustatic=eustatic;
+        *peartharea = eartharea;
+        *poceanarea = oceanarea;
+        *peustatic  = eustatic;
 
 }