Changeset 15396 for issm/trunk/src/c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

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

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -6 +6 @@
 
 #include "../../shared/shared.h"
-#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
 
-void ThicknessAbsMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units, int weight_index){
+void ThicknessAbsMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters, int weight_index){
 
         /*Intermediary*/
@@ -23 +21 @@
         for (i=0;i<elements->Size();i++){
                 element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                J+=element->ThicknessAbsMisfit(process_units,weight_index);
+                J+=element->ThicknessAbsMisfit(weight_index);
         }
 

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache