Changeset 4322

Timestamp:

06/29/10 15:31:33 (15 years ago)

Author:

Mathieu Morlighem

Message:

copied change from diagnostic to other solutions

Location:

issm/trunk/src/m/solutions

Files:

• balancedthickness.m (modified) (1 diff)
• balancedthickness2.m (modified) (1 diff)
• balancedvelocities.m (modified) (1 diff)
• bedslope.m (modified) (1 diff)
• diagnostic.m (modified) (1 diff)
• prognostic.m (modified) (1 diff)
• prognostic2.m (modified) (1 diff)
• steadystate.m (modified) (1 diff)
• surfaceslope.m (modified) (1 diff)
• thermal.m (modified) (1 diff)
• transient2d.m (modified) (1 diff)
• transient3d.m (modified) (1 diff)

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

@@ -25 +25 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.balancedthickness=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -25 +25 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.balancedthickness2=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -25 +25 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.balancedvelocities=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -25 +25 @@
         
                 displaystring(verbose,'%s',['write results']);
-                md.results.bedslopecompute=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
 
         else

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

@@ -10 +10 @@
         numanalyses=6;
         analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;BedSlopeAnalysisEnum;SurfaceSlopeAnalysisEnum];
-        solution_type=DiagnosticAnalysisEnum;
+        solution_type=DiagnosticSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);

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

@@ -26 +26 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.prognostic=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -25 +25 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.prognostic2=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -36 +36 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.steadystate=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
 
         else

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

@@ -25 +25 @@
         
                 displaystring(verbose,'%s',['write results']);
-                md.results.surfaceslopecompute=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
 
         else

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

@@ -25 +25 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.thermal=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -27 +27 @@
                 
                 displaystring(verbose,'%s',['write results']);
-                md.results.transient2d=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
 
         else

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

@@ -26 +26 @@
 
                 displaystring(verbose,'%s',['write results']);
-                md.results.transient3d=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
+                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
 
         else