Changeset 7638

Timestamp:

03/15/11 08:59:59 (14 years ago)

Author:

Eric.Larour

Message:

non linear diagnostic solver now replaced by non linear solver

Location:

issm/trunk/src/c/solutions

Files:

• adjointdiagnostic_core.cpp (modified) (1 diff)
• diagnostic_core.cpp (modified) (1 diff)
• objectivefunctionC.cpp (modified) (1 diff)

issm/trunk/src/c/solutions/adjointdiagnostic_core.cpp ¶

@@ -28 +28 @@
         _printf_(VerboseSolution(),"%s\n","   computing velocities");
         femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-        solver_diagnostic_nonlinear(femmodel,conserve_loads); 
+        solver_nonlinear(femmodel,conserve_loads); 
 
         /*Call SurfaceAreax, because some it might be needed by PVector*/

issm/trunk/src/c/solutions/diagnostic_core.cpp ¶

@@ -63 +63 @@
                 _printf_(VerboseControl(),"%s\n","   computing velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-                solver_diagnostic_nonlinear(femmodel,modify_loads); 
+                solver_nonlinear(femmodel,modify_loads); 
         }
         

issm/trunk/src/c/solutions/objectivefunctionC.cpp ¶

@@ -66 +66 @@
         }
         else if (solution_type==DiagnosticSolutionEnum){
-                solver_diagnostic_nonlinear(femmodel,conserve_loads); 
+                solver_nonlinear(femmodel,conserve_loads); 
         }
         else if (solution_type==BalancedthicknessSolutionEnum){