Changeset 8397

Timestamp:

05/23/11 16:36:31 (14 years ago)

Author:

seroussi

Message:

serial m use solver_nonlinear instead of solver_diagnostic_nonlinear as in parallel

Location:

issm/trunk/src/m

Files:

• solutions/adjointdiagnostic_core.m (modified) (1 diff)
• solutions/diagnostic_core.m (modified) (1 diff)
• solutions/objectivefunctionC.m (modified) (1 diff)
• solvers/solver_nonlinear.m (moved) (moved from issm/trunk/src/m/solvers/solver_diagnostic_nonlinear.m ) (1 diff)

issm/trunk/src/m/solutions/adjointdiagnostic_core.m

@@ -15 +15 @@
         issmprintf(VerboseSolution,'   computing velocities');
         femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
-        femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads);
+        femmodel=solver_nonlinear(femmodel,conserve_loads);
 
         %Call SurfaceAreax, because some it might be needed by PVector

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

@@ -49 +49 @@
                 issmprintf(VerboseSolution,'\n%s',['   computing horizontal velocities']);
                 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
-                femmodel=solver_diagnostic_nonlinear(femmodel,modify_loads); 
+                femmodel=solver_nonlinear(femmodel,modify_loads); 
         end
         

issm/trunk/src/m/solutions/objectivefunctionC.m

@@ -23 +23 @@
 %Run diagnostic with updated inputs:
 if (solution_type==DiagnosticSolutionEnum)
-        femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads);  %true means we conserve loads at each diagnostic run
+        femmodel=solver_nonlinear(femmodel,conserve_loads);  %true means we conserve loads at each diagnostic run
 elseif (solution_type==SteadystateSolutionEnum)
         femmodel=diagnostic_core(femmodel);  %We need a 3D velocity!! (vz is required for the next thermal run)

issm/trunk/src/m/solvers/solver_nonlinear.m

@@ -1 @@
-function femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads)
-%SOLVER_DIAGNOSTIC_NONLINEAR - core solver of diagnostic run
+function femmodel=solver_nonlinear(femmodel,conserve_loads)
+%SOLVER_NONLINEAR - core solver of diagnostic run
 %
 %   Usage:
-%      [femmodel]=solver_diagnostic_nonlinear(femmodel,conserve_loads)
+%      [femmodel]=solver_nonlinear(femmodel,conserve_loads)
 
         %Branch on partitioning schema requested