Changeset 4302

Timestamp:

06/29/10 08:47:59 (15 years ago)

Author:

Mathieu Morlighem

Message:

getting rid of SlopeAnalysis

Location:

issm/trunk/src/m/solutions

Files:

• bedslope.m (modified) (2 diffs)
• bedslope_core.m (modified) (2 diffs)
• steadystate.m (modified) (1 diff)
• surfaceslope.m (modified) (2 diffs)
• surfaceslope_core.m (modified) (1 diff)
• transient3d.m (modified) (1 diff)

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

@@ -1 @@
-function md=bedslopecompute(md);
-%SLOPECOMPUTE - compute the bed slope of a model
+function md=bedslope(md);
+%BEDSLOPE - compute the bed slope of a model
 %
 %   Usage:
@@ -9 +9 @@
 
         numanalyses=1;
-        analyses=SlopeAnalysisEnum;
-        solution_type=SlopeSolutionEnum;
+        analyses=BedSlopeAnalysisEnum;
+        solution_type=BedSlopeSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);

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

@@ -1 +1 @@
 function femmodel=bedslope_core(femmodel)
-%SURFACESLOPE_CORE - core of the bed slope computation solution
+%BEDSLOPE_CORE - core of the bed slope computation solution
 %
 %   Usage:
@@ -13 +13 @@
 
         %Call on core computations: 
-        femmodel=SetCurrentAnalysisAlias(femmodel,SlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
+        femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
         femmodel=solver_linear(femmodel);
-        femmodel=SetCurrentAnalysisAlias(femmodel,SlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
+        femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
         femmodel=solver_linear(femmodel);
         
         %extrude inputs if we are in 3D: */
         if dim==3,
-                displaystring(verbose,'\n%s',['extruding bed slopein 3d...']);
-                femmodel.elements=InputExtrude(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,SurfaceSlopeXEnum);
-                femmodel.elements=InputExtrude(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,SurfaceSlopeYEnum);
+                displaystring(verbose,'\n%s',['extruding bed slope in 3d...']);
+                femmodel.elements=InputExtrude(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,BedSlopeXEnum);
+                femmodel.elements=InputExtrude(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,BedSlopeYEnum);
         }
         
         displaystring(verbose,'\n%s',['saving results...']);
-        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceSlopeXEnum);
-        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceSlopeYEnum);
+        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedSlopeXEnum);
+        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedSlopeYEnum);

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

@@ -9 +9 @@
         t1=clock;
 
-        numanalyses=7;
-        analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+        numanalyses=8;
+        analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
         solution_type=SteadyStateSolutionEnum;
 

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

@@ -1 @@
-function md=surfaceslopecompute(md);
-%SLOPECOMPUTE - compute the surface slope of a model
+function md=surfaceslope(md);
+%SURFACESLOPE - compute the surface slope of a model
 %
 %   Usage:
@@ -9 +9 @@
 
         numanalyses=1;
-        analyses=[SlopeAnalysisEnum];
-        solution_type=SlopeSolutionEnum;
+        analyses=[SurfaceSlopeAnalysisEnum];
+        solution_type=SurfaceSlopeSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);

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

@@ -13 +13 @@
 
         %Call on core computations: 
-        femmodel=SetCurrentAnalysisAlias(femmodel,SlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
+        femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
         femmodel=solver_linear(femmodel);
-        femmodel=SetCurrentAnalysisAlias(femmodel,SlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
+        femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
         femmodel=solver_linear(femmodel);
         

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

@@ -9 +9 @@
         t1=clock;
 
-        numanalyses=8;
-        analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+        numanalyses=9;
+        analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
         solution_type=Transient3DSolutionEnum;