Changeset 3170

Timestamp:

03/03/10 16:21:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Cost function

Location:

issm/trunk/src/mex

Files:

• CostFunction (added)
• CostFunction/CostFunction.cpp (added)
• CostFunction/CostFunction.h (added)
• Makefile.am (modified) (3 diffs)
• Misfit/Misfit.cpp (modified) (2 diffs)

issm/trunk/src/mex/Makefile.am

@@ -13 +13 @@
                                 ContourToNodes \
                                 ControlConstrain \
+                                CostFunction \
                                 Dof\
                                 Du\
@@ -99 +100 @@
                           ContourToNodes/ContourToNodes.h
 
-
 ControlOptimization_SOURCES = ControlOptimization/ControlOptimization.cpp\
                           ControlOptimization/ControlOptimization.h
@@ -106 +106 @@
                           ControlConstrain/ControlConstrain.h
 
+CostFunction_SOURCES =  CostFunction/CostFunction.cpp \
+                                                CostFunction/CostFunction.h
+
 Dof_SOURCES = Dof/Dof.cpp\
                           Dof/Dof.h

issm/trunk/src/mex/Misfit/Misfit.cpp

@@ -19 +19 @@
         int               analysis_type;
         int               sub_analysis_type;
-        int               real=0; //we are computing a misfit which can be dampened...
 
         /* output datasets: */
@@ -44 +43 @@
 
         /*!Call core code: */
-        Misfitx(&J, elements,nodes,loads,materials,parameters,inputs,analysis_type,sub_analysis_type,real);
+        Misfitx(&J, elements,nodes,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
 
         /*write output : */