Changeset 4555

Timestamp:

07/13/10 12:57:02 (15 years ago)

Author:

seroussi

Message:

can use AddExternalResult for J and control_type in control_core

Location:

issm/trunk/src/m/solutions

Files:

• control_core.m (modified) (1 diff)
• stokescontrolinit.m (modified) (2 diffs)

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

@@ -90 +90 @@
 %       femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parametersn,AdjointxEnum);
 %       femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parametersn,AdjointyEnum);
-        if (dim==3) femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VzEnum);
-        femmodel.results.JEnum=J;
-        femmodel.results.ControlTypeEnum=EnumAsString(control_type);
+if (dim==3) femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VzEnum);end
+        femmodel.results=AddExternalResult(femmodel.results,JEnum,J);
+        femmodel.results=AddExternalResult(femmodel.results,ControlTypeEnum,control_type);
 
 end %end function

issm/trunk/src/m/solutions/stokescontrolinit.m

@@ -19 +19 @@
         %Run a complete diagnostic to update the Stokes spcs:
         femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
-        femmodel=solver_diagnostic_nonlinear(NULL,NULL,NULL,femmodel,conserve_loads);
+        femmodel=solver_diagnostic_nonlinear([],[],[],femmodel,conserve_loads);
 
         %vertical velocity
-        femmodel=solver_linear(NULL,femmodel);
+        femmodel=solver_linear([],femmodel);
 
         %recondition pressure computed previously:
@@ -33 +33 @@
         displaystring(verbose,'\n%s',['      computing stokes velocity and pressure...']);
         femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum);
-        femmode=solver_diagnostic_nonlinear(NULL,NULL,NULL,femmodel,conserve_loads);
+        femmode=solver_diagnostic_nonlinear([],[],[],femmodel,conserve_loads);