Changeset 4113

Timestamp:

06/21/10 17:20:52 (15 years ago)

Author:

Eric.Larour

Message:

cleanup of serial solutions, to look similar to parallel solutions.

Location:

issm/trunk/src/m/solutions/jpl

Files:

• bedslope.m (modified) (2 diffs)
• bedslope_core.m (added)
• diagnostic.m (modified) (1 diff)
• diagnostic_core.m (modified) (3 diffs)
• slope_core.m (deleted)
• slopecompute.m (deleted)
• slopecompute_core.m (deleted)
• surfaceslope.m (modified) (2 diffs)
• surfaceslope_core.m (added)

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

@@ -1 @@
-function md=slopecompute(md);
-%SLOPECOMPUTE - compute the slope of a model
+function md=bedslopecompute(md);
+%SLOPECOMPUTE - compute the bed slope of a model
 %
 %   Usage:
-%      md=slopecompute(md)
+%      md=bedslope(md)
 %
         %timing
@@ -21 +21 @@
         if ~qmu_analysis,
                 displaystring(verbose,'%s',['call computational core']);
-                bedslope_core(femmodel);
+                femmodel=bedslope_core(femmodel);
+        
+                displaystring(verbose,'%s',['write results']);
+                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -24 +24 @@
                         
                         displaystring(verbose,'%s',['call computational core']);
-                        diagnostic_core(femmodel);
+                        femmodel=diagnostic_core(femmodel);
 
                 else,
                         
                         displaystring(verbose,'%s',['call computational core']);
-                        control_core(femmodel);
+                        femmodel=control_core(femmodel);
 
                 end
+                
+                displaystring(verbose,'%s',['write results']);
+                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+
         else
                 %launch dakota driver for diagnostic core solution

issm/trunk/src/m/solutions/jpl/diagnostic_core.m

@@ -1 @@
-function results=diagnostic_core(model);
+function femmodel=diagnostic_core(femmodel);
 %DIAGNOSTIC_CORE - compute the core velocity field 
 %
@@ -28 +28 @@
 
         %Compute slopes: 
-        if(ishutter)surfaceslope_core(femmodel);end
-        if(isstokes)bedslope_core(femmodel);end
+        if(ishutter)femmodel=surfaceslope_core(femmodel);end
+        if(isstokes)femmodel=bedslope_core(femmodel);end
 
         if ishutter,
@@ -59 +59 @@
                         %"recondition" pressure computed previously:
                         InputDuplicate(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureStokesEnum);
-                        ScaleInput(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
+                        InputScale(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
 
                         displaystring(verbose,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);

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

@@ -1 @@
-function md=slopecompute(md);
-%SLOPECOMPUTE - compute the slope of a model
+function md=surfaceslopecompute(md);
+%SLOPECOMPUTE - compute the surface slope of a model
 %
 %   Usage:
-%      md=slopecompute(md)
+%      md=surfaceslope(md)
 %
         %timing
@@ -21 +21 @@
         if ~qmu_analysis,
                 displaystring(verbose,'%s',['call computational core']);
-                surfaceslope_core(femmodel);
+                femmodel=surfaceslope_core(femmodel);
+        
+                displaystring(verbose,'%s',['write results']);
+                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+
         else
                 %launch dakota driver for diagnostic core solution