Changeset 5463

Timestamp:

08/20/10 16:24:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

Got rid of Stokes control init

Location:

issm/trunk/src/m/solutions

Files:

• control_core.m (modified) (2 diffs)
• stokescontrolinit.m (deleted)

issm/trunk/src/m/solutions/control_core.m

@@ -19 +19 @@
         cm_gradient=femmodel.parameters.CmGradient;
         dim=femmodel.parameters.Dim;
+        isstokes=femmodel.parameters.IsStokes;
 
         %Initialise options with tolerance and maxiter
@@ -31 +32 @@
         adjointcore=AdjointCorePointerFromSolutionEnum(solution_type);
 
-        %Preprocess models
-%       if(solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum)
-%               femmodel=stokescontrolinit(femmodel);
-%       end
+        %Launch once a complete solution to set up all inputs
+        disp('      preparing initial solution');
+        isstokes
+        if isstokes,
+                eval(['femmodel=' solutioncore '(femmodel);']);
+        end
 
         for n=1:nsteps,