Changeset 16560 for issm/trunk/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp (modified) (2 diffs)

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

@@ -9 +9 @@
 #include "../SurfaceAreax/SurfaceAreax.h"
 
-void SurfaceAverageVelMisfitx(IssmDouble* pJ,FemModel* femmodel,int weight_index){
+void SurfaceAverageVelMisfitx(IssmDouble* pJ,FemModel* femmodel){
 
         /*Intermediary*/
@@ -24 +24 @@
         for(int i=0;i<femmodel->elements->Size();i++){
                 element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                J+=element->SurfaceAverageVelMisfit(weight_index);
+                J+=element->SurfaceAverageVelMisfit();
         }