Changeset 5289

Timestamp:

08/16/10 14:47:46 (15 years ago)

Author:

Mathieu Morlighem

Message:

enable balancedthickness control methods

Location:

issm/trunk/src/m

Files:

• classes/public/ismodelselfconsistent.m (modified) (1 diff)
• solutions/control_core.m (modified) (1 diff)

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -355 +355 @@
 
         %RESPONSES
-        checkvalues(md,{'cm_responses'},[SurfaceAbsVelMisfitEnum SurfaceRelVelMisfitEnum SurfaceLogVelMisfitEnum SurfaceLogVxVyMisfitEnum SurfaceAverageVelMisfitEnum]);
+        checkvalues(md,{'cm_responses'},[SurfaceAbsVelMisfitEnum SurfaceRelVelMisfitEnum SurfaceLogVelMisfitEnum SurfaceLogVxVyMisfitEnum SurfaceAverageVelMisfitEnum ThicknessAbsMisfitEnum]);
 
         %WEIGHTS

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

@@ -76 +76 @@
         %Some results not computed by diagnostic or steadystate
         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type);
-        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum);
-        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VyEnum);
-        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VelEnum);
         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,GradientEnum);
-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);