Changeset 5483

Timestamp:

08/23/10 00:33:48 (15 years ago)

Author:

Eric.Larour

Message:

now possible to fire up control_core in qmu solution

Location:

issm/trunk/src/m/solutions

Files:

• SpawnCore.m (modified) (2 diffs)
• issm.m (modified) (1 diff)

issm/trunk/src/m/solutions/SpawnCore.m

@@ -10 +10 @@
 responsedescriptors=femmodel.parameters.ResponseDescriptors; 
 solution_type=femmodel.parameters.SolutionType;
-
+control_analysis=femmodel.parameters.ControlAnalysis;
 
 displaystring(1,'%s%i',['   qmu iteration:'],counter);
@@ -19 +19 @@
 %now run the core solution
 [dummy,dummy,solutioncore]=SolutionConfiguration(solution_type);
+if(control_analysis)solutioncore='control_core';
 eval(['femmodel=' solutioncore '(femmodel);']);
 
 %now process the results to get response function values
-responses=DakotaResponses(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,responsedescriptors);
+responses=DakotaResponses(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,femmodel.part,responsedescriptors);

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

@@ -19 +19 @@
         control_analysis=femmodel.parameters.ControlAnalysis;
 
+        %if control being run on top of solution, change core
+        if(control_analysis)solutioncore='control_core';end
+
         %compute solution
         if ~qmu_analysis,
-                if ~control_analysis,
                         
-                        displaystring(verbose,'%s',['call computational core']);
-                        eval(['femmodel=' solutioncore '(femmodel);']);
+                displaystring(verbose,'%s',['call computational core']);
+                eval(['femmodel=' solutioncore '(femmodel);']);
 
-                else,
-                        
-                        displaystring(verbose,'%s',['call computational core']);
-                        femmodel=control_core(femmodel);
-
-                end
-                
                 displaystring(verbose,'%s',['write results'])
                 md.results.(EnumToString(solution_type))=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);