Changeset 11335

Timestamp:

02/06/12 15:54:21 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added mex module for Newton's method

Location:

issm/trunk-jpl/src

Files:

• m/solutions/diagnostic_core.m (modified) (2 diffs)
• mex/CreateJacobianMatrix (added)
• mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp (added)
• mex/CreateJacobianMatrix/CreateJacobianMatrix.h (added)
• mex/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/src/m/solutions/diagnostic_core.m

@@ -15 +15 @@
         ismacayealpattyn=femmodel.parameters.FlowequationIsmacayealpattyn;
         isstokes=femmodel.parameters.FlowequationIsstokes;
+        isnewton=femmodel.parameters.DiagnosticIsnewton;
         dakota_analysis=femmodel.parameters.QmuIsdakota;
         control_analysis=femmodel.parameters.InversionIscontrol;
@@ -53 +54 @@
                 issmprintf(VerboseSolution,'\n%s',['   computing horizontal velocities']);
                 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
-                femmodel=solver_nonlinear(femmodel,modify_loads); 
+                if isnewton,
+                        femmodel=solver_newton(femmodel); 
+                else
+                        femmodel=solver_nonlinear(femmodel,modify_loads); 
+                end
         end
         

issm/trunk-jpl/src/mex/Makefile.am

@@ -22 +22 @@
                                 CostFunction \
                                 CreateNodalConstraints\
+                                CreateJacobianMatrix\
                                 Echo\
                                 ElementConnectivity\
@@ -327 +328 @@
                           SystemMatrices/SystemMatrices.h
 
+
+CreateJacobianMatrix_SOURCES = CreateJacobianMatrix/CreateJacobianMatrix.cpp\
+                                                                 CreateJacobianMatrix/CreateJacobianMatrix.h
+
 SurfaceArea_SOURCES = SurfaceArea/SurfaceArea.cpp\
                                                                  SurfaceArea/SurfaceArea.h