Changeset 15849 for issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp

Timestamp:

08/20/13 14:50:44 (12 years ago)

Author:

seroussi

Message:

CHG: moved some modules back to src/modules and simplified some prototypes

File:

• issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp

@@ -9 +9 @@
 #include "../SurfaceAreax/SurfaceAreax.h"
 
-void SurfaceAverageVelMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,int weight_index){
+void SurfaceAverageVelMisfitx(IssmDouble* pJ,FemModel* femmodel,int weight_index){
 
         /*Intermediary*/
-        int i;
         Element* element=NULL;
 
         /*output: */
-        IssmDouble J=0;
+        IssmDouble J = 0.;
         IssmDouble J_sum;
 
         /*Compute surface area and add to elements inputs */
-        SurfaceAreax(NULL,elements,nodes,vertices, loads,materials,parameters);
+        SurfaceAreax(NULL,femmodel);
 
         /*Compute Misfit: */
-        for (i=0;i<elements->Size();i++){
-                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+        for(int i=0;i<femmodel->elements->Size();i++){
+                element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 J+=element->SurfaceAverageVelMisfit(weight_index);
         }